ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-26 16:21:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,707 Commits 989 Branches 212 Tags 191 MiB
60d1b73160
Commit Graph

4707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Woeltjen
5ab2ceb333 Merge branch 'open940b' into open929 
Merge in Fixed Position updates to reconcile conflicts
related to generalization of selection mechanism, WTD-929.

Conflicts:
	platform/features/layout/src/FixedController.js
	platform/features/layout/test/FixedControllerSpec.js
 2015-03-04 15:09:46 -08:00
Victor Woeltjen
93debb4abe Merge branch 'open-master' into open940b 
Merge in latest from open-master into topic branch for
WTD-940, merge of fixed position look-and-feel updates.

Conflicts:
	platform/features/layout/src/FixedController.js
	platform/features/layout/src/elements/ElementFactory.js
 2015-03-04 14:52:01 -08:00
Victor Woeltjen
4f89911739 [CSS] Update compiled CSS files 
Rewrote some history as part of merge for WTD-940 to
remove non-open-source history; compiled CSS files did
not merge correctly in this process, so bringing over
compiled files from the original branch to replace these.
 2015-03-04 14:49:02 -08:00
Victor Woeltjen
73eabe938a [Fixed Position] Wrap mct-include is div 
Wrap mct-include in a div which gets position/style information
to position elements in a fixed position view; part of
recommended updates for WTD-894.
 2015-03-04 14:46:28 -08:00
Victor Woeltjen
ee59056625 [Fixed Layout] Update tests 
Update tests to reflect changes from WTD-894.
 2015-03-04 14:46:16 -08:00
Charles Hacskaylo
679e56d231 [Frontend] Tweaks and minor mods 
WTD-894
Changed image CSS from contain to cover
Modded default colors for text and telemetry elements to visibility;
Moved click handler position in menu-button.html for better clickability;

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
 2015-03-04 14:45:24 -08:00
Charles Hacskaylo
7c7f1c3dbc [Bug fix] Removed temp dev styling and fixed width issues with telemtry elements in Fixed Position view 2015-03-04 14:43:55 -08:00
Charles Hacskaylo
448b535de0 [Frontend] Markup and CSS mods to clean up form elements display 
WTD-610
CSS and markup mods principally focused on selects, checkboxes and composite controls;
Cleaned up positioning and formatting in .l-result area of query form bottom;
Removed display of view type when only a single view available for an object in switcher.html

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	vista/query/res/templates/channel-query.html
	vista/query/res/templates/channel-selector.html
	vista/query/res/templates/evr-query.html
 2015-03-04 14:43:21 -08:00
Charles Hacskaylo
9c001fabd9 [Frontend] Form element style and markup fixes 
WTD-610
Fixed markup in select.html;
Rebuilt associated CSS in _selects.scss;
Still to-do: checkbox valign and spacing

Conflicts:
	platform/commonUI/general/res/css/forms.css
	platform/commonUI/general/res/css/items.css
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/css/tree.css
 2015-03-04 14:41:50 -08:00
bwyu
e6fae358d9 Merge remote-tracking branch 'origin/open883' into open-master 2015-03-04 11:09:00 -08:00
bwyu
cbc02d6ec8 Merge remote-tracking branch 'origin/open882' into open-master 2015-03-04 10:08:34 -08:00
Victor Woeltjen
3ce1064c4e [Fixed Position] Expose view proxy 
Expose view proxy as selection state from the Fixed Position
controller, to make Add button available under generalized
selection mechanism, WTD-929.
 2015-03-03 18:52:13 -08:00
Victor Woeltjen
6364296967 [Fixed Position] Remove obsolete script 
Remove obsolete script for selection management in
Fixed Position view; this has been generalized to
become part of Edit mode. WTD-929.
 2015-03-03 18:48:53 -08:00
Victor Woeltjen
948b661fe7 [Fixed Position] Update specs 
Update specs to reflect usage of generalized selection
mechanism, WTD-929.
 2015-03-03 18:47:44 -08:00
