ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-21 14:07:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,397 Commits 989 Branches 212 Tags 191 MiB
f72f88adfa
Commit Graph

259 Commits

Author SHA1 Message Date
Shivam Dave
193df4fde3 [Windowing] Excess function 
Removed extra function from
urlService. WTD 23.
 2015-06-25 14:37:01 -07:00
Shivam Dave
5ba0f9d7a1 Merge remote-tracking branch 'upstream/master' into open23 2015-06-25 14:08:46 -07:00
Shivam Dave
6d28add055 [Windowing] urlService 
urlService added to the edit action
bundle.json in addition to being
implemented, however 2nd time edit
bug still occurring. Also fixed urlService
test suite. WTD 23.
 2015-06-25 13:16:15 -07:00
Victor Woeltjen
3df12788f9 Merge remote-tracking branch 'nasa/open1341' into open1345 2015-06-25 11:53:13 -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
Shivam Dave
fd6459394a [Windowing] urlService 
Changed folder location of
services and therefore urlService
to general/src/ instead of being in
browse/src/. WTD 23.
 2015-06-25 10:38:39 -07:00
Victor Woeltjen
70f5a001ee Merge remote-tracking branch 'nasa/open1341' into open1345 2015-06-25 10:06:18 -07:00
Sarah Hale
c6405c50df Merge branch 'master' of https://github.com/nasa/openmctweb into open18 2015-06-25 10:00:21 -07:00
Victor Woeltjen
d3ff49b90b Merge remote-tracking branch 'nasa/open1319' into open1320 2015-06-25 09:59:23 -07:00
Victor Woeltjen
25d3a4d8c2 Merge remote-tracking branch 'nasa/open1323' into open1324 2015-06-25 09:25:42 -07:00
Victor Woeltjen
9ac6abe78f Merge remote-tracking branch 'nasa/open980' into open1342 2015-06-25 09:07:27 -07:00
Charles Hacskaylo
9f137513d9 Merge branch 'open-master' of https://trunk.arc.nasa.gov/git/wtd into open1341 2015-06-24 19:25:27 -07:00
Charles Hacskaylo
19748ba17c [Dev/Frontend] Cherry-picking platform changes from warp1341 
WTD-1341
Re-rendered css file;
 2015-06-24 18:56:38 -07:00
Charles Hacskaylo
52a7bd1033 [Dev/Frontend] Cherry-picking platform changes from warp1341 
WTD-1341
 2015-06-24 18:55:15 -07:00
Charles Hacskaylo
e357df2fe5 [Dev/Frontend] Cherry-picking platform changes from warp1341 
WTD-1341
 2015-06-24 18:52:52 -07:00
Charles Hacskaylo
6a96f1d395 [Frontend] Added icomoon.io project file 2015-06-24 13:54:57 -07:00
Charles Hacskaylo
14a83e143c [Frontend] New symbols font and CSS adjustments 
WTD-980
WTD-396
Minor sanding and shimming;
Updated symbols;
Create super-menu now uses key color;
Removed unused wtdsymbols-v2* font files;
 2015-06-24 13:39:31 -07:00
Charles Hacskaylo
fdfa35d1da [Frontend] New symbols font and CSS adjustments 
WTD-980
WTD-396
Changed glyph for stacked plots;
Normalized button line-heights and size of required symbol;
Updated symbol art in symbols font;
Restored mistakenly removed "menu" gesture to grid-item;
 2015-06-24 11:42:29 -07:00
Charles Hacskaylo
db3e132799 [Frontend] New symbols font and CSS adjustments, in-progress 
WTD-980
WTD-396
 2015-06-23 16:07:29 -07:00
Victor Woeltjen
d6a31dcef3 [Plot] Update failing specs 
Update failing specs for changes related to fixed duration
plots, WTD-1273.
 2015-06-23 14:17:28 -07:00
Charles Hacskaylo
c35c9c43b7 [Frontend] Tweak size of spinner 
WTD-1323
 2015-06-22 18:47:58 -07:00
Charles Hacskaylo
cb715a9d48 [Frontend] Merge in platform CSS changes 
WTD-1319
WTD-768
WTD-841
Change CSS for autoflow-tabular header;
 2015-06-22 18:41:04 -07:00
Shivam Dave
683a733ae1 [Windowing] SASS Edit 
Adjusted the SASS file to
not hide the new window button. Also
removed the overwrite metadata function
that was used to temprarily allow us to
view the new window button. WTD-16.
 2015-06-22 14:00:25 -07:00
