ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-22 14:32:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,214 Commits 989 Branches 212 Tags 191 MiB
77c7bdfdec
Commit Graph

1165 Commits

Author SHA1 Message Date
larkin
f9782f1f45 Merge remote-tracking branch 'origin/open1273' into open-1340 2015-06-26 15:03:19 -07:00
Victor Woeltjen
f8f2019dad Merge remote-tracking branch 'nasa/open1322' into open1388 2015-06-26 13:25:12 -07:00
Victor Woeltjen
2161707954 Merge pull request #24 from shivamndave/open23 
Addresses #23
 2015-06-26 12:41:43 -07:00
Charles Hacskaylo
fce327a398 [Dev/Frontend] New symbol added to symbols font 
WTD-1322
Platform-only commit;
(cherry picked from warp1322 commit 7254013)
 2015-06-25 15:17:08 -07:00
Shivam Dave
2a347f1596 [Windowing] urlService 
Removed the urlService from the edit
and browse bundles. Added the urlService
to the general bundle. WTD 23.
 2015-06-25 14:53:52 -07:00
Sarah Hale
bf8b0bae03 Merge branch 'master' of https://github.com/nasa/openmctweb into open18 2015-06-25 14:51:18 -07:00
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
Charles Hacskaylo
cc181dbdc9 [Frontend] Form and form control enhancements 
WTD-1002
Added Angular hooks to allow form elements to have JSON defined CSS classes
Form element cleanups
 2015-03-10 22:36:35 -07:00
Victor Woeltjen
d8d28d892d [Forms] Add test cases 
Add test cases for the SelectorController (used to support
dialog in WTD-987) to satisfy coverage standards.
 2015-03-10 09:32:40 -07:00
Victor Woeltjen
411deb9f4f [Forms] Wrap selector in ul 
Present selected elements in an object selector as
an unordered list, for WTD-987.
 2015-03-10 08:59:56 -07:00
Victor Woeltjen
e411e67c81 [Forms] Add placeholder spec 
Add placeholder spec for SelectorController, WTD-987.
 2015-03-10 07:40:01 -07:00
Victor Woeltjen
1efe80f12b [Forms] Hide filter in selector 
Hide filter shown in selector control, added for
WTD-987.
 2015-03-10 07:34:43 -07:00
Victor Woeltjen
26ba75f636 [Forms] Update selector controller 
Update controller for domain object selector, for WTD-987.
 2015-03-09 17:26:37 -07:00
Victor Woeltjen
66e0d2fcfa [Forms] Complete initial selector 
Complete initial implementation of the domain object
selector for WTD-987.
 2015-03-09 17:16:31 -07:00
Victor Woeltjen
4146a2ad01 [Forms] Begin adding controller for selector 
Begin implementing controller to populate the domain
object selector, added for WTD-987.
 2015-03-09 17:03:28 -07:00
Victor Woeltjen
67bb110dc8 [Forms] Update selector template 
Update selector template to request necessary information
to populate domain object selector, as shown in UI diagrams
for WTD-987.
 2015-03-09 16:54:22 -07:00
Victor Woeltjen
66c8f5fe76 [Forms] Add selector template 
Add template for domain object selector, needed
for dialogs related to WTD-987.
 2015-03-09 16:44:27 -07:00
bwyu
b05315a140 Merge remote-tracking branch 'origin/open920' into open-master 2015-03-09 11:06:12 -07:00
Charles Hacskaylo
c640d6238b [Frontend] Markup and CSS mods to fix click area in btn-menu objects 
WTD-1002
WTD-942
Mods to markup and CSS to make click-area of menu buttons occupy full area of button
 2015-03-06 10:55:40 -08:00
Charles Hacskaylo
feda668e18 [Frontend] Applied split pane functionality to edit mode 
WTD-1002
SplitPaneController added to edit-object.html;
CSS modded to remove positioning that is now under splitter control;
 2015-03-06 08:11:27 -08:00
