Commit Graph

398 Commits

Author SHA1 Message Date
Victor Woeltjen
d7b79b6b69 [Addressability] Preserve nav. state on leaving Edit
Preserve navigation state when leaving Edit mode, in the context
of addressability changes. WTD-1149.
2015-06-16 14:29:22 -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
Victor Woeltjen
3738ea16d7 [Addressability] Update route without reinstantiating
Work around normal behavior of Angular when path changes;
instead of reinstantiating controller for Browse mode
when Browse-initiated path changes occur, act as if the
route hadn't changed (so that the URL updates but the
currently-displayed state, e.g. tree expansion, is
preserved.) WTD-1149.
2015-06-16 13:44:35 -07:00
Victor Woeltjen
084d6b6859 [Addressability] Update path on navigation
Update path in browse mode when navigation state changes.
WTD-1149.
2015-06-16 13:28:19 -07:00
Victor Woeltjen
9fae2db04a [Addressability] Infer ROOT
Treat the path element for the root domain object as implicit, such
that it does not appear in the full URL. WTD-1149.
2015-06-16 13:16:55 -07:00
Victor Woeltjen
8f18d88705 [Addressability] Navigate down path from params
Traverse down the path from route parameters to initially navigate to a
domain object in Browse mode. WTD-1149.
2015-06-16 13:14:12 -07:00
Victor Woeltjen
f24db1561e [Addressability] Get IDs from URL
Add a route parameter to Browse mode which includes domain
object identifiers. WTD-1149.
2015-06-16 13:00:03 -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
Charles Hacskaylo
043a2ed581 Merging in open-master 2015-06-15 16:38:20 -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
larkin
8811f2a53e [Creation] createObject returns newObject
createObject returns a promise which is resolved when the object
has been persisted.  The promise is resolved with an instance of the
new domainObject.
2015-06-11 13:09:01 -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
Victor Woeltjen
732c0abf10 [Info Bubble] Add newlines
Add newlines to end of files added for WTD-884.
2015-06-10 16:40:22 -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
Pete Richards
e6d830bfdc Merge pull request #1 from nasa/open1221
[Platform] Tweak misc. items to support clocks/timers
2015-06-09 10:23:06 -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
larkin
689701b37f [Licenses] Add License Header 2015-06-08 11:23:25 -07:00
Charles Hacskaylo
9f90c6b8d8 [Frontend] Updated CSS; removed position: relative
WTD-884
2015-06-08 11:14:58 -07:00
larkin
eb1621dad9 Merge branch 'open1200' into open-1201 2015-06-08 11:11:50 -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
d2a75c4338 [Info Bubble] Add test cases for gesture
Add test cases for the info gesture, WTD-884.
2015-06-05 06:31:23 -07:00
Victor Woeltjen
1567c32993 [Info Bubble] Add license headers
Add license headers to scripts for info bubbles, WTD-884.
2015-06-04 16:41:34 -07:00
Victor Woeltjen
21c066e10f [Info Bubble] Add test cases for infoService
WTD-884.
2015-06-04 16:38:55 -07:00
Victor Woeltjen
640b39e3a0 [Info Bubble] Begin adding tests
Begin adding tests for info bubble, WTD-884.
2015-06-04 16:27:41 -07:00
Victor Woeltjen
11dc5f380c [Info Bubble] Use domain object metadata
Use domain object metadata to populate the info bubble from
the info gesture, WTD-884.
2015-06-04 12:30:18 -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
Victor Woeltjen
2648f01966 [Composition] Disallow composition for leaf types
Disallow composition for domain object types which will
not have a composition property; WTD-1221.
2015-06-04 09:16:12 -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
ff1d4854a8 Revert "[Licenses] Remove license ref from dialog"
This reverts commit 2ca789e36a.
Change was made to misunderstanding of instructions; WTD-1051.
2015-05-29 10:08:43 -07:00
Victor Woeltjen
1415e9e72f [Licenses] Add missing copyright/license info
WTD-1051.
2015-05-29 10:05:59 -07:00
Victor Woeltjen
61bc662efb [Licenses] Add missing copyright years
WTD-1051.
2015-05-22 14:48:53 -07:00
Victor Woeltjen
219a6086d8 [Info Bubble] Remove placeholder type/view
Remove Info Bubble as a type and view, which had been present
for purposes of example during development. WTD-884.
2015-05-22 13:27:04 -07:00
Victor Woeltjen
69dce9f88d [Info Bubble] Add clarifying comments
Add clarifying comments for the info gesture, WTD-884.
2015-05-22 13:25:39 -07:00
Victor Woeltjen
d9a2a7f4c3 [Info Bubble] Refine positioning, add comments
Refine positioning to behave correctly when mouse is on
right and/or lower part of screen; listen for scope
destruction to avoid cases where an element is removed
before mouseleave is ever called. WTD-884.
2015-05-22 13:22:26 -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
ab6a5afe93 [Info Bubble] Tweak positioning
Tweak positioning of info bubbles, WTD-884.
2015-05-22 12:50:09 -07:00
Victor Woeltjen
35f4032ae8 [Info Bubble] Fix display issues
Intermediary commit; fix some display issues with info bubbles,
add some delay. WTD-884.
2015-05-22 12:28:58 -07:00
Victor Woeltjen
05a78f70e3 [Info Bubble] Begin adding info gesture
Begin adding info gesture, which will attach info bubbles
to representations of domain objects. WTD-884.
2015-05-22 12:03:58 -07:00
Victor Woeltjen
179b0b46e5 [Info Bubble] Add info service
Add service for showing informational bubbles, WTD-884.
2015-05-22 11:49:02 -07:00
Victor Woeltjen
ac8fbb289e [Info Bubble] Continue breaking down templates
WTD-884.
2015-05-21 21:25:50 -07:00
Victor Woeltjen
ce2b48981a [Windowing] Add in-line documentation
WTD-1200.
2015-05-20 10:06:59 -07:00
Victor Woeltjen
a937a3193b [Windowing] Show title of navigated object
Show title of navigated object in window, WTD-1200.
2015-05-20 09:57:04 -07:00
Victor Woeltjen
4c720d97b7 [Licenses] Add server-side licenses
WTD-1051.
2015-05-13 16:47:13 -07:00
Victor Woeltjen
2ca789e36a [Licenses] Remove license ref from dialog
WTD-1051.
2015-05-13 16:44:57 -07:00
Victor Woeltjen
10863514cb [Licenses] Add license headers
WTD-1051.
2015-05-13 16:43:30 -07:00
Victor Woeltjen
118d8481fb [Licenses] Update copyright years
WTD-1051.
2015-05-13 15:58:22 -07:00
Victor Woeltjen
c7b13b70d1 [Inspection] Begin decomposing bubble template
WTD-884.
2015-05-11 10:02:37 -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
ec2d5892a5 [Frontend] Markup for info bubble
WTD-1054
Temp object to allow work on markup for info bubble
2015-04-28 16:08:33 -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
Victor Woeltjen
0242961e5a Merge remote-tracking branch 'nasa/open1036' into open1123 2015-04-17 17:02:20 -07:00
Charles Hacskaylo
06a887a96e [Content/Dev] Licenses generator and content
WTD-1036
Added file to gen LICENSES.md content;
Added LICENSES.md file to repo
2015-04-16 15:16:00 -07:00
Charles Hacskaylo
b4cabbb4af [Frontend] Added dynamic plurality to "author" field label
WTD-1036
If licenses/author node in *bundle.json includes a comma,
display authors instead of author as the label
2015-04-15 17:46:11 -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
Victor Woeltjen
db57444738 [Containment] Update specs for coverage
Update existing specs for code coverage after changes for
WTD-962, composition policy.
2015-04-10 18:00:13 -07:00
Victor Woeltjen
3e972650c7 [Containment] Test LinkAction
Add test cases for LinkAction, added to allow composition
changes to be controlled by policy. WTD-962.
2015-04-10 17:37:11 -07:00
Victor Woeltjen
f6df73c11b Merge branch 'open-master' into open962
Merge in latest from open-master into topic branch
for WTD-962
2015-04-10 17:30:03 -07:00
Victor Woeltjen
79f6e8c082 Merge branch 'open1062' into open-master
Merge changes for WTD-1062
2015-04-08 12:48:49 -07:00
Victor Woeltjen
3707a68ea1 Merge branch 'open1071' into open-master
Merge changes for WTD-1071
2015-04-08 12:38:17 -07:00
Victor Woeltjen
cc0a46d5cc [Containment] Set validity in locator
Set validity of selected location from locator control, to
disallow creation when no valid location is selected (which
is possible due to containment rules.) WTD-962.
2015-04-07 22:30:21 -07:00
Victor Woeltjen
0550e09344 [Containment] Enforce containment rules in locator
Enforce containment rules in locator; WTD-962.
2015-04-07 22:21:37 -07:00
Charles Hacskaylo
29b63504eb [Frontend] New and updated styles for values view
WTD-938
2015-04-07 20:52:49 -07:00
Victor Woeltjen
44eb54884b [Containment] Fire a link action on drop
Fire a link action as the result of a drag-drop operation,
WTD-962.
2015-04-07 20:35:54 -07:00
Victor Woeltjen
5045795a7c [Containment] Expose Link action as compose
Expose 'link' as 'compose'; this facilitates implementation of
drag-drop composition being deferred to actions which will
support move/copy/link options in the future. WTD-962.
2015-04-07 20:24:15 -07:00
Victor Woeltjen
5adcd3cd6d [Containment] Implement Link
Implement link as a basic action, to separate it out from
drop gesture such that it can be controlled by policy. For
WTD-962.
2015-04-07 20:20:56 -07:00
Victor Woeltjen
874f81010c [Edit] Update EditController spec
Update tests for EditController to match updated
usage of domain object API for WTD-1071.
2015-04-06 09:30:42 -07:00
Victor Woeltjen
8b6a972fa4 [Edit] Avoid double-wrapping
Avoid double-wrapping editable domain objects, WTD-1071.
2015-04-06 09:30:14 -07:00
Victor Woeltjen
60ed17e32b [Edit] Add test case for double-wrapping
Add test case to detect double-wrapping of domain objects
retrieved via the editable domain object cache, identified
as the root cause of WTD-1071.
2015-04-06 09:28:53 -07:00
Victor Woeltjen
3c3dd0ad17 Merge branch 'open1035' into open-master
Merge WTD-1035; resolving conflicts to avoid WTD-1069

Conflicts:
	platform/commonUI/edit/src/controllers/EditController.js
	platform/commonUI/edit/src/objects/EditableDomainObjectCache.js
2015-04-06 08:32:54 -07:00
Victor Woeltjen
58d66871c1 Merge branch 'open1033' into open-master 2015-04-06 08:20:02 -07:00
Victor Woeltjen
9be40d6d2a [Edit] Fill in tests for Edit policies
Complete tests for policies for Edit actions, WTD-1062.
2015-04-01 16:21:06 -07:00
Victor Woeltjen
e2c6db8259 [Edit] Stub in specs for Edit policies
Stub in specs for policies added for Edit mode which control
the availability of the Edit and/or Edit Properties actions
in the view-control area, WTD-1062.
2015-04-01 16:08:15 -07:00
Victor Woeltjen
0ceb8d30cf [Edit] Expose EditableViewPolicy
Expose EditableViewPolicy as an active extension in Edit mode,
WTD-1062.
2015-04-01 16:00:20 -07:00
Victor Woeltjen
facf350648 [Edit] Add policy to restrict views in Edit mode
Add policy to disallow views in Edit mode which have been
explicitly flagged as non-editable, WTD-1062.
2015-04-01 15:50:15 -07:00