ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-01 19:06:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,596 Commits 989 Branches 212 Tags 191 MiB
721557b814
Commit Graph

3041 Commits

Author SHA1 Message Date
Victor Woeltjen
721557b814 [Templates] Exercise selection method 
...add to TimelineSwimlanePopulator to reflect changes to
time at which selection object may become available as
a consequence to changes in the way templates are normally
loaded. #673
 2016-02-26 16:29:06 -08:00
Victor Woeltjen
70ed16491a [Templates] Change watch order 
...to work around order-sensitive test case
 2016-02-26 16:26:31 -08:00
Victor Woeltjen
7240ff4f8d [Templates] Update mct-control spec 
...to reflect usage of templateLinker, to support including
templates via RequireJS text plugin
 2016-02-26 16:22:55 -08:00
Victor Woeltjen
3a6e0be2d7 [Templates] Update FixedController spec 
...to reflect changes to how selection object is obtained,
which in turn reflects change to using templates obtained
via RequireJS text plugin, instead of loading by URL.
 2016-02-26 16:19:14 -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
164c2faf07 Merge branch 'master' into open673 
Merge latest from master into topic branch for #673
 2016-02-26 15:54:41 -08:00
Victor Woeltjen
fe419714f5 [Templates] Check for availability of timespan 
...as ordering changes due to change from templateUrl to template
may mean this is not available when first initialized.
 2016-02-26 15:50:07 -08:00
Victor Woeltjen
f3fd2e67fc [Templates] Watch for selection object 
...from Timeline, to ensure toolbar appears etc.
Reflects changes to ordering triggered by use of
template instead of templateUrl
 2016-02-26 15:49:21 -08:00
Victor Woeltjen
931fa77cbe [Templates] Handle deferred selection availability 
Loading templates via RequireJS text plugin means they are
immediately available; appears to have caused a change in
ordering wherein controllers for views may be initialized
before representers have installed things like selection
state. As such, need to watch for changes instead of simply
checking for a selection object when the controller is
initialized.
 2016-02-26 15:37:19 -08:00
Victor Woeltjen
596735352a [Templates] Simplify MCTToolbar 
Use mct-form as a basis; simply change the template.
 2016-02-26 15:17:31 -08:00
Henry
402512a461 Merged from master to resolve conflict 2016-02-26 15:15:22 -08:00
Victor Woeltjen
2d03e3e6d4 [Templates] Remove unused template path calculation 2016-02-26 15:03:45 -08:00
Victor Woeltjen
19b442cc0b [Templates] Require data table templates 
...via text plugin
 2016-02-26 15:02:04 -08:00
Victor Woeltjen
5c3d8508a2 [Templates] Use templateLinker for forms 
...for compatibility with both template and templateUrl
 2016-02-26 15:01:40 -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
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
741d4476e6 [Templates] Use text plugin for toolbar 2016-02-26 13:12:35 -08:00
Victor Woeltjen
bf1fa0ac4c [Templates] Include templates using text plugin 
Resolves #673
 2016-02-26 13:07:50 -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
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
Victor Woeltjen
42ce2aa7cf Merge pull request #666 from nasa/open656b 
[Create] Utilize copyService during Save As
 2016-02-11 09:55:21 -08:00
Victor Woeltjen
43d497e069 [Create] Clarify function naming 
Per review feedback,
https://github.com/nasa/openmctweb/pull/666#discussion_r52625960
 2016-02-11 09:49:26 -08:00
Victor Woeltjen
5306e96374 Merge pull request #668 from nasa/open659 
[New Edit Mode] #659 Fix to timelines
 2016-02-10 17:02:28 -08:00
Henry
10e0acddb3 [New Edit Mode] #659 Fix to prevent multi-composition with same object, fix to prevent composition of object with self 2016-02-10 16:43:08 -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
53a49a671b [Create] Test optional filter parameter 2016-02-10 14:31:56 -08:00
Victor Woeltjen
99a454f943 [Create] Update CopyService spec 
...to reflect API usage after #656
 2016-02-10 14:21:09 -08:00
Victor Woeltjen
cb53e1aaee [Create] Add object, not ID 
Add domain object, and not its identifier, when suing
add method of composition from CopyTask, for consistency
with test expectations.
 2016-02-10 14:17:36 -08:00
Victor Woeltjen
0f231838ec [Create] Update test inputs to CopyTask 
...to reflect changes for #656
 2016-02-10 14:05:04 -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
72df464f0f [Create] Utilize passed-in filter 
...when determining which objects should be cloned.
 2016-02-10 13:38:53 -08:00
Victor Woeltjen
f602aa9247 [Create] Add filter to copyService 
Add an optional parameter to method signature of
copyService, used to determine if a domain object should
or should not be cloned.

This will be used to support usages of copyService
where links should remain links;
https://github.com/nasa/openmctweb/pull/666/files#r52525612
 2016-02-10 13:29:56 -08:00
Victor Woeltjen
b37b82133e [Create] Return cloned object in context 
...to allow copyService to be used in the context of a
Save As action, with an appropriate navigation change.
 2016-02-10 12:23:10 -08:00