ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-22 22:42:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,866 Commits 989 Branches 212 Tags 191 MiB
29fdb6d641
Commit Graph

191 Commits

Author SHA1 Message Date
Victor Woeltjen
a4ea0dd047 Merge branch 'open-master' into open1223 
Merge latest from master branch into topic branch for
WTD-1223
 2015-06-23 13:29:47 -07:00
Victor Woeltjen
3b62add011 Merge branch 'open-master' into open1223 
Conflicts:
	platform/features/plot/res/templates/plot.html
 2015-06-19 13:34:21 -07:00
Victor Woeltjen
b879de1a33 Merge branch 'open-master' into open1182 2015-06-19 12:22:05 -07:00
Victor Woeltjen
8d80a2aee1 Merge branch 'open-master' into open1182 2015-06-18 18:23:19 -07:00
Charles Hacskaylo
70e1a8ad9e [Frontend] Mods to layout element drag handles and editing behavior 
WTD-951
layout.html:
Added classes to and removed inline styles from drag handles,
Removed edge handles, leaving corner handles in NW, SW and SE only;
Added hover classes to display corner handles while editing;
Modified z-indexing to allow view switcher to be accessed while editing;
 2015-06-16 12:40:48 -07:00
Charles Hacskaylo
a984e60ca5 [Frontend] Mods to layout element editing handles 
WTD-951
In-progress checkin
 2015-06-16 10:48:31 -07:00
Victor Woeltjen
de3c6e4543 [Fixed Position] Show limits in fixed position 
Show limits in fixed position view, WTD-1223.
 2015-06-09 10:18:28 -07:00
Victor Woeltjen
9a3ccc3295 [Limits] Merge in latest from platform 
Merge in latest changes to platform to begin implementing
limits, WTD-1223.
 2015-06-05 16:28:29 -07:00
Victor Woeltjen
a18a7c9960 [Layout] Fix comment 
Change inaccurate comment based on feedback from code
review for WTD-1182.
 2015-06-03 07:49:11 -07:00
Victor Woeltjen
9b6d8cf1ec [Representation] Minimize scope reuse 
When switching among domain objects and/or views, avoid
reusing the same information is scope. The wrong information
in scope can cause various failures in views, such as WTD-1182.
 2015-05-20 16:26:53 -07:00
Victor Woeltjen
f74199e60f [Layout] Add check to view in frame 
Add check to template for views in frame to avoid populating
frame prematurely; WTD-1182.
 2015-05-20 14:02:56 -07:00
Victor Woeltjen
10863514cb [Licenses] Add license headers 
WTD-1051.
 2015-05-13 16:43:30 -07:00
Charles Hacskaylo
58bd4240f1 [Frontend] Merging warp1172 platform changes in 
WTD-1172
(cherry picked from commit 219ffb4d59d4cc4a0172ba351af0e2b5d672d4b2)

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/sass/_fixed-position.scss
	warp/telemetry/src/autoflow/AutoflowTableLinker.js

Manually deleted AutoflowTableLinker.js
 2015-05-07 13:10:04 -07:00
Charles Hacskaylo
db74e2f84a [Frontend] CSS hooks for staleness 
WTD-1172
New .scss file for staleness
Added CSS hooks in templates for staleness
 2015-05-06 17:36:55 -07:00
Charles Hacskaylo
f114f742c4 [Frontend] Tweaks to markup and CSS 
WTD-1172
scrolling.html markup and CSS hooks;
added comments to change points;
CSS tweaking;
 2015-05-06 16:55:25 -07:00
Charles Hacskaylo
c8d06cb32a [Frontend] Limits added to fixed position view 
WTD-1172
 2015-05-06 11:20:09 -07:00
Charles Hacskaylo
582a236d8a [Frontend] Fixes, glyph and description updates 
WTD-1150
WTD-1145
Fixed incorrect references to iFrameController to EmbeddedPageController;
Added new glyph for Page;
Renamed Page to Web Page;
 2015-04-28 14:28:17 -07:00