Sarah Hale
0feb3b0462 Merge branch 'open18' of https://github.com/slhale/openmctweb into open18 2015-06-22 12:37:15 -07:00
Victor Woeltjen
7f7759f72c Merge branch 'open-master' into open1223 2015-06-20 15:36:21 -07:00
Victor Woeltjen
8199d1d9d9 [Plot] Use mct-drag from plot 
Use mct-drag from plot such that we are able to handle
mouse events which leave the plot area for marquee zoom
and pan. WTD-1273.
 2015-06-20 11:47:10 -07:00
Victor Woeltjen
6b0a77d131 Merge pull request #8 from nasa/open1149 
[Addressability] Use/populate URL
 2015-06-19 16:05:10 -07:00
Victor Woeltjen
149ac44e8c Merge pull request #13 from nasa/open12 
[Execution] Add worker service
 2015-06-19 16:05:02 -07:00
Charles Hacskaylo
ae7dae011b [Dev/Frontend] New example event generator and event view 
WTD-1304
github open18
New example generator;
New temporary view: features/events;
Updated scss and css;
 2015-06-19 15:29:06 -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
dbd7a65a7a Merge remote-tracking branch 'nasa/open1295' into open-master 2015-06-18 18:33:09 -07:00
Charles Hacskaylo
0201a4bcf8 [Frontend] Fix to prevent infobubbles from preventing clicks 
GitHub-12
Added CSS class "bubble-container" to BUBBLE_TEMPLATE;
bubble-container utilizes CSS "pointer-events: none";
Changed INFO_HOVER_DELAY constant from 500ms to 2000ms;
 2015-06-18 15:18:42 -07:00
Victor Woeltjen
dc85d3c191 Merge pull request #4 from nasa/open884 
[Info Bubble] Add info bubble
 2015-06-17 11:47:34 -07:00
Charles Hacskaylo
2677dcd10c Merge branch 'open-master' into open1295 
Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/sass/_main.scss
 2015-06-17 11:00:53 -07:00
Victor Woeltjen
bcb4e9c495 [Addressability] Remove excessive check 
Remove unneeded check from ViewSwitcherController; not necessary
to avoid overwriting query string selection of view. WTD-1149.
 2015-06-16 15:40:19 -07:00
Victor Woeltjen
d559dae1e2 [Addressability] Expose current view in query param 
Expose the currently selected view as a query string parameter,
WTD-1149.
 2015-06-16 15:09:42 -07:00
Victor Woeltjen
fec6f06849 [Addressability] Obey view query string param 
Obey the query string parameter for a view, if present.
WTD-1149.
 2015-06-16 14:58:03 -07:00
Charles Hacskaylo
c428df524c Merging in open1248, resolve conflicts 2015-06-16 14:07:53 -07:00
Charles Hacskaylo
4887ba0e58 Merge in open-master, resolve conflicts 2015-06-16 13:53:00 -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
Charles Hacskaylo
d614d7ee86 [Frontend] Very minor tweaks to bring open into parity with lastest scss from ue-frontend 
WTD-1292
Tweaks prior to rebuild of ue-frontend branch;
 2015-06-15 17:43:52 -07:00
Charles Hacskaylo
d8a66b426f [Merge] Merging open-master in; resolved conflicts 2015-06-15 16:47:23 -07:00
Victor Woeltjen
db0cd9cf3a [Clocks/Timers] Merge in latest CSS 
Merge in latest CSS from WARP-specific branch, WTD-1220.
 2015-06-15 16:15:26 -07:00
Charles Hacskaylo
6e7203a49f [Merge] Cherrypick 2 from warp1220 
WTD-1220
 2015-06-15 15:45:40 -07:00
Charles Hacskaylo
5193c62233 [Merge] Cherrypick 1 from warp1220 
WTD-1220
 2015-06-15 15:44:09 -07:00
Charles Hacskaylo
c6c4fa7182 [Fronted] Fixes for misaligned bubbles 
WTD-1247
WTD-884
Changed CSS .l-infobubble-wrapper abs > relative;
Added display: block class for mct-container;
Tweaked bubble evaluation JS for 'goLeft' behavior;
Added constants for bubble max width and left/right margin;
 2015-06-12 16:24:25 -07:00
Charles Hacskaylo
0b46050e04 [Fronted] Tweaks to bubbles and context menus scss 
WTD-1248
WTD-884
Changed z-index of context menus and bubbles to put the menus above;
Changed text wrapping of 'value' td to no-wrap;
Changed min and max-width of .l-infobubble;
 2015-06-12 15:46:31 -07:00
Charles Hacskaylo
39531a0a9f [Fronted] Minor final sanding and polishing 
WTD-839
.t-view-switcher > .view-switcher;
Added CSS transition to hide/show of view-switcher;
Moved .view-switcher hide/show to _frame.scss;
Tweaked .frame:hover to raise z-index to show complete border;
 2015-06-12 14:17:19 -07:00