Victor Woeltjen
d7e962e4b1 [Edit] Update tests 
Update tests for Edit mode bundle to include the
general-purpose selection API, WTD-929.
 2015-03-03 18:43:26 -08:00
Victor Woeltjen
ea37c636ee [Fixed Position] Use updated selection mechanism 
Use updated, more general approach to handling selections.
WTD-929.
 2015-03-03 18:35:28 -08:00
Victor Woeltjen
bc69f19012 [Edit] Utilize EditToolbarSelection 
Utilize newer, more general-purpose selector from the
representer responsible for binding selection scope to
toolbar. WTD-929.
 2015-03-03 18:34:03 -08:00
Victor Woeltjen
6c97815efb [Edit] Add Selection class 
Add class to handle selection, which will be synchronized
to the toolbar. WTD-929.
 2015-03-03 18:31:34 -08:00
bwyu
d7e502e27c Merge remote-tracking branch 'origin/open881' into open-master 2015-03-03 17:10:08 -08:00
Victor Woeltjen
86ee28740f [Common UI] Avoid infinite digest 
Avoid infinite digest when first applicy mct-scroll
directives, WTD-920.
 2015-03-03 13:50:39 -08:00
bwyu
0b29e05a31 Merge remote-tracking branch 'origin/open880' into open-master 2015-03-03 10:52:27 -08:00
Victor Woeltjen
0d5a849a41 [Edit] Restructure source folder 
Restructure sources associated with Edit mode; work on
WTD-788 has increased number of sources here so more
organization is useful.
 2015-02-26 17:06:30 -08:00
Victor Woeltjen
cb078e9620 [Edit] Test EditPanesController 
Test EditPanesController, particularly for the root
cause of tree collapse, WTD-788.
 2015-02-26 17:02:22 -08:00
Victor Woeltjen
988716ff01 [Edit] Refresh Library less aggressively 
Update the root object (used to populate the Library pane)
less often, to avoid recreating the whole tree and thereby
causing the tree to collapse. WTD-788.
 2015-02-26 16:53:15 -08:00
bwyu
970b5e70ba Merge remote-tracking branch 'origin/open879' into open-master 
Conflicts:
	platform/commonUI/edit/res/templates/edit-object.html
 2015-02-26 11:01:00 -08:00
Charles Hacskaylo
068518b535 [Frontend] Minor sanding 
WTD-894
Fix to correct spacing problem in object-header
 2015-02-25 18:59:36 -08:00
Charles Hacskaylo
424d60440c [Frontend] Delivery checkin: final tweaks to CSS 
WTD-894
CSS tweaks to allow box-sizing to be applied to elements within mct-include containers;
CSS cleanups
 2015-02-25 18:41:00 -08:00
Charles Hacskaylo
a0f31132e3 [Frontend] In-progress checkin: color palette SASS 
WTD-847
Significant markup and CSS for color palette support;
 2015-02-25 18:17:11 -08:00
Charles Hacskaylo
bdd070e12f [Frontend] In-progress checkin: added new symbols for Fixed Position view 
WTD-894
New symbols in wtdsymbols font;
Updated layout/bundle.json to use new glyphs;
 2015-02-25 16:44:11 -08:00
Victor Woeltjen
5df2710721 [Common UI] Document mct-scroll-* directives 
Add documentation for mct-scroll-x and mct-scroll-y, WTD-920.
 2015-02-25 16:34:51 -08:00
Victor Woeltjen
9fa09e25f0 [Common UI] Tweak mct-scroll-* directives 
Make fixes/tweaks to behavior of mct-scroll-x and mct-scroll-y
directives after testing them against timeline markup. WTD-920.
 2015-02-25 16:28:53 -08:00
Victor Woeltjen
9a88e5172a [Common UI] Expose mct-scroll-x, mct-scroll-y 
Expose mct-scroll-x and mct-scroll-y directives. WTD-920.
 2015-02-25 16:05:57 -08:00
Victor Woeltjen
f8b352c4d8 [Common UI] Implement mct-scroll-* parent 
Implement parent directive for mct-scroll-x, mct-scroll-y.
WTD-920.
 2015-02-25 16:01:38 -08:00
