ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-02 03:16:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
653 Commits 989 Branches 212 Tags 191 MiB
6575291e3e
Commit Graph

190 Commits

Author SHA1 Message Date
bwyu
6575291e3e Merge remote-tracking branch 'origin/open788' into open-master 2015-03-10 12:41:08 -07:00
bwyu
b05315a140 Merge remote-tracking branch 'origin/open920' into open-master 2015-03-09 11:06:12 -07: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
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
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
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
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
1e76264d82 [Edit] Avoid extra commits 
Avoid issuing extra commit calls from the Edit toolbar;
this can cause disruption of state from other views (such
as Fixed Position), WTD-881.
 2015-02-24 09:47:00 -08:00
Victor Woeltjen
59ff539bfb [Fixed Position] Update specs for coverage 
Update specs to restore code coverage after changes for WTD-881.
 2015-02-24 09:18:00 -08:00
Victor Woeltjen
8452b2ab12 [Fixed Position] Update specs 
Update failing specs after changes for WTD-881.
 2015-02-24 09:07:57 -08:00
Victor Woeltjen
307fbe2151 [Edit] Update EditToolbar spec 
Update EditToolbar spec to reflect changes for WTD-881.
 2015-02-23 19:47:56 -08:00
Victor Woeltjen
6c7dfb878b [Edit] Avoid rebuilding toolbar on edit 
Avoid rebuilding the toolbar in Edit mode whenever
any change occurs to avoid losing the binding to the
current selection state; needed for color picker to
work properly for WTD-881.
 2015-02-23 15:57:45 -08:00
Victor Woeltjen
f894233182 [Edit] Default to inclusive mode 
Default to inclusive mode in Edit mode toolbar;
simplifies adding additional toolbar elements for
Fixed Position view, WTD-881.
 2015-02-23 15:13:46 -08:00
Victor Woeltjen
c183f08886 [Edit] Fix state-watching 
Repair/simplify state-watching in representer for toolbar
in edit mode; avoids issue where destroy calls detach
watches for state change in toolbar prematurely. WTD-881.
 2015-02-23 14:51:17 -08:00
Victor Woeltjen
8c653d39d7 [Edit] Update specs 
Update specs for toolbars in Edit mode to reflect
changes for WTD-879.
 2015-02-19 12:44:00 -08:00
Victor Woeltjen
5680710c06 [Fixed Position] Implement remove 
Implement remove button for selected elements in fixed
position view. WTD-879.
 2015-02-18 20:12:55 -08:00
Victor Woeltjen
db2f2eb098 [Fixed Position] Improve button support 
Improve button support from toolbars by adding a click
function when generating structures for mct-toolbar based
on view definitions. WTD-879.
 2015-02-17 16:29:15 -08:00
Victor Woeltjen
98caa31d7b Merge branch 'open877' into open879 
Merge fixed position view work and general toolbar
work to begin adding toolbars for fixed position view,
WTD-879."

Conflicts:
	platform/commonUI/edit/res/templates/edit-object.html
 2015-02-17 15:58:36 -08:00
Victor Woeltjen
3916968544 [Edit] Add EditToolbarRepresenter spec 
Add tests for representer which mediates between view's
selection and toolbar contents, WTD-878.
 2015-02-17 15:47:18 -08:00
Victor Woeltjen
48754c78bf [Edit] Wire in toolbar representer 
Wire in representer for handling toolbars in Edit mode,
and add some clarifying documentation. WTD-878.
 2015-02-17 15:30:23 -08:00
Victor Woeltjen
023c12ec3b [Edit] Add toolbar representer 
Add a representer to handle exposing toolbars for views in
edit mode. WTD-878.
 2015-02-17 14:31:02 -08:00
Victor Woeltjen
5dc72b15c2 [Edit] Implement EditToolbar 
Implement EditToolbar (sufficient to satisfy spec) which will
construct an mct-toolbar-friendly form structure based on both
the current selection and the view's defined toolbar structure.
WTD-878.
 2015-02-17 13:47:14 -08:00
Victor Woeltjen
8f14f4e5eb [Edit] Add spec for toolbar 
Add spec for class that will convert toolbar definition
provided by views to suitable input for mct-toolbar, WTD-878.
 2015-02-17 12:58:36 -08:00
Victor Woeltjen
ab546c9541 [Edit] Document toolbar behavior 
Document how toolbars may be described by a view such
that Edit mode will populate the actual displayed
toolbar, WTD-878.
 2015-02-17 12:19:35 -08:00
Victor Woeltjen
abe4be9238 [Fixed Position] Remove unused representer 
Remove unused representer for view toolbars; clean up for
WTD-889.
 2015-02-17 08:30:42 -08:00
Victor Woeltjen
c6064dfe6c Merge branch 'open615' into open889 
Merge in work-in-progress for WTD-615 (Fixed Position View)
into topic branch for WTD-889 (a sub-issue of WTD-615, which
has been broken down into discrete chunks to support
development.

Conflicts:
	platform/telemetry/src/TelemetrySubscription.js
 2015-02-17 08:26:34 -08:00
Victor Woeltjen
e073ca5145 Merge remote-tracking branch 'nasa/open763' into open796 
Merge CSS fix for dialog overlay, WTD-796
 2015-02-12 15:31:30 -08:00
bwyu
19bcfef123 Merge remote-tracking branch 'origin/open747' into open-master 2015-02-06 16:45:49 -08:00
bwyu
4f17071c85 Merge remote-tracking branch 'origin/open669' into open-master 2015-02-04 13:05:30 -08:00
bwyu
def47addb3 Merge remote-tracking branch 'origin/open734' into open-master 2015-02-04 12:24:23 -08:00
bwyu
107ed51cfc Merge remote-tracking branch 'origin/open723' into open-master 2015-02-03 17:26:53 -08:00