Charles Hacskaylo
433cdf8b1c In-progress checkin - NOT WORKING RIGHT YET! 2015-03-05 16:02:33 -08:00
Charles Hacskaylo
1304084f7a [Frontend Bug] Fixed CSS for selects to correct Firefox display problem 
WTD-954
 2015-03-05 12:43:48 -08:00
Victor Woeltjen
4f89911739 [CSS] Update compiled CSS files 
Rewrote some history as part of merge for WTD-940 to
remove non-open-source history; compiled CSS files did
not merge correctly in this process, so bringing over
compiled files from the original branch to replace these.
 2015-03-04 14:49:02 -08:00
Charles Hacskaylo
679e56d231 [Frontend] Tweaks and minor mods 
WTD-894
Changed image CSS from contain to cover
Modded default colors for text and telemetry elements to visibility;
Moved click handler position in menu-button.html for better clickability;

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
 2015-03-04 14:45:24 -08:00
Charles Hacskaylo
7c7f1c3dbc [Bug fix] Removed temp dev styling and fixed width issues with telemtry elements in Fixed Position view 2015-03-04 14:43:55 -08:00
Charles Hacskaylo
448b535de0 [Frontend] Markup and CSS mods to clean up form elements display 
WTD-610
CSS and markup mods principally focused on selects, checkboxes and composite controls;
Cleaned up positioning and formatting in .l-result area of query form bottom;
Removed display of view type when only a single view available for an object in switcher.html

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	vista/query/res/templates/channel-query.html
	vista/query/res/templates/channel-selector.html
	vista/query/res/templates/evr-query.html
 2015-03-04 14:43:21 -08:00
Charles Hacskaylo
9c001fabd9 [Frontend] Form element style and markup fixes 
WTD-610
Fixed markup in select.html;
Rebuilt associated CSS in _selects.scss;
Still to-do: checkbox valign and spacing

Conflicts:
	platform/commonUI/general/res/css/forms.css
	platform/commonUI/general/res/css/items.css
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/css/tree.css
 2015-03-04 14:41:50 -08:00
Victor Woeltjen
86ee28740f [Common UI] Avoid infinite digest 
Avoid infinite digest when first applicy mct-scroll
directives, WTD-920.
 2015-03-03 13:50:39 -08:00
Charles Hacskaylo
068518b535 [Frontend] Minor sanding 
WTD-894
Fix to correct spacing problem in object-header
 2015-02-25 18:59:36 -08:00
Charles Hacskaylo
424d60440c [Frontend] Delivery checkin: final tweaks to CSS 
WTD-894
CSS tweaks to allow box-sizing to be applied to elements within mct-include containers;
CSS cleanups
 2015-02-25 18:41:00 -08:00
Charles Hacskaylo
a0f31132e3 [Frontend] In-progress checkin: color palette SASS 
WTD-847
Significant markup and CSS for color palette support;
 2015-02-25 18:17:11 -08:00
Charles Hacskaylo
bdd070e12f [Frontend] In-progress checkin: added new symbols for Fixed Position view 
WTD-894
New symbols in wtdsymbols font;
Updated layout/bundle.json to use new glyphs;
 2015-02-25 16:44:11 -08:00
Victor Woeltjen
5df2710721 [Common UI] Document mct-scroll-* directives 
Add documentation for mct-scroll-x and mct-scroll-y, WTD-920.
 2015-02-25 16:34:51 -08:00
Victor Woeltjen
9fa09e25f0 [Common UI] Tweak mct-scroll-* directives 
Make fixes/tweaks to behavior of mct-scroll-x and mct-scroll-y
directives after testing them against timeline markup. WTD-920.
 2015-02-25 16:28:53 -08:00
Victor Woeltjen
9a88e5172a [Common UI] Expose mct-scroll-x, mct-scroll-y 
Expose mct-scroll-x and mct-scroll-y directives. WTD-920.
 2015-02-25 16:05:57 -08:00
Victor Woeltjen
f8b352c4d8 [Common UI] Implement mct-scroll-* parent 
Implement parent directive for mct-scroll-x, mct-scroll-y.
WTD-920.
 2015-02-25 16:01:38 -08:00
