Commit Graph

184 Commits

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
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
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
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
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
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
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
bwyu
dfba9fd510 Merge remote-tracking branch 'origin/open473' into open-master 2015-02-03 16:32:08 -08:00
bwyu
5c649935d2 Merge remote-tracking branch 'origin/open717' into open-master 2015-02-02 16:58:27 -08:00
bwyu
7be872c3a4 Merge remote-tracking branch 'origin/open705' into open-master 2015-02-02 14:33:37 -08:00
Charles Hacskaylo
420a006fab [Bug/Front-end] Fixed display overflow issue in Create dialog
WTD-763
Added new class with overflow: auto to div element in platform/.../dialog.html
2015-01-29 16:27:19 -08:00
Victor Woeltjen
92252b41d4 [Browse] Remove unused container
Remove unused container definition for split pane; this
turned out not to be a suitable quick-fix approach to
WTD-747 (implementation of this behavior directly from
the browse template turned out to be more convenient.)
2015-01-28 16:45:20 -08:00
Victor Woeltjen
c0a1e0a0d4 [Browse] Add spec for SplitPaneController
Add unit test for controller which supports the moveable
splitter in Browse mode, WTD-747.
2015-01-28 16:43:18 -08:00