ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-30 01:48:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,617 Commits 988 Branches 212 Tags 191 MiB
d63c401e44
Commit Graph

1805 Commits

Author SHA1 Message Date
Charles Hacskaylo
73c2c01def [Frontend] Layout and styling of Time Conductor 
open #889
open #298
Fixes for mobile;
Moved popup z-index def into sass;
Datetime picker compressed for
better fit in mobile phone;
Removed hours selector from datetime
picker to enable better fit in mobile;
 2016-05-11 11:32:39 -07:00
Charles Hacskaylo
7c82e31b66 Merge branch 'master' into open889 2016-05-10 23:09:59 -07:00
Charles Hacskaylo
2829b8d495 [Frontend] Time Conductor mobile 
open #889
- Major refactoring of mobile approach,
leveraging flex-box layout change;
 2016-05-10 19:52:11 -07:00
Charles Hacskaylo
7ade873365 [Frontend] Flex; Tweaks to slider knobs 
open #889
- Converted TC elements to use flex
layout instead of abs pos;
- Knob size increased;
- Knob grippies added;
 2016-05-10 15:12:50 -07:00
Charles Hacskaylo
8788523c25 [Frontend] Tweaks to slider knobs 
open #889
- Knob size increased;
- Knob grippies added;
 2016-05-10 14:28:23 -07:00
Charles Hacskaylo
c301523156 [Frontend] Layout and positioning fixes for TC controls 
open #889
IN PROGRESS
- Smaller font used on range value;
- More space allocated to left and right
for slider range values;
- Style tweaks to slider look;
- Layout and style of datetime inputs
fixed;
- Input error colors fixed, moved to
theme constants;
 2016-05-09 17:56:50 -07:00
Charles Hacskaylo
2e8604e18d [Frontend] Layout and positioning fixes for TC controls 
open #889
 2016-05-09 10:38:18 -07:00
Pete Richards
3ca9d21bbd Merge remote-tracking branch 'origin/open663' 2016-05-09 10:33:39 -07:00
Pete Richards
61683800cc [Style] Update style to reflect new jshint config 
Update style to match new jshint config

https://github.com/nasa/openmct/issues/671
 2016-05-09 10:33:26 -07:00
Pete Richards
4c74391137 Merge remote-tracking branch 'origin/open836' 2016-05-09 10:25:25 -07:00
Pete Richards
f3b265bdd5 Merge branch 'master' into open671 2016-05-09 10:19:24 -07:00
Charles Hacskaylo
cae85f3e30 [Frontend] Mods to slider .range-value elems 
open #889
- Text smaller, line breaks;
- Height adjustments
- Increased with of slider area;
 2016-05-09 10:16:54 -07:00
Victor Woeltjen
3efaa3b1cb Merge pull request #894 from nasa/open892 
#892 Removed browser warning
 2016-05-06 09:51:36 -07:00
Victor Woeltjen
2fe9698ea8 Merge pull request #891 from nasa/fix-clickaway-888 
[General] remove dupe, debounce inputs
 2016-05-06 09:49:13 -07:00
Henry
00433f02bc #892 Removed browser warning 2016-05-05 21:45:18 -07:00
Pete Richards
7fad4e9ea1 [General] remove dupe, debounce inputs 
Remove duplicate ClickAwayController implementation that was obscuring actual
implementation.  Debounce clickaway action in case toggle is invoked in a
click handler.

Resolves https://github.com/nasa/openmct/issues/888
 2016-05-05 18:25:37 -07:00
Victor Woeltjen
5279c842f5 [Branding] Change title of about dialog 2016-05-04 10:17:23 -07:00
Victor Woeltjen
8756b7213f [Persistence] Remove persistence usage from EditRepresenter 2016-04-29 11:35:00 -07:00
Charles Hacskaylo
ff36d9ee80 [Frontend] Removed bullets from ol, ul 
open #869
- This should be cherry-picked into main
branches as well.
(cherry picked from commit 4c97413)
 2016-04-29 10:54:28 -07:00
Victor Woeltjen
433d26e703 [Persistence] Remove persistence usage from Remove action 2016-04-26 16:53:12 -07:00
Victor Woeltjen
c99ffcb1f4 [Persistence] Remove persistence call from compose action 2016-04-26 16:50:15 -07:00
Victor Woeltjen
7fb7a5452f [Persistence] Remove persistence usage from Edit Properties 2016-04-26 16:43:52 -07:00
Charles Hacskaylo
0390f46460 [Frontend] z-index added to .object-top-bar .left element 
#836
 2016-04-25 09:55:21 -07:00
Henry
11cfb6e1b8 [Edit] Elements pool filtering displays more consistent results 2016-04-21 10:42:50 -07:00
Henry
06436c488a [Edit Mode] #794 Modified policy to show remove action in context for non-editable domain object types 2016-04-18 19:05:46 -07:00
Andrew Henry
6cb9619fbe Merge pull request #829 from nasa/open630 
[Edit mode] Simplify SaveAction
 2016-04-14 16:11:49 -07:00
Henry
8c3616da32 Addressed code review points 2016-04-14 16:04:15 -07:00
Pete Richards
b682cf8340 [Style] Remove outdated comments 2016-04-13 17:41:24 -07:00
Pete Richards
22a5122ab7 [Conductor] Style for Phone and Tablet 
Specify styles for time conductor on phone an tablet to hide the slider and
utilize space better.

https://github.com/nasa/openmct/issues/318
 2016-04-13 17:17:52 -07:00
Pete Richards
7a7877d7c4 [Conductor] Add basic style for phone 
Add styling for time conductor on mobile that removes slider and rearranges
inputs to utilize space more effectively.

https://github.com/nasa/openmct/issues/318
 2016-04-13 16:17:17 -07:00
Pete Richards
69c059c943 [Conductor] Update inner bound on blur 
The time conductor updates the inner and outer bounds when the input is
blurred, which results in the query updating without dragging.

Also allows time conductor to be utilized on mobile devices by entering
dates directly.

https://github.com/nasa/openmct/issues/318

User request:
https://github.jpl.nasa.gov/MissionControl/vista/issues/175
 2016-04-13 13:49:23 -07:00
Pete Richards
6d58f23c0c [Style] Switch to prototype 
Switch TimeRangeController to prototype style, and update tests
and template to utilize new style.
 2016-04-13 13:23:33 -07:00