Charles Hacskaylo
8f153d4e75 [Fronted] Significant refactoring of mixins for containers and buttons 
WTD-839
Removal of 'icon-btn' class from *.html;
Cleanup of markup in switcher.html;
'name' span is now hidden when switcher is within frame;
Commented out unused css classes in _controls.scss,
Normalization of markup in object header when in main view and framed objects;
Icon sizing fixed in menus and switcher control;
Tightened up spacing in menus;
 2015-06-12 11:44:09 -07:00
Charles Hacskaylo
af0c2e7827 [Fronted] Significant refactoring of mixins for containers and buttons 
WTD-839
Refactoring in advance of style mods to switcher when in frame;
Cleanup of markup to remove 'icon' class from invoke-menu elements;
 2015-06-12 10:00:51 -07:00
Charles Hacskaylo
0b8d5ceb86 [Fronted] Significant refactoring of btn classes 
WTD-839
Refactoring in advance of style mods to switcher when in frame;
Moved btn styles from _controls.scss to _buttons.scss;
Markup cleaned up with css classing simplified;
 2015-06-10 17:23:08 -07:00
Charles Hacskaylo
bd66c0138b [Merge] Bringing in latest ue-frontend 2015-06-10 15:20:38 -07:00
Charles Hacskaylo
d7e43026cd [Merge] Merge in open-master, resolve conflicts in _constants.scss 2015-06-10 14:04:48 -07:00
Charles Hacskaylo
1795dc5549 Merging in /platform specific changes from warp1220 2015-06-09 16:44:18 -07:00
Charles Hacskaylo
7a93b7d77a Pulled in final sanding on bubbles.scss from open1222 2015-06-09 09:32:28 -07:00
Charles Hacskaylo
cec115976c Merged latest from open-master and open1222 platform/ 2015-06-08 16:00:24 -07:00
Charles Hacskaylo
9f90c6b8d8 [Frontend] Updated CSS; removed position: relative 
WTD-884
 2015-06-08 11:14:58 -07:00
Victor Woeltjen
f4adc6a889 Merge branch 'open-master' into open1223 
Merge in latest from master branch into topic branch for
limits, WTD-1223.

Conflicts:
	platform/commonUI/general/res/css/forms.css
	platform/commonUI/general/res/css/plots.css
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/css/tree.css
	platform/commonUI/general/res/sass/_fixed-position.scss
	platform/commonUI/general/res/sass/plots/_plots-main.scss
	platform/features/scrolling/res/templates/scrolling.html
 2015-06-08 10:23:36 -07:00
Victor Woeltjen
3a36fda8ab Merge remote-tracking branch 'nasa/open1219' into open1229 
Merge changes for WTD-1219; WTD-1229

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
 2015-06-08 09:53:33 -07:00
Charles Hacskaylo
e216961727 Pulling in all sass, css, etc. and static-markup work from warp1222 so far 2015-06-05 16:48:58 -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
588c35de4e Merge branch 'open-master' into open884 
Merge latest from master branch into topic branch for WTD-884
 2015-06-04 10:39:25 -07:00
Charles Hacskaylo
f23f127207 [Frontend] Markup and CSS for Time Controller 
WTD-1219
Markup, CSS, etc. for time controller;
New template .html file;
Rebuilt from open-master and ue-frontend branches;
 2015-06-02 19:29:57 -07:00
Charles Hacskaylo
c20ad3764d Merge branch 'open-master' into ue-frontend 
Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/sass/lists/_tabular.scss
 2015-06-02 18:26:49 -07:00
Charles Hacskaylo
48c4282416 Merge branch 'open-master' into ue-frontend 
Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/sass/lists/_tabular.scss
 2015-06-02 18:25:26 -07:00
Charles Hacskaylo
0fbb54add3 Merging ue-frontend 2015-06-02 17:44:59 -07:00
Charles Hacskaylo
b09ec23617 [Frontend] Renew of ue-frontend 
Picks up markup and CSS changes from
open1174 (breadcrumbs)
 2015-06-02 16:12:19 -07:00
Victor Woeltjen
1415e9e72f [Licenses] Add missing copyright/license info 
WTD-1051.
 2015-05-29 10:05:59 -07:00
Victor Woeltjen
eafaa04c06 [Info Bubble] Add info gestures 
Add info gestures to labels and grid items, WTD-884.
 2015-05-22 12:51:42 -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
2d13745823 [Frontend] Added CSS and markup for stale; cleanup 
WTD-1172
Added stale CSS in _data-status.scss;
Added pulse animation in _effects.scss, not used;
Removed temp-limits directory and files;
Sanding and refining of limits styles and in .tabular;
 2015-05-06 19:30:36 -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