Charles Hacskaylo
7d03bc4de9 [Frontend] In-progress checkin: migrating style tags to classes, other 
WTD-894
Significant migration of inline styles to CSS classes;
Changed telemetry component so that when title is hidden, telem element can take up 100% of the element width;
Static text elements now show scrollbars on overflow;
Added padding and box-sizing to text elements - this is throwing off the selected control because of the offset and should be fixed;
 2015-02-25 15:53:02 -08:00
Victor Woeltjen
f11eced6b9 [Common UI] Add spec for MCT scroll directive parent 
Add spec for MCTScroll, which will act as a parent class
for mct-scroll-x and mct-scroll-y directives, WTD-920.
 2015-02-25 15:47:30 -08:00
Charles Hacskaylo
a11967ce2e Merging in open-master; resolved conflict in /platform/.../edit-object.html 2015-02-25 13:21:56 -08:00
Victor Woeltjen
f523022a2a [Styles] Merge in style updates 
Merge in style updates and split pane updates related
to timeline view into open-source-friendly branch,
WTD-901
 2015-02-25 11:25:20 -08:00
Charles Hacskaylo
fa4cfc4961 [Frontend] In-progress checkin: 
WTD-894
Added scss file for fixed position styles;
Mods in progress to fixed.html to remove inline styling and change grid method to background gradient approach;
 2015-02-25 11:08:52 -08:00
Charles Hacskaylo
db87147bbd [Frontend] Normalized buttons in toolbar 
WTD-894
Fixed application of CSS styles in HTML templates to format buttons properly;
In-progress...
 2015-02-25 09:54:44 -08:00
Victor Woeltjen
e073ca5145 Merge remote-tracking branch 'nasa/open763' into open796 
Merge CSS fix for dialog overlay, WTD-796
 2015-02-12 15:31:30 -08:00
bwyu
19bcfef123 Merge remote-tracking branch 'origin/open747' into open-master 2015-02-06 16:45:49 -08:00
bwyu
4f17071c85 Merge remote-tracking branch 'origin/open669' into open-master 2015-02-04 13:05:30 -08:00
bwyu
5c649935d2 Merge remote-tracking branch 'origin/open717' into open-master 2015-02-02 16:58:27 -08:00
Charles Hacskaylo
420a006fab [Bug/Front-end] Fixed display overflow issue in Create dialog 
WTD-763
Added new class with overflow: auto to div element in platform/.../dialog.html
 2015-01-29 16:27:19 -08:00
Victor Woeltjen
92252b41d4 [Browse] Remove unused container 
Remove unused container definition for split pane; this
turned out not to be a suitable quick-fix approach to
WTD-747 (implementation of this behavior directly from
the browse template turned out to be more convenient.)
 2015-01-28 16:45:20 -08:00
Victor Woeltjen
c0a1e0a0d4 [Browse] Add spec for SplitPaneController 
Add unit test for controller which supports the moveable
splitter in Browse mode, WTD-747.
 2015-01-28 16:43:18 -08:00
Victor Woeltjen
14571ebb6e [Browse] Add JSDoc 
Add in-line documentation to controller which supports the
moveable splitter in Browse mode, WTD-747.
 2015-01-28 16:38:32 -08:00
Victor Woeltjen
8fecaaf4f8 [Browse] Utilize splite pane directly 
Utilize split pane controller directly from browse
template; quick fix for need to see more information
about packet/point names, WTD-747.
 2015-01-28 16:34:03 -08:00
Victor Woeltjen
06b599ee37 [Browse] Begin implementing splitter movement 
Begin implementing moveable splitter, WTD-747.
 2015-01-28 16:25:16 -08:00
Victor Woeltjen
d0de13ca62 Merge branch 'open-master' into open737 
Integrate icon with latest from master, WTD-737
 2015-01-27 16:40:32 -08:00
Charles Hacskaylo
2f1a15268b [Front-end] Adding missing logo file 
WTD-668
 2015-01-27 16:28:43 -08:00
Victor Woeltjen
cab1f72579 [Licenses] Add license information 
Add license information for included software components,
to populate the Licenses page. WTD-669.
 2015-01-27 15:37:47 -08:00
