Henry
6d0f3c7faa
[Layout] Layout rebuilds after resize/reposition #32
...
Refactored layoutPanels method
Fixed JSLint errors
fixed failing tests
2015-11-25 15:30:33 -08:00
Henry
988323bdbd
merged Open32
2015-11-25 14:59:47 -08:00
Henry
c84de00e80
[Layout] Layout rebuilds after resize/reposition #32
2015-11-24 21:51:10 -08:00
Henry
b27b60aedc
Merge branch 'master' into open199
2015-11-17 14:30:57 -08:00
akhenry
b7eb9491cb
Merge pull request #275 from nasa/open271
...
[Layout] Enforce minimum size on drop
2015-11-12 16:10:50 -08:00
Charles Hacskaylo
608df8f7b8
Merging in latest github master; resolved conflicts
2015-11-10 16:13:46 -08:00
Victor Woeltjen
fdf6148811
[Layout] Enforce minimum size on drop
...
Addresses nasa/openmctweb#271 , ensuring frames in a layout
are not too tiny to use, even if the grid size is small.
2015-11-09 17:58:20 -08:00
Charles Hacskaylo
4e79de6156
[Frontend] Apply flex layout to object header elements
...
open #250
open #260
vista#132
Major refactoring to markup and CSS to apply
flex layout strategy to object headers;
Flex necessary to fix 'overflow: hidden' setting
applied in open90 to object-browse-bar that
was preventing the view switcher menu from
appearing;
Browse, edit, mobile, frames in layouts, etc. all
visually checked in a first go round;
Mobile classes tweaked to fix left and right
margin problems resulting from open90 changes;
z-indexing of Inspector pane and splitters changed
to allow primary pane elements to overflow beneath
when primary pane width is severely constrained;
2015-11-06 17:42:54 -08:00
Andrew Henry
92573b817f
Added drag to enable edit mode
2015-10-20 21:03:36 -07:00
Victor Woeltjen
1efa97e6f5
Merge remote-tracking branch 'github/master' into open115b
...
Conflicts:
platform/features/conductor/src/ConductorRepresenter.js
2015-10-09 10:32:43 -07:00
Charles Hacskaylo
333f7cb848
[Frontend] Time controller-related styling
...
open #1515
open #117
Markup changed to utilize mct-representation via CSS;
time-controller now uses list-based _constants values;
ConductorRepresenter.js modded to remove inline styling
and to add CSS classes to enclosing mct-representation;
2015-09-29 08:43:34 -07:00
Victor Woeltjen
4ced6c44a6
[Time Conductor] Ignore empty series
...
...when updating Fixed Position view.
2015-09-24 17:01:50 -07:00
Victor Woeltjen
0260e6fff4
Merge branch 'open1515' into open115
2015-09-23 16:05:09 -07:00
Charles Hacskaylo
9811443c71
Merge branch 'master' into open117
2015-09-23 15:54:48 -07:00
Victor Woeltjen
056b0c8c5b
[Fixed Position] Use spaces instead of tabs
...
...to satisfy code style checker and pass build,
in preparation for merge. nasa/openmctweb#118
2015-09-23 12:59:04 -07:00
Victor Woeltjen
dbe1875e70
[Themes] Resolve conflicts
...
Resolve conflicts in preparation for merge, nasa/openmctweb#118
2015-09-22 16:12:44 -07:00
Pete Richards
480da3476e
Merge branch 'mobile' into mobile-integration
2015-09-22 10:55:43 -07:00
Charles Hacskaylo
65368ed0c3
[Config] Removed non-functional config options from Create dialogs;
...
open #124
Removed "Default view" and "Display title by default" from
Panel configs;
2015-09-18 13:43:29 -07:00
Charles Hacskaylo
f28d2f19d0
[Frontend/PLATFORM] Cherry picking from platform changes in vista65
...
open #95
vista #65
scss and html mods for VISTA-related elements;
(cherry picked from commit 6ef3987)
2015-09-16 17:17:54 -07:00
Victor Woeltjen
190f5fd0ea
[Time Conductor] Update failing specs
...
WTD-1515
2015-09-16 15:23:08 -07:00
Victor Woeltjen
ad29fb0f92
[Time Conductor] Populate FP from historical
...
Populate fixed position view from historical
telemetry when first loaded. WTD-1515
2015-09-16 13:38:47 -07:00
Charles Hacskaylo
3e5d46a62b
[Frontend] IN-PROGRESS Theme changes continuing
...
open #95
Limits, plots, etc.;
Misc sanding and shimming;
Updated symbols font to replace missing
Info symbol;
2015-09-11 16:25:19 -07:00
Victor Woeltjen
e3b191b5dc
[Time Controller] Update failing specs
...
Update failing specs to reflect support for time conductor,
WTD-1515
2015-09-09 16:52:46 -07:00
Victor Woeltjen
a4dda695dd
[Time Controller] Get conductor working with fixed pos.
...
WTD-1515
2015-09-09 16:46:00 -07:00
Victor Woeltjen
fdbc91131b
[Time Controller] Update bundle definition
...
...for Fixed Position view to reflect changes to dependencies,
WTD-1515.
2015-09-08 17:18:39 -07:00
Victor Woeltjen
d2dfec3ce7
[Time Controller] Simplify retrieval of datum objects
...
...for historical data. Supports WTD-1515
2015-09-08 17:03:58 -07:00
Victor Woeltjen
760f4b818f
[Time Conductor] Update fixed position from history
...
WTD-1515
2015-09-08 16:53:06 -07:00
Victor Woeltjen
c026bfa17d
[Time Conductor] Begin adding support to fixed position
...
Begin adding support for universal time controller to
fixed position view, WTD-1515.
2015-09-08 16:37:10 -07:00
Charles Hacskaylo
bb1a02c8bd
[Frontend] Significant re-factoring of CSS and markup
...
open #95
IN-PROGRESS!;
Mostly buttons and menus classes (s-btn and s-menu);
Removed unused templates and .css files;
Normalized some button containers;
2015-09-02 18:02:58 -07:00
Shivam Dave
def5e17bb8
[Mobile] Merge
...
Merged open73 into mobile. Search bar is currently
covering the create button slightly.
2015-08-26 14:07:52 -07:00
Charles Hacskaylo
e96d3e3738
[Mobile] IN PROGRESS: Significant redo of object-header
...
open #74
Added .bar .l-flex using display: flex in object header;
2015-08-24 12:22:08 -07:00
Charles Hacskaylo
ee608cc4a4
[Mobile] IN PROGRESS: General fixes, spurred by mobile, for object-header
...
open #74
Attempting to layout using flex - not working;
See http://jsfiddle.net/charlesh88/cpf9zjts/9/ for working example;
New _flex.scss added;
This commit is changed elements that are mostly solid;
2015-08-21 15:09:23 -07:00
Victor Woeltjen
ed53808556
[Code Style] Use prototypes in Layout bundle
...
WTD-1482
2015-08-12 13:45:48 -07:00
Victor Woeltjen
31eb366e7f
[JSDoc] Add namespace docs
...
WTD-1482.
2015-08-07 12:13:15 -07:00
Victor Woeltjen
c08a460d30
[JSDoc] Add annotations
...
Bulk-add JSDoc annotations, WTD-1482.
2015-08-07 11:44:54 -07:00
Victor Woeltjen
2ca3c6ea93
[Layout] Use consistent whitespace
...
Use consistent whitespace in array literals, WTD-1424.
2015-08-04 10:00:44 -07:00
Victor Woeltjen
a4c704a5a2
[Layout] Ensure minimum frame size
...
Ensure default frame size in a layout is not small,
even if the grid size for the layout is very small.
WTD-1424.
2015-08-03 12:18:49 -07:00
Charles Hacskaylo
af2ca49b23
[Frontend] Added top right resize corner
...
WTD-1404
WTD-1376
2015-06-30 09:27:56 -07:00
Victor Woeltjen
87f982b03e
Merge remote-tracking branch 'nasa/open-master' into open-master
2015-06-29 15:10:02 -07:00
Victor Woeltjen
29283e4fb5
Merge branch 'open1233' into open-master
2015-06-29 15:09:40 -07:00
larkin
cc64412d78
Merge remote-tracking branch 'origin/open1344' into open-1348
2015-06-29 14:58:27 -07:00
Victor Woeltjen
ebbac233aa
Merge branch 'open1373' into open-master
2015-06-29 13:15:43 -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
Victor Woeltjen
762f4d59fc
[Layout] Disallow folders
...
Disallow layouts in folders, WTD-1373.
2015-06-27 12:43:32 -07:00
Victor Woeltjen
286ac5628b
[Drag-Drop] Check for default prevented correctly
...
Check for defaultPrevented property instead of trying
to check nonexistent method isDefaultPrevented(); for
WTD-1354 in the context of WTD-1233.
2015-06-26 11:53:45 -07:00
Victor Woeltjen
f681d07643
Merge branch 'open-master' into open1233
2015-06-26 11:50:48 -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
61fe77cc17
[Drag-Drop] Add test cases
...
Add test cases for avoiding redundant drop handling,
WTD-1233.
2015-06-25 11:35:18 -07:00
Victor Woeltjen
6f3d6ec12f
[Drag-Drop] Prevent redundant drops
...
Mark default as prevented and check for prevention of
default when handling mctDrop events (which allow
views to follow up on drop gestures by positioning
objects within themselves) avoiding redundant drops
into embedded views. WTD-1233.
2015-06-25 11:27:58 -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
Victor Woeltjen
9e55befb2a
[Fixed Controller] Add test cases
...
Add test cases for updating position of elements in
a fixed position view, WTD-1344.
2015-06-25 10:58:01 -07:00
Victor Woeltjen
4279c9e4bf
[Fixed Position] Remove obsolete cell styles
...
Remove obsolete cell style calculations; background
grid is handled by CSS now. Changed in the context of
WTD-1344.
2015-06-25 10:48:49 -07:00
Victor Woeltjen
791504584d
[Fixed Position] Update positions when grid size changes
...
Update positions of elements in a fixed position
view when grid size changes (e.g. when switching
from one domain object to another.) WTD-1344.
2015-06-25 10:45:50 -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
065a5a6fbf
[Limits] Disable failing specs
...
Disable specs which are failing after changes to support
limits, WTD-1223.
2015-06-23 13:43:00 -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
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