a244502f16 [Frontend] Adding missed CSS files 
WTD-1172
 2015-05-06 16:57:04 -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
4b774f7b12 [Frontend] Clean up 
WTD-1172
Moved HTML limits markup out of plot.html and into temp-limits/.../examples.html
 2015-05-06 10:34:16 -07:00
Charles Hacskaylo
39c8f0ab00 [Frontend] Plot limits and out-of-bounds indicators 
WTD-1172
Markup and CSS for plots;
Example ng-class added to plot.html for legend items;
Markup added to plot.html for OOB indicators;
 2015-05-06 10:21:29 -07:00
Victor Woeltjen
4c6cad3e77 Merge remote-tracking branch 'nasa/open1163' into open1176 
WTD-1176
 2015-05-06 10:11:01 -07:00
Charles Hacskaylo
fbaa0ff1e0 [Frontend] In-progress markup and CSS for limits 
WTD-1172
Plot limits so far
 2015-05-04 16:50:11 -07:00
Charles Hacskaylo
d21e320ec2 [Frontend] New version of symbols 
WTD-1172
New version of symbols font with glyphs for limits display
 2015-05-04 13:24:41 -07:00
Charles Hacskaylo
ac81968f93 [Frontend] CSS in Fixed Position view Edit mode 
WTD-1163
WTD-1114
Added CSS to give a border to all elements in Fixed Position view when in Edit mode.
Only applied to outer element, does not affect object border styling;
 2015-05-01 10:43:15 -07:00
Charles Hacskaylo
6aadf921e1 [Frontend] Tweaks to spacing 
WTD-1163
WTD-1146
 2015-05-01 10:18:33 -07:00
Charles Hacskaylo
aec1176dc4 [Frontend] Hiding non-functional items; padding adjustments 
WTD-1163
WTD-1146
New CSS to hide non-functional elements, including browse.top-bar with search elements;
Adjusted spacing, mainly in .contents CSS class;
 2015-05-01 10:10:35 -07:00
Charles Hacskaylo
0bbe3ec99a [Frontend] CSS enhancements 
WTD-1054
Better handling of different content cases;
 2015-04-29 18:13:35 -07:00
Charles Hacskaylo
eafc603e03 [Frontend] Infobubble markup and CSS 
WTD-1054
Markup and styling for infobubble;
Includes fake data in infobubble.html
 2015-04-29 17:52:06 -07:00
Charles Hacskaylo
babe420f26 [Frontend] CSS and markup for iframe 
WTD-1150
WTD-1145
CSS and markup to cause iframes to layout properly without double scroll bars
 2015-04-28 14:49:08 -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
Charles Hacskaylo
b6503489b9 [Frontend] Major reformatting of /licenses page 
WTD-1036
Major additions to /licenses page
Apache license added;
Full licenses for each software component added;
Formatting and styles;
 2015-04-15 17:40:12 -07:00
Charles Hacskaylo
dbe27d2842 [Frontend/Content] Copy and styling tweaks 
WTD-1036
Open source copyright information added to about-dialog.html;
Styling for a and h2 elements tweaked;
 2015-04-15 14:40:38 -07:00
Charles Hacskaylo
29b63504eb [Frontend] New and updated styles for values view 
WTD-938
 2015-04-07 20:52:49 -07:00
Charles Hacskaylo
379e76af4f [Frontend] CSS change to center fixed position images 
WTD-1048
WTD-957
 2015-03-20 16:48:14 -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
988f539ee1 [Platform] Bring in changes 
Bring in open-source-friendly changes to CSS, fonts, templates,
related to WTD-1045.
 2015-03-20 09:11:07 -07:00
Victor Woeltjen
c7149437fc [Tree] Show top-level node of tree, except root 
Show top-level nodes when instantiating tree views, except for
the Root object. Supports Add dialogs in WTD-922.
 2015-03-18 10:44:40 -07:00
Victor Woeltjen
d863c2843c [Tree] Show root for most trees 
Modify tree so that it includes its root in most cases, for
WTD-922.
 2015-03-18 10:30:36 -07:00
bwyu
8673e2045e Merge remote-tracking branch 'origin/open987' into open-master 2015-03-16 10:28:55 -07:00
Victor Woeltjen
ee04814f59 Merge remote-tracking branch 'nasa/open1002' into open1015 
Merge in open1002, WTD-1015.

Conflicts:
	platform/commonUI/edit/res/templates/edit-object.html
 2015-03-12 11:32:17 -07:00
Charles Hacskaylo
e7e0c6829e [Frontend] Added "first" CSS class applied to form-row elements 
WTD-1002
WTD-1005
Made form.html add CSS class "first" to each form-row element in order to allow proper border-top styling;
 2015-03-11 15:09:48 -07:00