Charles Hacskaylo
6f26c9cd47 [Front-end] Added drop-shadow version of app logo 
WTD-668
Added a version of the shadow with drop shadow on the About screen
 2015-01-27 14:56:10 -08:00
Charles Hacskaylo
68cd2a0e76 [Front-end] Favicons for app 
WTD-724
Added favicon art files, and references in index.html
 2015-01-27 14:20:15 -08:00
Victor Woeltjen
6947e0aa42 [Performance] Update specs 
Add tests to verify that directives stop polling after their
scope is destroyed (to prevent resource leaks); those changes
address resource leaks identified in the context of WTD-717.
 2015-01-27 08:50:11 -08:00
Victor Woeltjen
a9f7cc9658 [Performance] Deactive mct-resize on destroy 
Deactive mct-resize when its containing scope is destroyed;
that is, don't go on polling for size changes indefinitely.
Issue discovered/addressed in the context of investigating
sluggishness of plotting in WTD-717.
 2015-01-26 17:48:33 -08:00
Charles Hacskaylo
53d6b60bda [Front-end] About screen and app logo for OpenMCT Web 
WTD-668
WTD-700
Fixed app logo for OpenMCT Web for WTD-700;
About screen for OpenMCT Web;
 2015-01-26 12:58:50 -08:00
Charles Hacskaylo
9686384619 [Front-end] About screen and status bar logo 
>
> WTD-668
> WTD-700
Pulling over platform-specific CSS and imagery for About screen and status bar logo;
In progress
 2015-01-26 10:18:23 -08:00
bwyu
8e7f916558 Merge remote-tracking branch 'origin/wtd689' into open-master 2015-01-20 11:33:25 -08:00
bwyu
af3175ca07 Merge remote-tracking branch 'origin/open591' into open-master 2015-01-16 15:40:44 -08:00
bwyu
7c0cf22b27 Merge remote-tracking branch 'origin/open667' into open-master 2015-01-16 13:50:53 -08:00
Victor Woeltjen
2bd896580e [Switcher] Initialize on timeout 
Initialize view switcher state on a timeout; this avoids
infinite digest cycles when deeply-nesting views.
WTD-689.
 2015-01-16 10:32:10 -08:00
Victor Woeltjen
86c2cda7a2 [Autoflow] Update CSS files 
Update CSS/SCSS for autoflow tabular view with changes
to fix alignment of cells for WTD-685 and WTD-674;
part of integration task WTD-686.
 2015-01-15 16:12:09 -08:00
Victor Woeltjen
ccc30fde3d [Stylesheets] Add spec, docs 
Add tests and JSDoc to the style sheet loader introduced to
allow bundles to introduce their own CSS files through the
platform's regular extension mechanism; WTD-591.
 2015-01-14 17:23:18 -08:00
Victor Woeltjen
fcab62b498 [Stylesheets] Add style sheet loader 
Add style sheet loader and move style sheets inclusion
out of index.html. WTD-591.
 2015-01-14 17:01:52 -08:00
Victor Woeltjen
9a400f6fba [About] Add About bundle 
Add bundle platform/commonUI/about, and initial templates for
the About dialog. WTD-667.
 2015-01-14 10:44:59 -08:00
Victor Woeltjen
d916111060 [Tree] Restore wait spinner 
Restore wait spinner in tree (missed during Angular transition);
this feedback is important when waiting for the contents of
the Packets node (WTD-644) to load.
 2015-01-09 17:40:46 -08:00
bwyu
9981543156 Merge remote-tracking branch 'origin/open614d' into open-master 2015-01-05 11:14:07 -08:00
Charles Hacskaylo
d281bd52de Fixing inadvertant breakage of super-menu 
Fixing inadvertant breakage of super-menu
from changes to .pane classes related to split-pane CSS changes
WTD-618
 2015-01-02 14:12:22 -08:00
Charles Hacskaylo
f820cd47b6 [Bug] CSS and markup mods 
CSS markup and mods to fix issues related to bug WTD-618;
fix is complete and verified in Chrome
 2015-01-02 14:11:29 -08:00