Henry
26e368f52d [Edit mode] Simplify SaveAction 2016-04-12 14:40:19 -07:00
Henry
519a9333ab Updated tests 2016-04-11 17:10:35 -07:00
Henry
2fe7ba982f Added 'Open in New Tab' to context menu in edit mode 2016-04-11 17:06:37 -07:00
Henry
7f108c3b24 [Edit Mode] #635 Removed Edit-related concerns from ContextMenuGesture 2016-04-11 15:39:35 -07:00
Victor Woeltjen
934eb13813 [Build] Remove obsolete jslint tags 
ES5 mode is enabled by default in JSHint, tags no longer necessary per
https://github.com/nasa/openmct/pull/724#discussion_r55095722
 2016-04-08 16:54:01 -07:00
Victor Woeltjen
0b11ddbcfd [Build] Satisfy JSHint 
Restore globals lost during removal due to merge, remove unused
variables and use threequals in new scripts.
 2016-04-08 16:22:40 -07:00
Victor Woeltjen
5088453712 [Build] Remove use strict, global 
Remove usages of use strict and global declarations that are
no longer necessary with JSHint configuration, from files
added/changed since #724
 2016-04-08 16:11:12 -07:00
Victor Woeltjen
5e44bfc6c7 Merge branch 'master' into open671 
Conflicts:
	main.js
	platform/commonUI/edit/src/policies/EditableMovePolicy.js
	platform/commonUI/general/src/directives/MCTTree.js
	platform/commonUI/general/src/ui/ToggleView.js
	platform/core/src/actions/ActionCapability.js
	platform/core/test/models/CachingModelDecoratorSpec.js
	platform/core/test/services/InstantiateSpec.js
	platform/features/events/bundle.js
	platform/features/events/src/DomainColumn.js
	platform/features/events/src/EventListController.js
	platform/features/events/src/EventListPopulator.js
	platform/features/events/src/RangeColumn.js
	platform/features/events/src/directives/MCTDataTable.js
	platform/features/events/src/policies/MessagesViewPolicy.js
	platform/features/events/test/DomainColumnSpec.js
	platform/features/events/test/EventListControllerSpec.js
	platform/features/events/test/EventListPopulatorSpec.js
	platform/features/events/test/RangeColumnSpec.js
	platform/features/events/test/policies/MessagesViewPolicySpec.js
	platform/features/rtevents/bundle.js
	platform/features/rtevents/src/DomainColumn.js
	platform/features/rtevents/src/RTEventListController.js
	platform/features/rtevents/src/RangeColumn.js
	platform/features/rtevents/src/directives/MCTRTDataTable.js
	platform/features/rtevents/src/policies/RTMessagesViewPolicy.js
	platform/features/rtevents/test/DomainColumnSpec.js
	platform/features/rtevents/test/RTEventListControllerSpec.js
	platform/features/rtevents/test/RangeColumnSpec.js
	platform/features/rtevents/test/policies/RTMessagesViewPolicySpec.js
	platform/features/rtscrolling/bundle.js
	platform/features/rtscrolling/src/DomainColumn.js
	platform/features/rtscrolling/src/NameColumn.js
	platform/features/rtscrolling/src/RTScrollingListController.js
	platform/features/rtscrolling/src/RangeColumn.js
	platform/features/scrolling/src/DomainColumn.js
	platform/features/scrolling/src/RangeColumn.js
	platform/features/scrolling/src/ScrollingListController.js
	platform/features/scrolling/src/ScrollingListPopulator.js
	platform/features/scrolling/test/DomainColumnSpec.js
	platform/features/scrolling/test/RangeColumnSpec.js
	platform/features/scrolling/test/ScrollingListControllerSpec.js
	platform/features/scrolling/test/ScrollingListPopulatorSpec.js
	platform/features/table/src/directives/MCTTable.js
	platform/features/table/test/controllers/TelemetryTableControllerSpec.js
	platform/representation/src/gestures/DropGesture.js
	platform/telemetry/src/TelemetryFormatter.js
	test-main.js
 2016-04-08 16:08:19 -07:00
Pete Richards
c591ade479 Merge remote-tracking branch 'origin/781' 2016-04-06 10:35:40 -07:00
Victor Woeltjen
8f4f0cb78e Merge pull request #785 from nasa/open677_cleanup 
[Timelines] #677 Removed temporary markup
 2016-04-05 12:24:58 -07:00
Charles Hacskaylo
a01f7ddd2d [Frontend] Refinements to .loading and related 
#445
Markup enhanced in wait-node.html;
More wait-spinner constants added;
Normalized appearance between tree-based
.loading and .s-status-pending;
Fixed .s-status-pending to work now that
mct-representation is gone from tree;
 2016-03-24 15:10:22 -07:00
Charles Hacskaylo
e7e91e21fc [Frontend] Markup and CSS for loading tree items 
#445
New wait-spinner constants;
Markup fixed in wait-node.html;
Styles for .loading when applied to
.tree-item.wait-node;
Changed from percent-of-parent-
width sizing of spinner to fixed size;
 2016-03-24 15:10:02 -07:00
Pete Richards
cc5d14deec Merge branch '755a' 2016-03-24 13:21:59 -07:00
Pete Richards
cd7ff8ad85 Merge remote-tracking branch 'origin/timestamps-776' 2016-03-24 13:09:32 -07:00
Pete Richards
fa5d59bff8 Merge branch 'timeline-save-770b' 2016-03-24 13:06:53 -07:00
Charles Hacskaylo
0643fb1f3f [Frontend] Updated icomoon project file 
#781
 2016-03-23 19:17:39 -07:00
Charles Hacskaylo
289debf19d [Frontend] Fixed hover problem with menu items 
#781
#187
Noticed a problem with <a> tags in
Create menu items and fixed with display: block;
 2016-03-23 19:10:59 -07:00
Charles Hacskaylo
528169de2c [Frontend] Updated glyphs 
#781
Added multiple new and updated glyphs;
Updated glyph defs for Historic and
Real-Time Tables;
 2016-03-23 17:42:58 -07:00
Henry
650ef9bfa4 [Timelines] #677 Removed temporary markup 2016-03-23 11:27:40 -07:00
Victor Woeltjen
31d8c9a48f [Timeline] Allow linking during edit 
...in cases where it is safe to do so (specifically, when the
linked-to object has already been persisted.)
 2016-03-22 12:04:50 -07:00
Victor Woeltjen
a411bac331 [Time Format] Append Z instead of zone offset 
...for brevity (reduce visual noise)
 2016-03-21 14:29:24 -07:00