Victor Woeltjen
9e4611bcfd [Containment] Fix bundle 
Fix dependencies in containment bundle to allow loading,
WTD-962.
 2015-04-07 21:03:36 -07:00
Charles Hacskaylo
8018c8f42e [Frontend] Sanding and polishing on common front-end elements 
WTD-1048
Originally did a lot of this work in warp1048 by mistake
This commit pulls in all /platform-only changes from that branch
Mods are mostly related to WTD-1046 specifically, but also touch toolbar and buttons
 2015-03-20 16:37:42 -07:00
Victor Woeltjen
3fe651b6ce [Layout] Remove selector 
Remove panel selector from Layout's Create menu; this was added
erroneously in a previous commit. Changed in the context of
WTD-922.
 2015-03-18 10:52:52 -07:00
bwyu
8673e2045e Merge remote-tracking branch 'origin/open987' into open-master 2015-03-16 10:28:55 -07:00
bwyu
c2d7996785 Merge remote-tracking branch 'origin/open929' into open-master 2015-03-13 16:21:08 -07:00
Charles Hacskaylo
cc181dbdc9 [Frontend] Form and form control enhancements 
WTD-1002
Added Angular hooks to allow form elements to have JSON defined CSS classes
Form element cleanups
 2015-03-10 22:36:35 -07:00
Victor Woeltjen
1efe80f12b [Forms] Hide filter in selector 
Hide filter shown in selector control, added for
WTD-987.
 2015-03-10 07:34:43 -07:00
Charles Hacskaylo
68c3ec7194 [Frontend] Removed preferred size form section 
WTD-1002
WTD-495
 2015-03-09 11:06:20 -07:00
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
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
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
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
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
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
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
Victor Woeltjen
c306865d87 [Fixed Position] Update style during resize 
Update element style during resize, WTD-882.
 2015-02-24 11:22:52 -08:00
Victor Woeltjen
5e3d5fd00f [Fixed Position] Initially implement handles 
Initially implement handles for resizing elements in a fixed
position view, WTD-882.
 2015-02-24 11:00:36 -08:00
Victor Woeltjen
abad8df135 [Fixed Position] Begin updating controller 
Begin updating controller to expose handles for dragging,
resizing elements in fixed position view. WTD-882.
 2015-02-24 10:33:36 -08:00
Victor Woeltjen
b871e0da91 [Fixed Position] Update FixedController spec 
Update FixedController spec to support updates to template
for selection highlight, drag handles; WTD-882.
 2015-02-24 10:12:33 -08:00
Victor Woeltjen
cd6c8afddc [Fixed Position] Add selection/handle markup 
Add initial markup for selection highlight, drag handles to
allow position/resize of elements in Fixed Position view,
WTD-882.
 2015-02-24 10:06:34 -08:00
Victor Woeltjen
3d86871c1d [Fixed Position] Cache name/value 
Cache name/value for telemetry elements to avoid flashing
after drag gestures, WTD-881.
 2015-02-24 09:25:14 -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
5ee0f9372b [Fixed Position] Fix appearance of Remove button 
Update appearance of Remove button in Fixed Position view
to match UI docs, WTD-881.
 2015-02-23 19:27:47 -08:00
Victor Woeltjen
41a013d198 [Fixed Position] Add button to show/hide telemetry name 
Add button to show/hide name of telemetry elements in
fixed position view, WTD-881.
 2015-02-23 19:25:33 -08:00
Victor Woeltjen
1c69d1f2da [Fixed Position] Add text, image properties 
Add buttons for text, image properties to the Fixed Position
toolbar, WTD-881.
 2015-02-23 19:16:09 -08:00
Victor Woeltjen
0b2cd52433 [Fixed Position] Add image proxy 
Add selection proxy for image elements to support image URL
dialog, WTD-881.
 2015-02-23 18:28:30 -08:00
Victor Woeltjen
894a5b8f89 [Fixed Position] Add text color property 
Add a property to the Fixed Position toolbar to set text
color, WTD-881.
 2015-02-23 18:17:24 -08:00
