Pete Richards
936079da92
Merge remote-tracking branch 'origin/tree-732'
2016-03-14 16:15:05 -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
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
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
Henry
a910fa8f37
Removed unused 'controller as'
2016-03-02 11:01:34 -08:00
Henry
2f036a89e4
Refactoring out regions
2016-03-02 11:00:08 -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
748673f99b
Merge branch 'master' into open638_rebase
2016-03-01 10:48:53 -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