Victor Woeltjen
5624c7d545 [Time Formats] Display UTC with milliseconds 
#776
 2016-03-21 13:04:59 -07:00
Victor Woeltjen
007741b4e7 [Timeline] Add move policy 
...to restore suppression of Move for objects being edited
(relaxed for the specific case of moving one object being
edited into another object being edited, for use in Timelines.)
 2016-03-21 12:07:19 -07:00
Charles Hacskaylo
aa48044345 [Frontend] Form styling 
#772
Added ".l-controls-under" styling to allow
channel-selector layout;
Added new hint color constants and refined
style defs;
 2016-03-21 11:13:43 -07:00
Victor Woeltjen
d12111d9b8 [Add] Fix promise chaining in AddAction 2016-03-21 10:32:02 -07:00
Victor Woeltjen
8fa030437e [Add] Remove edit awareness 
Remove step where Added objects are persisted via the editor
capability; instead, persist via the usual persistence capability,
such that Edit mode may intervene (or not) as necessary.
As instantiated models are cached at least until persisted,
this workaround to allow newly-created models to be available
during editing is no longer necessary (and undesired consequences
such as #770 no longer occur)
 2016-03-21 10:22:25 -07:00
Pete Richards
8f6a287fb8 Merge remote-tracking branch 'origin/tree-refresh-745' 2016-03-17 11:40:53 -07:00
Victor Woeltjen
07d554d114 Merge pull request #759 from nasa/700a 
Review and integrate 700a
 2016-03-17 11:02:22 -07:00
Charles Hacskaylo
1f09b7b0ac [Frontend] Fix for scrollbar flicker 
#748
Was able to observe problem in Mac
Chrome. Moved body, html overflow: hidden
into startup-base.scss and change seems
to have fixed the problem;
 2016-03-16 17:34:28 -07:00
Andrew Henry
b0cf9bbd29 Merge pull request #758 from nasa/error-message-753 
[Tree] Don't assume context capability is present
 2016-03-16 15:33:59 -07:00
Charles Hacskaylo
cc97e567b6 [Frontend] Further style cleanups 
#689
#740
Tweaked scrollbar thumb color;
Fixed color of icons in s-menu-btn
menus, particularly for Snow theme;
Removed commented code;
 2016-03-16 15:17:08 -07:00
Charles Hacskaylo
53f03cddb7 [Frontend] Further cleanups to form elements 
#689
Removed commented code;
 2016-03-16 14:49:37 -07:00
Charles Hacskaylo
da1e6750a0 [Frontend] Removed reset.css and refs to modernizr 
#700
Removed reset.css; Removed refs to
modernizr from licenses and readme.md;
 2016-03-16 14:44:01 -07:00
Charles Hacskaylo
3258342783 [Frontend] Further cleanups to form elements 
#700
#689
#740
Removed _selects.scss and moved classes
into _controls.scss;
Reorg'd _controls;
Moved classes into _elems.scss;
Added and fixed cssclass defs in multiple
bundle.js files to allow better field widths
in overlay dialogs;
Fixed overlay custom scrollbar colors;
Fixed alignment of required glyphs in forms;
 2016-03-16 14:40:06 -07:00
Victor Woeltjen
73b7365ae2 [Tree] Don't assume context capability is present 
Addresses #753 (newly-created objects may not have context,
causing errors when these are encountered by TreeNodeView)
 2016-03-16 14:10:58 -07:00
Charles Hacskaylo
32a42bd679 [Frontend] CSS tweaks to fix required glyph positioning 
#700
CSS modded to allow better cross-browser
positioning of 'required' form-row glyphs;
Other elem's CSS adjusted as a result;
 2016-03-16 09:43:59 -07:00
Victor Woeltjen
324c2cac03 [Tree] Refresh properly on mutation 
...by removing the incorrect expectation that a domain object
(and not just its model) will be passed in when mutation occurs.
Addresses #745.
 2016-03-15 12:23:46 -07:00
Victor Woeltjen
42ac657105 [Tree] Add status classes during editing 
Addresses #749
 2016-03-15 12:16:58 -07:00
Pete Richards
936079da92 Merge remote-tracking branch 'origin/tree-732' 2016-03-14 16:15:05 -07:00
Andrew Henry
4e89ffbe07 Merge pull request #735 from nasa/open729 
Review and integrate open729
 2016-03-14 16:12:18 -07:00
Charles Hacskaylo
bf3b964ad2 Removed commented code 
#729
#735
 2016-03-14 15:45:10 -07:00
Victor Woeltjen
55ae755522 [Tree] Fix error in test case 
Correctly expect both arguments to $watch
 2016-03-14 15:04:58 -07:00
Victor Woeltjen
d522570c0b [Tree] Add spec for mct-tree 2016-03-14 14:54:57 -07:00
Victor Woeltjen
d72aaf54ca [Tree] Test inner tree creation 2016-03-14 14:40:46 -07:00
Victor Woeltjen
8f94751a35 [Tree] Add capabilities to child objects for testing 2016-03-14 14:14:34 -07:00
Victor Woeltjen
8b51ae32d2 [Tree] Begin testing selection change 2016-03-14 13:04:46 -07:00
Victor Woeltjen
ecb37c54be [Tree] Add TreeView test cases 2016-03-14 12:52:33 -07:00
Victor Woeltjen
43492d31ba [Tree] Begin writing spec for TreeView 2016-03-14 12:22:09 -07:00
Victor Woeltjen
d789e91c18 [Tree] Add wait spinner 2016-03-11 18:00:58 -08:00
Victor Woeltjen
f7ba24c0b6 [Tree] Enable gestures on labels 2016-03-11 17:43:18 -08:00
Victor Woeltjen
02ec6db104 [Tree] Trigger digest on tree selection change 2016-03-11 17:37:11 -08:00
Victor Woeltjen
a3a9393d1b [Tree] Change selection on click 2016-03-11 17:32:57 -08:00
Victor Woeltjen
217e697079 [Tree] Display selection state 2016-03-11 17:26:00 -08:00
Victor Woeltjen
82b6166408 [Tree] Begin wiring in selection 2016-03-11 17:09:17 -08:00
Victor Woeltjen
03ab3bddc4 [Tree] Begin handling selection state 2016-03-11 17:00:55 -08:00
Victor Woeltjen
4a8222a152 [Tree] Update labels on mutation 2016-03-11 14:47:50 -08:00
Victor Woeltjen
7ee8d0a3f7 [Tree] Display tree correctly 2016-03-11 14:40:04 -08:00
Victor Woeltjen
dc2b3e85cc [Tree] Show tree with toggle 2016-03-11 14:33:05 -08:00
Victor Woeltjen
d4b15525ca [Tree] Begin using mct-tree for tree representation 2016-03-11 14:23:08 -08:00
Victor Woeltjen
cbd9509260 [Tree] Use TreeView from mct-tree 2016-03-11 14:13:14 -08:00
Victor Woeltjen
c5ab6c6c97 [Tree] Implement label for tree 2016-03-11 14:10:30 -08:00
Andrew Henry
d39dea971f Merge pull request #721 from nasa/open716 
[Info Bubble] Fix bug with arrow positioning
 2016-03-11 13:13:49 -08:00