Charles Hacskaylo
7d03bc4de9 [Frontend] In-progress checkin: migrating style tags to classes, other 
WTD-894
Significant migration of inline styles to CSS classes;
Changed telemetry component so that when title is hidden, telem element can take up 100% of the element width;
Static text elements now show scrollbars on overflow;
Added padding and box-sizing to text elements - this is throwing off the selected control because of the offset and should be fixed;
 2015-02-25 15:53:02 -08:00
Victor Woeltjen
f11eced6b9 [Common UI] Add spec for MCT scroll directive parent 
Add spec for MCTScroll, which will act as a parent class
for mct-scroll-x and mct-scroll-y directives, WTD-920.
 2015-02-25 15:47:30 -08:00
Charles Hacskaylo
a11967ce2e Merging in open-master; resolved conflict in /platform/.../edit-object.html 2015-02-25 13:21:56 -08:00
Victor Woeltjen
f523022a2a [Styles] Merge in style updates 
Merge in style updates and split pane updates related
to timeline view into open-source-friendly branch,
WTD-901
 2015-02-25 11:25:20 -08:00
Charles Hacskaylo
fa4cfc4961 [Frontend] In-progress checkin: 
WTD-894
Added scss file for fixed position styles;
Mods in progress to fixed.html to remove inline styling and change grid method to background gradient approach;
 2015-02-25 11:08:52 -08:00
bwyu
a3685d0c6b Merge remote-tracking branch 'origin/open878' into open-master 
Conflicts:
	platform/commonUI/edit/res/templates/edit-object.html
 2015-02-25 11:02:11 -08:00
Charles Hacskaylo
db87147bbd [Frontend] Normalized buttons in toolbar 
WTD-894
Fixed application of CSS styles in HTML templates to format buttons properly;
In-progress...
 2015-02-25 09:54:44 -08:00
Victor Woeltjen
52811787ac [Fixed Position] Update FixedController spec 
Update FixedController spec to include test for updating
set of elements in configuration based on changes to
composition, WTD-883.
 2015-02-24 14:33:11 -08:00
Victor Woeltjen
07fc65ed5b [Fixed Position] Remove old elements 
Remove elements from view configuration after they have been
removed from composition, WTD-883.
 2015-02-24 14:32:39 -08:00
Victor Woeltjen
6d709a6851 [Fixed Position] Ensure default positions 
Ensure all elements in a fixed position view's composition
are shown in view, WTD-883.
 2015-02-24 14:15:58 -08:00
Victor Woeltjen
be3a31324d [Fixed Position] Change class based on selection state 
Change classes for all non-selected objects when an object is
selected, WTD-882.
 2015-02-24 12:13:27 -08:00
Victor Woeltjen
91754f76ad [Fixed Position] Update specs 
Update specs for Fixed Position view to ensure code coverage
after changes for resize/reposition behavior, WTD-882.
 2015-02-24 12:02:43 -08:00
Victor Woeltjen
e2af1e85a1 [Fixed Position] Add spec for LineHandle 
Add tests for handles for positioning end point of lines
in fixed position view, WTD-882.
 2015-02-24 11:54:41 -08:00
Victor Woeltjen
6efccc0784 [Fixed Position] Add handles for line end points 
Add handles for moving line end points in fixed position view,
WTD-882.
 2015-02-24 11:48:46 -08:00
Victor Woeltjen
11360ba46c [Fixed Position] Add comments 
Add in-line documentation for WTD-882.
 2015-02-24 11:40:11 -08:00
Victor Woeltjen
5ba58ef056 [Fixed Position] Keep elements in view 
Prevent elements from being positioned at negative x/y
locations in a fixed position view, WTD-882.
 2015-02-24 11:38:46 -08:00
Victor Woeltjen
e56bac777e [Fixed Position] Use FixedDragHandle for moves 
Use FixedDragHandle to deal with repositioning, WTD-882.
 2015-02-24 11:29:52 -08:00