Victor Woeltjen
13793e221e [Fixed Position] Add stroke property 
Add stroke property to Fixed Position toolbar for
borders, line color. WTD-881.
 2015-02-23 18:05:37 -08:00
Victor Woeltjen
00f85447a2 [Fixed Position] Add color chooser 
Add color picker for fill color, WTD-881
 2015-02-23 16:47:52 -08:00
Victor Woeltjen
46c8a456b7 [Fixed Position] Begin adding color chooser 
Begin adding choice of fill colors for box/text/telemetry
elements in a fixed position view, WTD-881.
 2015-02-23 14:52:19 -08:00
Victor Woeltjen
182d02599d [Fixed Position] Add fill properties 
Add 'fill' properties, to allow specifying background
color in Fixed Position view. WTD-881.
 2015-02-23 10:48:44 -08:00
Victor Woeltjen
53aabd5743 [Fixed Position] Add ordering control 
Add order control for elements in a fixed position view,
WTD-881.
 2015-02-23 10:33:27 -08:00
Victor Woeltjen
0de06b0594 [Fixed Position] Specify glyph for Add 
Specify glyph for the Add button in the Fixed Position
view's toolbar, WTD-880.
 2015-02-20 16:30:00 -08:00
Victor Woeltjen
a2295e8416 [Fixed Position] Add JSDoc 
Add clarifying comments to different elements proxies, WTD-880.
 2015-02-20 16:26:10 -08:00
Victor Woeltjen
d75f9e51ac [Fixed Position] Add tests for new classes 
Add test cases for new classes introduced to support
Add options in the Fixed Position toolbar, WTD-880.
 2015-02-20 16:18:19 -08:00
Victor Woeltjen
e50e57b0be [Fixed Position] Add tests for FixedController 
Add tests for FixedController and FixedProxy which reflect
added/changed behavior for Add button, WTD-880.
 2015-02-20 15:59:22 -08:00
Victor Woeltjen
6814567116 [Fixed Position] Update failing specs 
Update existing tests to account for changes from WTD-880.
 2015-02-20 15:53:41 -08:00
Victor Woeltjen
84e90f6ad1 [Fixed Position] Select newly-created elements 
When elements are added to a fixed position view, select them
immediately. WTD-880.
 2015-02-20 15:47:07 -08:00
Victor Woeltjen
668a1e4534 [Fixed Position] Add empty specs 
Add empty specs for classes introduced in support of
Add menu options for fixed position view, WTD-880.
 2015-02-20 15:29:37 -08:00
Victor Woeltjen
f9043fdb7d [Fixed Position] Allow straight lines 
Pad width/height to give enough space to draw straight
lines; fix usage of background for boxes. WTD-880.
 2015-02-20 15:25:27 -08:00
Victor Woeltjen
2c0180ebda [Fixed Position] Draw line as SVG 
Draw line elements as SVG, WTD-880.
 2015-02-20 15:06:33 -08:00
Victor Woeltjen
638a7c8609 [Fixed Position] Add dialog for text 
Add dialog for text elements in fixed position view;
tweak styling on some other element types. WTD-880.
 2015-02-20 12:57:15 -08:00
Victor Woeltjen
f5b6be9b5d [Fixed Position] Add Image Properties dialog 
Add Image Properties dialog, for when a new image element
is created. WTD-880.
 2015-02-20 12:28:52 -08:00
Victor Woeltjen
a947ff1274 [Fixed Position] Add element factory 
Add element factory, which will take on responsibility
for populating initial states of elements and (if necessary)
prompting for user input. WTD-880.
 2015-02-20 12:21:28 -08:00
Victor Woeltjen
f1a8e84a93 [Fixed Position] Allow adding elements 
Allow adding of elements (without any element-specific
properties beyond type.) WTD-880.
 2015-02-20 11:53:50 -08:00