Victor Woeltjen
4f293f22a6 [Tree] Add Zepto dependency 
...to support implementation of a jQuery-less tree.
 2016-03-11 12:38:40 -08:00
Victor Woeltjen
cebf9f73da [Tree] Begin adding tree label 2016-03-11 12:29:24 -08:00
Victor Woeltjen
37e6b5a352 [Tree] Continue breaking apart tree view 2016-03-11 11:39:10 -08:00
Victor Woeltjen
ece8f7fded [Tree] Begin separating out TreeView 2016-03-11 11:12:43 -08:00
Victor Woeltjen
3b0a3733b4 [Tree] Begin adding controller for refactored tree 2016-03-11 10:23:06 -08:00
Victor Woeltjen
baab0be5af [Tree] Begin adding mct-tree directive 
...to reduce watch counts associated with the tree;
#732 and #315
 2016-03-11 10:04:33 -08:00
Charles Hacskaylo
377d533ec7 [Frontend] Fixed markup 
open #718
Removed class from markup;
 2016-03-10 18:11:10 -08:00
Charles Hacskaylo
a4c5854561 [Frontend] Bug fixing 
open #729
open #498
Fixed markup to use proper CSS classes
to allow tree items in Inspector Elements to
ellipsize properly, and to apply scroll regions
to the proper elements;
 2016-03-10 14:33:01 -08:00
Charles Hacskaylo
4983d35ca6 [Frontend] Cleanups to Inspector config elements 
open #729
Spacing tweaks; set PlotOptionsForm.js > Autoscale
to not use control-first layout;
Checked in snow theme;
 2016-03-10 13:18:57 -08:00
Charles Hacskaylo
7171fd01e3 [Frontend] Cleanups to Inspector config elements 
open #729
In-progress
Moved CSS def to be more globally applicable;
Simplified layout obj props location display;
 2016-03-10 11:07:26 -08:00
Charles Hacskaylo
0957fbc6f9 [Frontend] Cleanups to Inspector config elements 
open #729
In-progress
Moved reduced-min-width into _inspector.scss;
Removed <style> defs in markup files;
 2016-03-10 10:50:00 -08:00
Charles Hacskaylo
bdbb045005 [Frontend] Cleanups to Inspector config elements 
open #729
In-progress!
Markup and CSS mods continued;
Config params added to PlotOptionsForm.js to
allow control-first layout per form row;
Changed titles of Inspector parts;
 2016-03-10 10:31:05 -08:00
Charles Hacskaylo
318df9878d [Frontend] Cleanups to Inspector config elements 
open #729
In-progress!
Markup and CSS modified to cleanup control layout
and styling in Plot and Table config options;
gulpfile.js modified to include SASS source line numbers
in rendered CSS;
 2016-03-09 17:22:41 -08:00
Victor Woeltjen
134452582c [Build] Remove/qualify for-in usages 2016-03-04 13:10:23 -08:00
Victor Woeltjen
d6ec7e9ab8 [Build] Remove unused variables from specs 
...to satisfy JSHint.
 2016-03-04 12:56:14 -08:00
Victor Woeltjen
5920533637 [Build] Don't appear to use new for side effects 2016-03-04 12:23:53 -08:00
Victor Woeltjen
4f85616632 [Build] Fix FullscreenAction spec 
...to reflect acquisition of screenfull dependency via
AMD
 2016-03-04 11:46:15 -08:00
Victor Woeltjen
a1a7b2b8ce [Build] Remove unused variables 
...to satisfy JSHint
 2016-03-04 11:41:48 -08:00
Victor Woeltjen
6289fe333b [Build] Declare screenfull 
...and shim such that it can be acquired in the normal AMD way.
Avoids use of global variable to satisfy JSHint.
 2016-03-04 11:05:08 -08:00
Victor Woeltjen
c00d77dcb1 [Build] Relocate operators 
...in multi-line expressions, to satisfy JSHint.
 2016-03-04 11:02:57 -08:00
Victor Woeltjen
56a91dfbaf [Build] Use not-threequals operator 
...to satisfy JSHint
 2016-03-04 10:58:23 -08:00
Victor Woeltjen
f6898d16c9 [Build] Remove obsolete argument 
...which incidentally triggers JSHint errors
 2016-03-04 10:56:51 -08:00
Victor Woeltjen
ac5ac8d34e [Build] Remove boilerplate from scripts 
No longer necessary after JSHint configuration.
 2016-03-04 10:46:38 -08:00
Victor Woeltjen
f302bd6cb2 [Info Bubble] Test arrow class application 
#716
 2016-03-03 16:17:01 -08:00
Victor Woeltjen
071a908c10 [Info Bubble] Don't clobber arrow classes 
#716
 2016-03-03 15:58:28 -08:00
Henry
670c06103f [Edit Mode] Rebased over master 2016-03-02 11:45:15 -08:00
Henry
7b5218c5ba [Edit Mode] #627 Fixed failing tests 
Removed reference to defunct NavigationServiceDecorator

Removed virtual panels from drop gesture
 2016-03-02 11:12:41 -08:00
Henry
f192544be3 Addressing issues from code review 2016-03-02 11:10:49 -08:00
Henry
2cc2c6a9d3 [Edit Mode] #627 removed edit concerns from browse controllers and markup 
Fixed elements not appearing in edit mode

Fixed failing tests
 2016-03-02 11:05:23 -08:00