Victor Woeltjen
ad4c5849c1 [Autoflow] Remove obsolete font file 
Remove obsolete font file, unintentionally restored while
cherry-picking from autoflow topic branch. WTD-614.
 2014-12-31 13:41:56 -08:00
Victor Woeltjen
b51d5762d8 [Common UI] Add JSDoc 
Add JSDoc for GetterSetterController, which was added to
support the input filtering control used in autoflow
tabular views, WTD-614.
 2014-12-31 13:40:10 -08:00
Victor Woeltjen
0976374e1d [Common UI] Fill in new specs 
Complete test coverage for new scripts added to bundle
platform/commonUI/general in suport of autoflow
tabular views, WTD-614. Specifically, these provide a
directive to watch element sizes, and a controller to
help as an intermediary between getter-setter style
ngModels, and plain assignable ones.
 2014-12-31 13:40:03 -08:00
Victor Woeltjen
dd1b8f7c2f [Common UI] Add skeleton specs 
Add empty test scripts for new scripts introduced to
the platform/commonUI/general bundle in support of
the autoflow tabular view, WTD-614.
 2014-12-31 13:39:39 -08:00
Victor Woeltjen
54c075dc88 [Common UI] Reorganize general UI tests 
Reorganize folder strucutre for tests in bundle
platform/commonUI/general; source folder structure
has been modified to accommodate additional classes
added to support autoflow tabular views, WTD-614,
so test folder needs to be reorganized accordingly
 2014-12-31 13:38:54 -08:00
Victor Woeltjen
112622ab9f [Common UI] Reorganize general UI bundle 
Reorganize sources for bundle platform/commonUI/general;
number of classes here has grown as a consequence of
additions for WTD-614 and so an additional layer of
organization is helpful.

Conflicts:
	platform/commonUI/general/bundle.json
	platform/commonUI/general/src/directives/MCTResize.js
 2014-12-31 13:38:26 -08:00
Victor Woeltjen
3251be2d1c [Autoflow] Add getter-setter controller 
Add a utility controller for interacting with
getter-setter style ngModels (similar to ng-model-options
with getterSetter: true, but support for that is not
present in the current version of Angular.) Specifically,
this is used to support the input filter control, which
in turn is used within the autoflow tabular view. WTD-614.
 2014-12-31 13:37:28 -08:00
Victor Woeltjen
7db5c0692b [Autoflow] Add SCSS files 
Merge in SCSS files and platform markup which supports
autoflow tabular views for WTD-611 into the open-source-friendly
master branch.
 2014-12-31 10:43:01 -08:00
bwyu
217b622db7 Merge remote-tracking branch 'origin/wtd627' into open-master 2014-12-19 17:52:13 -08:00
Victor Woeltjen
24048024f6 [Browse] Test auto-expand fix 
Add a test to verify fix for WTD-627 (specifically, verify
that a node does not auto-expand if a selection is made
in some other subtree.)
 2014-12-17 15:41:44 -08:00
Victor Woeltjen
4d94ab6fd6 [Browse] Fix tree node autoexpand/highlighting 
Repair tree node auto-expand/highlight behavior, to
address WTD-627. Specifically:

* Check the full path when deciding to highlight,
  instead of just the parent. This avoids duplicate highlighting
  in cases where the same parent is visible in two subtrees.
* Don't make a redundant getId call in path-checking;
  domain object paths have already been mapped to identifier
  paths at this point. This avoids erroneous auto-expansion of
  the whole tree.
 2014-12-17 15:32:20 -08:00
Victor Woeltjen
4a572decf3 [Indicators] Fill in specs 
Fill in specs to ensure code coverage for scripts introduced
to support indicators as a category of extension. WTD-608.
 2014-12-16 14:06:19 -08:00
Victor Woeltjen
8ce693af0a [Indicators] Add skeleton specs 
Add skeleton specs for the bottom bar controller (introduced
to handle display of indicators introduced as extensions)
and the Couch indicator (introduced to exercise the above,
and to report connection status relative to the Couch
database.) WTD-608.
 2014-12-16 13:47:25 -08:00