Victor Woeltjen
6fca03521b [Fixed Position] Add initial element templates 
Add element templates for fixed position elements introduced
via the Add button, WTD-880.
 2015-02-20 11:39:29 -08:00
Victor Woeltjen
2be58579dc [Fixed Position] Add 'Add' menu button 
Add UI for the Add button in fixed position view,
WTD-880.
 2015-02-20 11:30:04 -08:00
Victor Woeltjen
1015e97b3e [Fixed Position] Add tests for FixedController 
Add additional test cases for controller for Fixed Position
view to meet code coverage after changes for WTD-879.
 2015-02-19 16:24:45 -08:00
Victor Woeltjen
3cfcd027e0 [Fixed Position] Fill in specs for selection proxies 
Fill in specs for fixed position views selection proxies,
WTD-879.
 2015-02-19 13:29:43 -08:00
Victor Woeltjen
7882dd1401 [Fixed Position] Add spec for selection 
Add spec for selection manager for layout and fixed position
views, WTD-879.
 2015-02-19 13:06:55 -08:00
Victor Woeltjen
14cbb9fb40 [Fixed Position] Add placeholder specs 
Add placeholder specs for classes added to support
selection of elements in a fixed position view,
WTD-879.
 2015-02-19 12:21:39 -08:00
Victor Woeltjen
7498e340d6 [Fixed Position] Rename accessor 
Rename utility function used by fixed position elements
to be more accurate. WTD-879.
 2015-02-19 12:10:43 -08:00
Victor Woeltjen
83872946bf [Fixed Position] Fix grid size spec 
Fix spec which ensures that FixedController correctly
populates background grid based on user-defined grid
size, after changes for WTD-879.
 2015-02-19 10:22:12 -08:00
Victor Woeltjen
9a50f6d84d [Fixed Position] Fix globals 
Fix globals to pass JSLint check in command line build. WTD-879.
 2015-02-19 09:37:02 -08:00
Victor Woeltjen
5df41966a4 [Fixed Position] Disable failing specs 
Disable failing specs after significant rewrite of
FixedController to handle element selection, WTD-879.
 2015-02-19 09:13:45 -08:00
Victor Woeltjen
7bd41a9f80 [Fixed Position] Allow dragging of elements 
Restore dragging behavior to elements in a fixed position
view, WTD-879.
 2015-02-18 20:29:54 -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
f66fb0a32d [Fixed Position] Add remove button 
Add a 'remove' button when elements are selected in
fixed position view, WTD-879.
 2015-02-18 19:56:54 -08:00
Victor Woeltjen
a4dd730764 [Fixed Position] Allow select/deselect 
Allow select/deselect of individual elements in fixed position
view, WTD-879.
 2015-02-18 19:51:42 -08:00
Victor Woeltjen
cd98fd475d [Fixed Position] Begin using proxies 
Begin using proxies for elements in fixed position view,
WTD-879.
 2015-02-18 19:41:27 -08:00
Victor Woeltjen
f24f62dedc [Fixed Position] Begin adding element proxy classes 
Begin adding proxy classes to allow the toolbar to interact with
elements in a fixed position view, WTD-879.
 2015-02-18 19:26:06 -08:00
Victor Woeltjen
466a169562 [Fixed Position] Continue refactoring controller 
Continue refactoring Fixed Position controller for
selection support, WTD-879.
 2015-02-18 15:11:52 -08:00
Victor Woeltjen
bf36141e91 [Fixed Position] Begin refactoring controller 
Begin refactoring Fixed Position controller to facilitate
selection support, as well as multiple types of elements;
WTD-879.
 2015-02-18 13:50:25 -08:00
Victor Woeltjen
8662689974 [Fixed Position] Begin breaking apart template 
Begin breaking apart template to allow multiple
types of fixed position elements, WTD-879.
 2015-02-18 13:19:59 -08:00
Victor Woeltjen
97b844563d [Fixed Position] Add proxy object 
Add proxy object to represent the selection of the fixed position
view itself, WTD-879.
 2015-02-18 09:03:50 -08:00