Henry
a910fa8f37 Removed unused 'controller as' 2016-03-02 11:01:34 -08:00
Henry
65ca78d8aa Added missing dependency on 2016-03-02 11:00:08 -08:00
Henry
2f036a89e4 Refactoring out regions 2016-03-02 11:00:08 -08:00
Henry
fa46d31ac2 [Edit Mode] #627 slightly modified edit representer to detect newly created objects 
Added some comments, renamed controller variable in markup

Removed edit references from BrowseController
 2016-03-02 10:57:05 -08:00
Henry
549dfab5aa [Edit Mode] #627 remove edit concerns from browse controller 2016-03-02 10:55:18 -08:00
Victor Woeltjen
494212a448 Merge pull request #653 from nasa/open499 
[Notifications] #499 All notifications now dismissable by default.
 2016-03-01 14:50:56 -08:00
Pete Richards
183bd9793c Merge branch 'open677' 2016-03-01 11:33:31 -08:00
Pete Richards
96d9f8c194 [Templates] load plot templates with require 
Load templates with requirejs.

https://github.com/nasa/openmctweb/issues/673
 2016-03-01 10:52:07 -08:00
Pete Richards
748673f99b Merge branch 'master' into open638_rebase 2016-03-01 10:48:53 -08:00
Pete Richards
78374f8241 Merge branch 'open401' 2016-03-01 10:37:12 -08:00
Pete Richards
bc6185f76d [Browse] Remove unused constant 
https://github.com/nasa/openmctweb/issues/401
 2016-03-01 10:36:30 -08:00
Henry
747a98d130 Addressed issues from code review 2016-02-29 18:42:48 -08:00
Andrew Henry
7daaecbf8f Merge pull request #710 from nasa/open673 
[Templates] Load templates using RequireJS text plugin
 2016-02-29 18:45:46 +00:00
Andrew Henry
6f9e78a14f Merge pull request #711 from nasa/open442a 
[Frontend] Markup, CSS changes
 2016-02-29 17:36:54 +00:00
Charles Hacskaylo
5a9bcfa938 [Frontend] Markup, CSS changes 
#442
Removed white space from markup;
Moved getGlyphClass up to status-block-holder
element out of status-block;
CSS mods to selectors and style defs
in _messages.scss;
 2016-02-26 16:48:23 -08:00
Victor Woeltjen
9b21b0b7f2 [Templates] Update mct-container spec 
...to reflect change to template over templateUrl
 2016-02-26 16:17:33 -08:00
Victor Woeltjen
8581547a9c [Templates] Allow only template property for containers 
...to work around difficulties with transclusion using
templateLinker.
 2016-02-26 14:49:55 -08:00
Charles Hacskaylo
192bbae6e5 [Frontend] Fix paths, includes 
#702
Per https://github.com/nasa/openmctweb/pull/702;
Removed include of _logo-and-bg.scss into _about.scss;
 2016-02-26 14:49:34 -08:00
Victor Woeltjen
e61711688e [Templates] Use templateLinker from MCTContainer 
...for compatibility with both template and templateUrl.
 2016-02-26 14:24:41 -08:00
Victor Woeltjen
bf1fa0ac4c [Templates] Include templates using text plugin 
Resolves #673
 2016-02-26 13:07:50 -08:00
Charles Hacskaylo
bc3eb4ab8d [Frontend] New logo art 
#164
New logo art for Open MCT added;
Removed console.log;
 2016-02-26 10:59:54 -08:00
Charles Hacskaylo
d203f3adc0 [Frontend] New logo art; paths changed 
#164
Per comments in #702, abs paths changed
to relative;
New logo art for Open MCT added;
CSS tweaked as needed;
 2016-02-26 10:15:15 -08:00
Charles Hacskaylo
1a2a2e66ca [Frontend] Removed commented styling 
open #164
 2016-02-25 12:41:54 -08:00
Charles Hacskaylo
129b554f9d [Frontend] Significant markup/CSS mods for splash screen 
#164
https://github.jpl.nasa.gov/MissionControl/vista/issues/299
App logo and bg files renamed;
Added openmct.scss to hold openmct-specific styles;
Renamed _startup.scss to startup-base.scss
which now renders its own .css file;

Still to-do: apply to WARP including needed
mods to its About dialog screen;
 2016-02-24 17:47:24 -08:00
Charles Hacskaylo
164d959f60 [Frontend] Significant markup/CSS mods for splash screen 
#164
Markup in index.html and about-dialog.html
changed to simplify and use :before/:after psuedos;
CSS in _logo-and-bg.scss modded for same;
Added _startup.scss to hold general CSS for
the startup screen;
Renamed startup.scss to startup-open.scss;
Modified SplashScreenManager.js to target renamed
outer container .l-splash-holder;
Added media query for startup screen on phone;
Cleanup: moved classes out of _effects into _global;
Still to-do: apply to WARP and VISTA, including needed
mods to their About dialog screens;
 2016-02-23 18:30:21 -08:00
Charles Hacskaylo
99cf690ad4 Merge branch 'master' into open164 2016-02-23 16:03:24 -08:00
Pete Richards
fcdf89a4ee Merge branch 'master' into open638_rebase 2016-02-23 10:56:13 -08:00
Pete Richards
77a2e0a70b Merge branch 'master' into open639 2016-02-23 10:46:33 -08:00
Pete Richards
9b3c8dce25 [SCSS] Remove old references to compass 
Remove any old references to compass.

https://github.com/nasa/openmctweb/issues/698
 2016-02-22 18:22:44 -08:00
Pete Richards
4d800d26e2 [CSS] Add reset to replace compass/reset 
Add reset.css which replaces compass/reset.

https://github.com/nasa/openmctweb/issues/698
 2016-02-22 18:18:06 -08:00
Pete Richards
0a71835687 [Build] Switch compass to bourbon 
Change mixin library to bourbon.  Significantly reduces sass build time.

https://github.com/nasa/openmctweb/issues/698
 2016-02-22 18:02:16 -08:00
Pete Richards
25f3b1e110 [Frontend] Add splash screen manager 
Add a runtime extension that detects the splash screen and triggers a fade out
after the application has loaded.  Once the fade out has ended, it removes the
element from the page.

Related to https://github.com/nasa/openmctweb/issues/164
 2016-02-22 16:39:20 -08:00
Charles Hacskaylo
31a983966b [Frontend] In-progress on adding branded per-app screens 
open #164
CSS, markup;
 2016-02-22 15:44:57 -08:00
Victor Woeltjen
d3e274bfdd Merge branch 'master' into open401 
Resolve conflicts for #416