Victor Woeltjen
ff8572f055 [Indicators] Add tooltip 
Add tooltips to indicators, using a description field
from the provided indicator. WTD-608.
 2014-12-16 13:43:51 -08:00
Victor Woeltjen
1a50f50310 [Indicators] Support template override 
Allow indicators to include their own custom templates.
WTD-608.
 2014-12-16 13:23:20 -08:00
Victor Woeltjen
48bcb662c6 [Indicators] Add notion of indicators 
Add indicators as a category-of-extension, utilized
from the bottom bar to populate its contents.
WTD-608.
 2014-12-15 10:17:02 -08:00
Victor Woeltjen
6de973c11e [Layout] Add JSDoc to new scripts 
Add in-line documentation to new scripts introduced to
support the transitioned Layout view, WTD-535.
 2014-12-05 18:01:38 -08:00
Victor Woeltjen
ecb4283df0 [Layout] Fill in non-layout specs 
Complete specs for scripts introduced in support of
Layout objects/views. WTD-535.
 2014-12-05 16:27:32 -08:00
Victor Woeltjen
d3f0505385 [Layout] Fix failing specs 
Repair or remove failing specs to reflect changes and
refactoring performed during transition of Layout views,
WTD-535.
 2014-12-05 15:48:13 -08:00
Victor Woeltjen
f418491cc4 [Layout] Add empty specs 
Add empty specs for new scripts introduced during the
transition of Layout object type and view, WTD-535.
 2014-12-05 15:39:07 -08:00
Victor Woeltjen
2ef244edce [Layout] Refer to new scripts from test suites 
Add entries for new scripts to test suites, to ensure
tests fail until scripts added to support transition
of Layout object/view (WTD-535) have been completed.
WTD-535.
 2014-12-05 15:33:25 -08:00
Victor Woeltjen
a0486495c4 [Layout] Cache reference to body later in mct-drag 
Get a reference to the body element at link-time,
instead of instantiation time, from the mct-drag
directive. Failure to do so causes the reference
to fall out of date when switching between Browse
and Edit mode.

Supports position/sizing interactions for Layout
view, WTD-535.
 2014-12-05 14:21:10 -08:00
Victor Woeltjen
7080ca585e [Layout] Avoid infinite digest exception 
Auto-expand tree nodes on a timeout, instead of immediately.
This is necessary in cases where auto-expansion several
layers deep occurs; if done immediately, each expansion
will trigger a new digest cycle, which at a certain depth
will appear to Angular as unstable.

Done in the context of WTD-535.
 2014-12-05 13:31:57 -08:00
Victor Woeltjen
707641d5b6 [Layout] Trigger digest from mct-drag 
Trigger digest using scope. during mct-drag
interactions, to ensure that changes which have
resulted from the drag are applied promptly.
WTD-535.
 2014-12-05 08:55:54 -08:00
Victor Woeltjen
b941557b41 [Layout] Fix errors in mct-drag 
Properly reset the initial drag position tracked by the
mct-drag position so that multiple drags upon the same
element are correctly offset from an initial position.
Also, preventDefault from events to avoid selection
highlights during drag.

Supports editing Layout objects, for WTD-535.
 2014-12-05 08:50:45 -08:00
Victor Woeltjen
479aaa09fb [Layout] Add mct-drag directive 
Add an mct-drag directive to support various draggable
things, including frames in a layout. WTD-535.
 2014-12-04 14:45:19 -08:00
Victor Woeltjen
7b1c275dee [Layout] Use refactored switcher in Edit 
Update templates for Edit mode to reflect
simplifications to the view switcher introduced
to support its use on Layouts, transitioned for
WTD-535.
 2014-12-04 12:32:35 -08:00
Victor Woeltjen
2c0574abff [Layout] Update view switcher spec 
Update spec for ViewSwitcherController to reflect
refactoring to simplify usage, performed in the
context of transitioning Layouts. WTD-535.
 2014-12-04 12:17:43 -08:00
