Commit Graph

197 Commits

Author SHA1 Message Date
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
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
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
Victor Woeltjen
4c6cad3e77 Merge remote-tracking branch 'nasa/open1163' into open1176
WTD-1176
2015-05-06 10:11:01 -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