Conflicts:
	platform/commonUI/browse/bundle.json
	platform/commonUI/browse/src/BrowseController.js
 2016-02-22 14:27:21 -08:00
Charles Hacskaylo
729d91e7f3 [Frontend] CSS sanding and shimming 
open #442
Fixed white space problem with .status-block-holder
applied to mct-include; Added new status 'available'
class and updated theme constants files;
 2016-02-22 12:51:32 -08:00
Charles Hacskaylo
bd0867b79d Merge branch 'master' into open442 
Conflicts:
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
 2016-02-22 11:11:32 -08:00
Victor Woeltjen
6d036a5d67 Merge pull request #693 from nasa/build-css 
[Build] Add stylesheets to build
 2016-02-22 10:59:46 -08:00
Charles Hacskaylo
ebf501ce71 [Frontend] Markup and CSS related to indicators; hover styles 
open #442
https://github.jpl.nasa.gov/MissionControl/vista/issues/293

s-btn hover styling cleaned up;
Spacing, styles, etc. for indicators refined;
Constants, colors added to, cleaned up and normalized;
Animation code in _effects refactored;
 2016-02-19 17:59:32 -08:00
Pete Richards
ed09214f59 [Build] Save stylesheets to proper location 
Updates the stylesheet task to output CSS in the correct locations. Remove
config.rb for running compass manually, and remove compiled css files from
project.  Add a .gitignore to ensure they don't get included accidentally.

Add a gulp task for running the development server and watching for scss
changes at the same time.

resolves https://github.com/nasa/openmctweb/issues/238
 2016-02-19 13:26:20 -08:00
Charles Hacskaylo
b0b2db24e0 [Frontend] Mods to .status.block 
open #442
Added clickable class; tweaks to indicator.html
to introduce s-btn element look;
 2016-02-18 18:03:43 -08:00
Charles Hacskaylo
a2f8f4334f Updated font to include new VISTA session and topic glyphs 2016-02-18 16:42:56 -08:00
Charles Hacskaylo
626cc502fb [Frontend] Removed -moz-osx-font-smoothing property 
open #687
 2016-02-18 13:24:06 -08:00
Charles Hacskaylo
95f1768fb7 [Frontend] Refactoring to use Victorizr instead of media queries 
open #639
open #683
open #169
Tweak to espresso tree view control color and hover color
for espresso theme; reordered elements in _constants;
 2016-02-18 13:10:54 -08:00
Charles Hacskaylo
fb20af24bc [Frontend] Refactoring to use Victorizr instead of media queries 
open #639
open #683
open #169
open #335
    Fixed wrong application of body.desktop.mini-tab...;
    Increased size of pane collapse/expand icons;
    Removed max-width applied to search input holder;
 2016-02-18 11:25:12 -08:00
Charles Hacskaylo
f6cb76354e [Frontend] Refactoring to use Victorizr instead of media queries 
open #639
open #683
open #169
MQs refactored in mobile/_layout.scss;
 2016-02-17 16:34:33 -08:00
Charles Hacskaylo
66905cbcbb [Frontend] Refactoring to use Victorizr instead of media queries 
open #639
open #683
open #169
open #494
Replaced MQ around mobile/_tree.scss ul.tree;
Removed MQ desktop around hover in mixin btnBase;
Reversed orientation of mobile tree arrows for #494;
 2016-02-17 16:12:18 -08:00
Charles Hacskaylo
a4f24adb8a [Frontend] Refactoring to use Victorizr instead of media queries 
open #639
Replaced MQ around _controls webkit-scrollbar CSS;
 2016-02-17 10:26:42 -08:00
Charles Hacskaylo
0ddaa52a8a [Frontend] Refactor CSS to not use 'desktop' media query 
open #639
Refactored all usage of @include desktop to use CSS selector body.desktop
instead; Still to-do: deal with desktopandtablet usage with hover bubbles
and mixins btnBase;
 2016-02-16 18:38:06 -08:00
Melanie Lean
53c60ee64f [Timelines] #677 Applied fix to prevent editing of timelines in browse mode 
Fixed failing test
 2016-02-11 21:52:05 -08:00
Victor Woeltjen
42ce2aa7cf Merge pull request #666 from nasa/open656b 
[Create] Utilize copyService during Save As
 2016-02-11 09:55:21 -08:00
Charles Hacskaylo
ceee7e0da9 [Frontend] Fixed CSS issue with Timeline label elements 
open #659
CSS for .rep-object-label modified; Added CSS class
to tabular-swimlane-cols-tree.html markup;
Also cleaned up .s-status-pending styles for related
label elements;
 2016-02-10 16:38:39 -08:00
Victor Woeltjen
0bdf05e61c [Create] Always allow cloning self 
Always allow cloning the newly-created object itself
when saving a newly-created domain object.
 2016-02-10 13:49:15 -08:00
Victor Woeltjen
3146660833 [Create] Utilize filtering during clone 2016-02-10 13:46:19 -08:00
Victor Woeltjen
c43929f1c6 [Create] Add specificity to check 
Explicitly check if an object has a persistence timestamp
at all (avoids false-positives due to falsiness of zero.)
 2016-02-10 12:07:45 -08:00
Victor Woeltjen
88750d92ef [Create] Remove unused code, dependencies 2016-02-10 12:05:01 -08:00
Victor Woeltjen
8c602025d4 [Create] Avoid navigation warning 
...when navigating to a clone created via Save As.
 2016-02-10 11:59:17 -08:00
Victor Woeltjen
5604120d55 [Create] Use duplicate at end of Save 
...for unpersisted objects. Ensures that they share the
persistence space of their parent. #656.
 2016-02-10 11:42:35 -08:00
Henry
24c750b41e [Plot] Fixed jsLint, removed onchange 
Removed ngChange from mct-control

Removed ng-change
 2016-02-09 21:19:47 -08:00
Henry
668c02f278 [Edit Mode] Added ability to clear all dirty cache 2016-02-09 19:29:55 -08:00
Henry
645bd5743f [Plots] #638 Addressing feedback from code review 
[Plots] #638 Fixing failing tests

[Plot] Changed PlotOptionsController to prototype form

Fixed spacing

Fixed jslint issue
 2016-02-08 23:36:45 -08:00
Victor Woeltjen
0a5097a945 Merge pull request #642 from nasa/open460 
[Build] Move to npm-based build
 2016-02-08 12:21:01 -08:00