Victor Woeltjen
1b9f9a8db7 [Layout] Move spec for view switcher 
Move spec for view switcher from bundle
platform/commonUI/browse to bundle
platform/commonUI/general to reflect refactoring
to simplify usage in other places (including in
Layouts, which are being transitioned for
WTD-535.)
 2014-12-04 12:15:22 -08:00
Victor Woeltjen
6cd0cd8e3c [Layout] Refactor view switcher 
Refactor view switcher to simplify it; treat it
as a representation of a domain object that modifies
an ng-model. This simplifies reuse, e.g. in frames
within a layout. WTD-535.
 2014-12-04 12:12:41 -08:00
Victor Woeltjen
ba14aeabc6 [Forms] Complete specs 
Fill in new specs and amend existing specs to ensure
full coverage after integration of forms component,
and associated changes. WTD-593.
 2014-12-03 17:59:37 -08:00
Victor Woeltjen
6fb5da1b35 [Forms] Prune obsolete specs 
Prune obsolete specs after changes made to support
integration of forms component, WTD-593.
 2014-12-03 17:26:02 -08:00
Victor Woeltjen
e04b9828ea [Forms] Use ng-model for tree state 
Use ng-model when communicating state to/from the
tree in browse mode. This will simplify implementation
of the Locator control, which also uses a tree, but
which should not set navigation state. WTD-593.
 2014-12-03 13:18:51 -08:00
Victor Woeltjen
093ccb637f [Common UI] Amend ActionGroupControllerSpec 
Amend ActionGroupControllerSpec (introduced for WTD-574,
transition of common UI elements) such that it handles
the case where no action capability is defined.
 2014-11-24 17:09:56 -08:00
Victor Woeltjen
80430234d6 [Common UI] Add JSDoc 
Add JSDoc to remaining scripts in bundle
platform/commonUI/general. WTD-574.
 2014-11-24 16:39:52 -08:00
Victor Woeltjen
2f43e8cd7f [Common UI] Document TreeNodeController 
Add in-line documentation to TreeNodeController, and update
glossary with some clarifying definition.

Additionally, change name from tree-item to tree-node for
consistency.

Part of ongoing transition of commonUI bundles, WTD-574.
 2014-11-24 15:42:15 -08:00
Victor Woeltjen
e0b201aa17 [Common UI] Add spec for mct-container 
Add spec for the mct-container directive, introduced
as part of the general user interface support bundle,
platform/commonUI/general. WTD-574.
 2014-11-24 15:22:03 -08:00
Victor Woeltjen
2b1fdc2204 [Common UI] Add specs for controllers 
Add specs for controllers in the commonUI/general bundle.
WTD-574.
 2014-11-24 15:10:29 -08:00
Victor Woeltjen
b026e313be [Common UI] Add skeleton specs 
Add skeleton specs for bundle platform/commonUI/general.
WTD-574.
 2014-11-24 13:39:52 -08:00
Victor Woeltjen
f6850ffc4f [Common UI] Encapsulate TreeNodeController 
Reduce reliance on  from TreeNodeController,
clean up and better isolate node expansion behavior.
Part of transition of common UI elements, WTD-574.
 2014-11-24 10:30:45 -08:00
Victor Woeltjen
2ab3f5f5f9 [Common UI] Generalize ToggleController 
Add a general-purpose ToggleController for things that
need to expand and contract. WTD-574.
 2014-11-24 07:49:50 -08:00
Victor Woeltjen
3a5a015097 [Common UI] Generalize click-away behavior 
Add a general-purpose controller for UI elements which
have 'click-away' behavior; that is, they should be
deactivated on document clicks.

This generalizes existing behavior added for the Create
menu, such that it may be used on other, similar menus
and UI elements.

Part of ongoing transition of common user interface
components, WTD-574.
 2014-11-24 07:12:45 -08:00
Victor Woeltjen
1b0303e517 [Common UI] Initial commonUI bundles 
Bring in work on general-purpose and over-arching
user interface bundles from the sandbox transition
branch. WTD-574.
 2014-11-23 15:41:20 -08:00