ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-25 07:41:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,305 Commits 989 Branches 212 Tags 191 MiB
29b91193fb
Commit Graph

59 Commits

Author SHA1 Message Date
larkin
cc64412d78 Merge remote-tracking branch 'origin/open1344' into open-1348 2015-06-29 14:58:27 -07:00
larkin
38ad8058e8 Merge remote-tracking branch 'origin/open1223' into open-1338 
Resolve merge conflicts due to whitespace changes.
 2015-06-29 12:08:16 -07:00
larkin
84345caf7d [Style] Convert tabs to spaces 2015-06-29 11:51:28 -07:00
Charles Hacskaylo
685e384858 [Dev/Frontend] PLATFORM CHANGES: use data-value instead of css class selection 
WTD-1341
(cherry picked from commit 5151637 in warp1341)
telemetry.html now uses data-value instead of class;
Mods to effects.scss to add customKeyframes mixin;
Added default transition time to mixin trans-prop-nice in mixins.scss;
 2015-06-25 11:46:15 -07:00
Victor Woeltjen
482f355a08 [Fixed Controller] Stop tracking bounds 
Stop tracking size of a fixed position view; no longer
necessary now that background grid is handled by CSS.
Change made in the context of WTD-1344.
 2015-06-25 11:00:15 -07:00
Charles Hacskaylo
52a7bd1033 [Dev/Frontend] Cherry-picking platform changes from warp1341 
WTD-1341
 2015-06-24 18:55:15 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
082b555644 [Fixed Position] Persist drag positions 
Persist element positions after drag in fixed position view,
WTD-615.
 2015-01-16 09:47:29 -08:00
Victor Woeltjen
b2c9b0a2fb [Fixed Position] Position/style telemetry cells 
Position telemetry elements in fixed position view appropriately.
WTD-615.
 2015-01-15 19:03:34 -08:00
Victor Woeltjen
bd068f31c5 [Fixed Position] Fill available area with grid 
Fill available space with background grid for fixed position
view, WTD-615.
 2015-01-15 18:53:59 -08:00
Victor Woeltjen
b2bfa2b09b [Fixed Position] Populate background grid 
Add a background grid to fixed position view, WTD-615.
 2015-01-15 18:48:11 -08:00
Victor Woeltjen
d453e59308 [Fixed Position] Expose controller 
Expose Fixed Position controller in order to begin implementing
Fixed Position view and editing behavior. WTD-615.
 2015-01-15 18:36:48 -08:00