Commit Graph

1496 Commits

Author SHA1 Message Date
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
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