Victor Woeltjen
b0e4947bf0 Merge pull request #500 from nasa/open480 
[New Edit Mode] Adding sub objects to Timelines
 2016-02-08 11:59:54 -08:00
Henry
5292b27e7d [Notifications] #499 All notifications now dismissable by default. 
jslint
 2016-02-05 17:51:31 -08:00
Victor Woeltjen
5d4ace64cb Merge pull request #625 from nasa/open491 
[Create] #491 Apply default context root in Locator when none available from object
 2016-02-05 17:30:22 -08:00
Pete Richards
f5e0ad23ea Merge remote-tracking branch 'open/prod-uisymbols' into open-master 2016-02-04 14:37:18 -08:00
Henry
abf5f22155 [Plots] #638 added onchange handling in order to synchronize forms with domain object model. 
Fixed failing test

Added tests

jslint errors

Minor refactoring of layout bundle

revert layout/bundle.json
 2016-02-04 14:26:21 -08:00
Charles Hacskaylo
f2903f4030 [Frontend] Final styling on properties form in Inspector 
open #638
Added custom radio button control and modified
PlotOptionsController / plotOptionsStructure
accordingly; spacing, borders, etc. are
all as finally intended;
 2016-02-04 14:25:02 -08:00
Charles Hacskaylo
371669fbce [Frontend] Mods in progress to form layout 
open #638
Major progress on form-row markup and CSS when
in Inspector 'part' context; General fixes cleanups
to custom checkbox/radio CSS;
 2016-02-04 14:23:29 -08:00
Charles Hacskaylo
115ffe7963 [Frontend] Fixes to scrolling and layout in Inspector 
open #638
In progress;
 2016-02-04 14:23:29 -08:00
Charles Hacskaylo
8bb5a47b88 CSS updated to use new e619 character 
open #638
 2016-02-04 14:23:28 -08:00
Charles Hacskaylo
f1b6d7f749 [Frontend] New custom radio mctControl 
open #638
Markup and initial CSS
 2016-02-04 14:23:28 -08:00
Henry
6fb6761abf [Plots] #638 New plot display options 2016-02-04 14:23:28 -08:00
Charles Hacskaylo
4926ccb07b [Frontend] Fixed wrong location for icomoon proj config file 
open #188
Removed wrongly placed new file; updated old
file with latest project config;
 2016-02-02 13:52:16 -08:00
Pete Richards
2dd9a16bf3 Merge remote-tracking branch 'open/prod-uisymbols' into open-master 2016-02-02 09:46:15 -08:00
Charles Hacskaylo
339faf5376 Updated json config file 
open #188
 2016-02-02 09:46:00 -08:00
Charles Hacskaylo
10c3ffc4be Added new e619 bullet symbol 
open #188
 2016-02-02 09:43:40 -08:00
Victor Woeltjen
aebae27391 [Tests] Remove suite.json files 
Remove obsolete suite.json files; #482
 2016-02-02 09:35:50 -08:00
Charles Hacskaylo
97d0a66684 [Frontend] Added VISTA Topic and Session glyphs to symbols font 
open #188
See Google Doc UI Symbols Font Map
for char codes
 2016-01-29 17:09:19 -08:00
Victor Woeltjen
ddb5837145 Merge branch 'master' into open460 2016-01-29 11:44:38 -08:00
Victor Woeltjen
e0fbaa83b0 [Build] Add compatibility with text plugin 
Allow templates to be loaded via the text plugin, which
in turn will allow these to be built into the final JS
artifact.
 2016-01-28 11:41:14 -08:00
Victor Woeltjen
967f8c9151 [Build] Update remaining library references 2016-01-28 11:25:44 -08:00
Victor Woeltjen
84ecfd3527 [Build] Remove remaining files in libs 2016-01-28 11:21:08 -08:00
Victor Woeltjen
dbf196e014 Merge remote-tracking branch 'github/master' into open477 
Resolve conflicts to complete merge of #477

Conflicts:
	platform/commonUI/general/bundle.json
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
 2016-01-27 12:53:46 -08:00
Victor Woeltjen
b5c8ecc85f Merge pull request #475 from nasa/open325b 
[Time Conductor] Update validation logic
 2016-01-27 12:44:14 -08:00
Victor Woeltjen
9e6da94878 [Time Conductor] Reformat expression in template 
...to use less line width, and to exhibit more normal
indentation, per code review feedback from #475
 2016-01-22 15:24:27 -08:00
Victor Woeltjen
3a26c864b8 [Time Conductor] Fix comment text 
Per code review feedback, #475
 2016-01-22 15:22:54 -08:00
Pete Richards
be7827d6f8 Merge remote-tracking branch 'open/open445' into open-master 2016-01-22 11:47:05 -08:00
Henry
54653f3914 [Create] #491 Locator is not visible when creating a new object where selected object does not have location 
Added additional test for default context

Fixed JSLint error
 2016-01-21 16:35:18 -08:00
Henry
cd2b19eb1e [New Edit Mode] Fixed failing tests, and added new test in CreateWizard 
[New Edit Mode] #480 fixed JSLint errors

[New Edit Mode] #480 do not show locator for sub objects

[New Edit Mode] Modified persistence in SaveAction

Removed redundant variable

Fixed Failing Test

Fixed JSLint errors

Improved some documentation
 2016-01-21 12:01:38 -08:00
Henry
c65096f166 [New Edit Mode] Added AddAction, modified EditableDomainObject to properly wrap inherited functions, added new EditableInstantiationCapability 2016-01-20 18:49:39 -08:00
Charles Hacskaylo
2d44cf78f9 [Frontend] Fixed HTML and CSS for grid-item 
open #486
Normalized grid-item to use similar HTML structure
as label template;
Fixed CSS accordingly.
 2016-01-15 15:33:10 -08:00
Victor Woeltjen
119429bc42 [Plot] Test reverse filter 2016-01-15 13:13:08 -08:00
Victor Woeltjen
96dc055f02 [Plot] Add reverse filter 2016-01-15 13:06:56 -08:00
Henry
7a563b80ee Fixing bundle load issues 2016-01-14 17:32:59 -08:00
Henry
032b2542f0 Merged from Master 2016-01-14 17:23:53 -08:00
Henry
3e7eb11d84 Regenerated bundles 2016-01-14 17:08:19 -08:00
Henry
f300b99b7b [New Edit Mode] Code style fixes 
JSLint error
 2016-01-14 15:55:02 -08:00
Henry
d78bd9fd51 Merged from master 2016-01-14 15:16:02 -08:00
Henry
b4448020e4 JSLint 2016-01-14 15:12:15 -08:00
Henry
0741e2cf5e Disabled failing tests 2016-01-14 15:11:19 -08:00
Henry
6d3b2c716b JSLint 2016-01-14 15:05:26 -08:00
Henry
858aa6146a JSLint 2016-01-14 15:04:13 -08:00
Henry
826d39a749 [New Edit Mode] Fixed logic in EditActionPolicy to use positive logic 2016-01-14 15:02:22 -08:00
Henry
77efda2c11 [New Edit Mode] JSLint 2016-01-14 14:44:19 -08:00
akhenry
88f8925d17 Merge pull request #469 from nasa/open450b 
[API Refactor] Imperatively register bundles
 2016-01-14 09:41:04 -08:00
Charles Hacskaylo
442229fd42 Merge branch 'master' of https://github.com/nasa/openmctweb into open445 
Conflicts:
	platform/features/plot/res/templates/plot.html
 2016-01-13 16:01:02 -08:00
Charles Hacskaylo
a7a707595c [Frontend] Fixes to CSS for Chrome Linux 
open #445
Mods and simplifications to wait-spinner classes;
Simplification and cleanup in plot.html to use loading
class instead of hide/show DOM element;
 2016-01-13 13:54:00 -08:00
Charles Hacskaylo
9b59fd7eae [Frontend] Mods to allow plot tick labels to ellipsis to left 
open #337
Tick label strings are now reversed in their char order in
PlotTickGenerator.js, then reversed again via CSS in
_plots-main.scss. This forces the browser to clip the label
at the left 'start' side, rather than the end, resulting in
the least significant portion of the label getting clipped.
 2016-01-12 18:04:09 -08:00
Charles Hacskaylo
8dd36d426c [Frontend] Refactoring local controls hide and show 
open #342
Now using CSS hover on pertinent plot areas;
Refining of select styling, tweaks for Firefox Linux;
Tweaks to local-control positioning in plots;
Changed *-options controls to use length > 1
instead of > 0;
 2016-01-12 15:54:56 -08:00
Victor Woeltjen
9fe026a1f1 [Time Conductor] Decrease minimum outer span 2016-01-11 18:29:42 -08:00
Victor Woeltjen
3b5c1bf2e6 [Time Conductor] Update spec 
Verify that validation occurs against state in formModel;
remove obsolete test case for enforcing minimum outer span
 2016-01-11 18:28:44 -08:00
Victor Woeltjen
bb993dc94f [Time Conductor] Don't update invalid bounds 
Don't enforce minimum time span when bounds are invalid;
https://github.com/nasa/openmctweb/issues/325#issuecomment-170755787
 2016-01-11 18:23:32 -08:00
Victor Woeltjen
5beb1de805 [Time Conductor] Display validation errors consistently 2016-01-11 16:56:58 -08:00
Victor Woeltjen
0a012c67dd [Time Conductor] Test additions to TimeRangeController 
Add test cases to cover validators added to display
start/end time violations.
 2016-01-11 16:41:20 -08:00
Victor Woeltjen
11b71fae68 [Time Conductor] Display invalid state 
...when text value can be parsed in a date-time field,
but numeric value violates externally-imposed validation
 2016-01-11 15:29:43 -08:00
Victor Woeltjen
e6d0537e5e Revert "[Time Conductor] Validate numeric date-time fields" 
This reverts commit 07c407edea.
 2016-01-11 15:23:21 -08:00
Charles Hacskaylo
c57cb43462 [Frontend] Fixed z-index of .primary-pane 
open #470
(cherry picked from commit 6bdcce0)
 2016-01-11 15:19:23 -08:00
Victor Woeltjen
99556ed6a5 [Time Conductor] Validate start/end times 2016-01-11 15:18:38 -08:00
Victor Woeltjen
07c407edea [Time Conductor] Validate numeric date-time fields 
Allow injection of a validator for numeric values of
the date-time fields, to allow for these to be displayed
as invalid in cases where the text itself may be parsed
but the resulting value is not valid (e.g. when start
is greater than end.)

https://github.com/nasa/openmctweb/issues/325
 2016-01-11 15:18:26 -08:00
Charles Hacskaylo
acb2a2da12 Merge master into nem468a - picking up missed files 2016-01-11 13:30:56 -08:00
Charles Hacskaylo
4f7ca98b60 Merge branch 'master' into nem468a. 
Many tweaks to fix some issues with tree, labels and Inspector.

Conflicts:
	platform/commonUI/edit/res/templates/elements.html
	platform/commonUI/general/res/sass/search/_search.scss
	platform/commonUI/general/res/sass/tree/_tree.scss
	platform/commonUI/general/res/templates/object-inspector.html
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
	platform/search/res/templates/search.html
 2016-01-11 13:29:26 -08:00
Charles Hacskaylo
a65ca7cb1e [Frontend] Refactor Inspector to use s-status-editing 
open #468
Removed ng-show="editMode" in object-inspector.html;
Refactored CSS as required in _inspector.scss;
Added opacity transition to splitter-inspect-panel and
split-pane-component pane bottom, but not working as desired currently:
entire inspector seems to be destroyed and recreated when switching into
and out of edit mode;
Moved <style> def for .location-item in object-inspector.html into .scss;
 2016-01-08 16:47:11 -08:00
Charles Hacskaylo
898dd557e5 [Frontend] Refactor to use s-status-editing instead of ng-class 
open #468
Remove ng-class statements in favor of upstream .s-status-editing;
Restructure CSS accordingly;
NOTE: because edit.html has NOT been changed,
changes here will cause old edit mode to no longer display properly.
Don't integrate this CSS with old edit mode!
 2016-01-08 16:11:00 -08:00
Victor Woeltjen
0036974c60 Merge remote-tracking branch 'github/master' into open450b 
Merge latest from master branch to reconcile conflicts
for https://github.com/nasa/openmctweb/pull/469

Conflicts:
	platform/commonUI/general/bundle.json
 2016-01-08 15:36:10 -08:00
Victor Woeltjen
cec197f888 [API Refactor] Remove bundle.json files 2016-01-08 15:32:18 -08:00
Victor Woeltjen
de53247d56 [API] Convert JSON bundles to imperative form 2016-01-07 15:08:08 -08:00
Victor Woeltjen
5bbbdd4e50 [API] Fix explicit implementation assignments 2016-01-07 15:01:57 -08:00