Commit Graph

1886 Commits

Author SHA1 Message Date
Victor Woeltjen
f40e7d7105 [Identity] Add identity indicator
nasa/openmctweb#92
2015-08-28 16:36:41 -07:00
Victor Woeltjen
a8fc5ee8ed [Identity] Add license headers 2015-08-28 15:49:30 -07:00
Victor Woeltjen
29c9b2a08f [Identity] Add identity aggregator
Add an aggregator to handle exposing the user's identity,
nasa/openmctweb#92
2015-08-28 15:46:15 -07:00
Victor Woeltjen
e4d136d345 [Persistence] Update spec
Update spec for persistence capability to reflect changes for
nasa/openmctweb#92
2015-08-28 15:46:06 -07:00
Victor Woeltjen
620c0415cf [Persistence] Use create from persistence capability
...when an object hasn't been previously persisted. This allows
for compatibility with persistence services which disallow
updates for nonexistent objects (which is not abnomal behavior.)
nasa/openmctweb#92
2015-08-28 15:45:48 -07:00
Charles Hacskaylo
54bf39344a [Mobile] Multiple mobile Safari fixes
open #74
New mixins to prefix '-webkit-' to props and vals;
'flex' classes use new webkit mixins;
Fixed flex layout of .object-browse-bar and
.context-available element;
Migrated CSS to remove small .scss include files;
2015-08-27 17:05:50 -07:00
Charles Hacskaylo
683b3f7511 Merge remote-tracking branch 'github/mobile' into open74-m-master 2015-08-27 12:56:47 -07:00
Shivam Dave
510e7d1261 [Mobile] Merge
Merged with master, getting the
RemoveAction changes.
2015-08-27 12:15:48 -07:00
Shivam Dave
63b41d796a [Mobile] Clean Up
Cleaned up context menu gesture
comments with spacing.
2015-08-27 12:06:25 -07:00
Charles Hacskaylo
80a91970f6 Merge remote-tracking branch 'github/mobile' into open74-m-mobile 2015-08-27 11:34:14 -07:00
Shivam Dave
f0c64b6b92 [Browse] Back Arrow
Refactored Back Arrow to work same as prior
commit, however with less if else statements.
Returns if not at root, otherwise root is set to
true.
2015-08-27 10:45:48 -07:00
Shivam Dave
48136c2265 [Context] Back Arrow
Checks the Back Arrow in both checkRoot and
navigateToParent, also checks grandparent in both.
This allows the back arrow to hide in search when
context is unavailable.
2015-08-27 10:42:11 -07:00
Charles Hacskaylo
1961adf8d6 [Mobile] Fixed font-size and line-height problem in tree
open #74
2015-08-27 10:33:32 -07:00
Victor Woeltjen
5230bdfc6b Merge pull request #86 from nasa/open51
Addresses nasa/openmct#51
2015-08-27 10:02:24 -07:00
Shivam Dave
687d86790e [Action] RemoveAction
Added comments regarding change in
checking of traversed objects.
2015-08-27 09:49:26 -07:00
Shivam Dave
3ec4cc099b [Action] RemoveAction
Adjusted unit tests for checking if
traverseObject is undefined. Also removed
unnecessary ROOT_ID variable.
2015-08-27 09:41:00 -07:00
Shivam Dave
dadbf3f6dc [Action] RemoveAction
Checks if the object exists, instead of
checking if the ROOT is specifically reached,
when traversing up to ancestors.
2015-08-27 09:17:11 -07:00
Shivam Dave
c4c4c42415 [Elastic] Elastic Bundle
Elasticsearch bundle.json reverted back to
original.
2015-08-27 09:11:20 -07:00
Shivam Dave
8c4c65241a [Mobile] Tree
WHen selecting a leaf node on phone-portrait,
now the left menu will close if you select the
object name or the arrow.
2015-08-27 09:02:55 -07:00
Shivam Dave
67cb5f8077 [Mobile] Tests
Completed test for the BrowseController
Spec that takes in an undefined context.
2015-08-26 21:08:33 -07:00
Shivam Dave
bb2f086623 [Mobile] Leaf Node of Folder/Layout
Domainobjects that can hold an array of
domain objects return '[]' instead of
undefined, when checking for model.composition.
Now checks for empty array and navigates to layout/
folder that has no children.
2015-08-26 20:21:36 -07:00
Shivam Dave
a0169ad158 [Mobile] Browse Controller
Adjusted BrowseController to hide the
back button if current object represented/
selected has no context.
2015-08-26 20:20:16 -07:00
Charles Hacskaylo
6e172359b4 [Mobile] IN PROGRESS: Significant re-org of search results styling
open #74
Removed all styles for search-result-item
in search/_search.scss and significantly re-orged .tree-item in
_tree.scss and mobile/_tree.scss to control
search-result-item styles;
2015-08-26 18:15:29 -07:00
Charles Hacskaylo
d33678276c [Mobile] IN PROGRESS: Re-orgs after merge of Shivam's mobile branch
open #74
Re-applied changes to browse.html;
Added mobile/.../_search.scss;
Removed unused mobile/search/layout.scss;
Moved inclusion of search/_search.scss from tree.scss to main.scss;
2015-08-26 17:49:40 -07:00
Charles Hacskaylo
1cbca41c53 Merge remote-tracking branch 'github/mobile' into open74-merge-mobile 2015-08-26 16:55:15 -07:00
Charles Hacskaylo
a27083c28c [Mobile] IN PROGRESS: tweaked padding in form-row
open #74
2015-08-26 16:54:13 -07:00
Shivam Dave
def5e17bb8 [Mobile] Merge
Merged open73 into mobile. Search bar is currently
covering the create button slightly.
2015-08-26 14:07:52 -07:00
slhale
2cd1907b71 [Search] Temporarily hide link icons
Hide link icons in search results to temporarily
fix issue #84.
2015-08-26 13:40:28 -07:00
Charles Hacskaylo
b8b9721ddc [Mobile] IN PROGRESS: Hide name in view-switcher in mobile
open #74
2015-08-26 13:04:09 -07:00
Charles Hacskaylo
f80266b23f [Mobile] IN PROGRESS: Styling in forms, overlay and tree
open #74
.section-header and form-row styles changed in forms/_elems.scss;
significant changes to overlay in mobile: full-screen, close button, more;
tree hover bg changed to use rgba(#fff, 0.1);
removed "Hide title by default" in core/bundle.json;
2015-08-26 12:34:45 -07:00
Charles Hacskaylo
9a3009f327 [Mobile] IN PROGRESS: Styling on Create menu
open #74
2015-08-26 10:50:14 -07:00
Shivam Dave
2542255342 [Mobile] AgentService call
window referred to in TreeNodeController added as
keyword to skip in top comment.
2015-08-26 10:16:22 -07:00
Shivam Dave
e7563ff4e9 [Action] Merge
Merged with master.
2015-08-26 10:11:23 -07:00
Charles Hacskaylo
89bfa54563 [Mobile] IN PROGRESS: Misc layout tweaks; treeview pane styling
open #74
Treeview pane darkened;
Spacing in frame tweaked;
#content-area in right pane hidden
when treeview expanded for
phone portrait only;
Removed mobile-pane and
desktop-browse classes from markup;
2015-08-26 10:08:57 -07:00
Shivam Dave
a507557cec [Remove] Remove Action
Tweaked remove action to return
on finding the object that is being removed and
checking if it can be navigated to. Also completed
tests for RemoveAction.
2015-08-26 10:07:51 -07:00
Shivam Dave
793c99ac2f [Remove] Tests
RemoveActionSpec test complete, tests if
parent is object is removed. Also tests if
object not in object path is removed.
2015-08-26 10:02:16 -07:00
Charles Hacskaylo
39bd292886 [Mobile] IN PROGRESS: Overlay and form cleanups
open #74
Widths and layout strategy fixed for label and
controls in form when appearing in mobile;
Overlay margins adjusted;
Cleaned up font size, line-height in tree items;
2015-08-26 09:43:51 -07:00
Shivam Dave
e8bc9ecc1a [Search, Mobile] Merge
Merged search/master into mobile. Adjusted the
search bar to work on branch and fit accordingly.
2015-08-25 15:27:21 -07:00
Shivam Dave
0fa330adff [Mobile] Tests
Adjusted TreeNodeControllerSpec to
test setObject prototype.
2015-08-25 14:49:38 -07:00
Shivam Dave
9cd57614e4 [Mobile] AgentService & Tests
Adjusted the getOrientation of agentService to
inject the window instead of calling for it in
agentService. Also adjusted treeNodeController
for this. Added tests for the agentService's
getOrientation function.
2015-08-25 14:33:48 -07:00
Shivam Dave
d80c359a86 [Mobile] Tests
Fixed BrowseControllerSpec test
to account for new  call. Now
expects destroy and select-obj calls.
2015-08-25 14:20:36 -07:00
Charles Hacskaylo
07d0706cd1 [Mobile] IN PROGRESS:
open #74
Added name for "base" (unknown) type in core/bundle.json;
Fixes to grid-item .details element:
- ellipsize,
- type now displayed properly;
- number of items with correct plural syntax;
2015-08-25 14:17:34 -07:00
Charles Hacskaylo
fd5a911d50 [Mobile] IN PROGRESS: Fixed object-browse-bar flex
open #74
Also set left position of .object-browse-bar;
2015-08-25 13:51:02 -07:00
Charles Hacskaylo
c71f1fe447 [Mobile] IN PROGRESS: Significant refactor in mobile/_layout.scss
open #74
Made view-switcher visible when browsing via mobile;
Fixed class in browse.html markup from left-menu to left;
Moved object-browse-bar, top-bar classes from _controls into _layout;
Renamed and simplified menu widths in mobile _constants;
Really significant refactor of mobiles/_layout;
Tweaks in user-environ/_layout;
TO-DO: figure out why object-browse-bar flex styles not
working in mobile;
2015-08-25 13:34:37 -07:00
Shivam Dave
cd46dab5c1 [Mobile] Merge
Merged with master and resolved conflicts.
2015-08-25 12:36:50 -07:00
Charles Hacskaylo
e1858bf0ae [Mobile] IN PROGRESS: Moved position of view-switcher
open #74
view-switcher in object browse and edit moved to precede
action buttons, with margin;
Re-located CSS for .btn, etc. from _controls.scss to _layout.scss;
Cleaned up line-spacing in object-header in .frame;
2015-08-25 10:15:14 -07:00
Charles Hacskaylo
7542c6d49a [Mobile] IN PROGRESS: Cleanups on .btn for line-height, sizing, etc.
open #74
2015-08-25 09:41:38 -07:00
slhale
6571da922d [Search] Update style for link icons
Added styling to correctly position and color
link icons within the search resutls list.
2015-08-25 08:56:32 -07:00
Charles Hacskaylo
13b66cd215 [Mobile] IN PROGRESS: Only display custom scrollbars in desktop mode
open #74
2015-08-24 17:04:38 -07:00
Shivam Dave
aca06c6007 [Action] Remove Action Merged
Remove Action merged to allow removal of
parent or current selected object, then
navigation to lowest existing parent if
currently located in deleted object.
2015-08-24 16:46:48 -07:00
Charles Hacskaylo
5184e08a5b [Mobile] IN PROGRESS: Tweak to TypeImpl to return glyph for unknown types
open #74
Thanks Victor!;
2015-08-24 16:45:55 -07:00
Charles Hacskaylo
69c6d4bd26 [Mobile] IN PROGRESS: Tweaks to labels;
open #74
Cleaned up layout of bottom-bar;
Fixed class selector for ue-bottom-bar;
2015-08-24 16:31:38 -07:00
Shivam Dave
6a2bdd103b [Mobile] Hide Tree
On selecting a node in the tree, if the
user is on phone and in portrait, than
emit up to the browse controller to call
treeSlide(), which will hide the tree menu.
Also adjusted the agent service to properly
check for orientation using window.innerHeight/
Width. Also created function for the selection
of an object in BrowseController.
2015-08-24 16:17:58 -07:00
Charles Hacskaylo
76c4b96683 [Mobile] IN PROGRESS: Menu hide/show fixes; font-size tweaking
open #74
Changed .right-repr to use translateX in phone portrait mode;
font-size tweaking;
Refactored css organization in mobile/_layout.scss;
2015-08-24 15:24:35 -07:00
slhale
c81e2dbb4a Merge branch 'master' of https://github.com/nasa/openmctweb into search
Conflicts:
	platform/commonUI/general/src/controllers/TreeNodeController.js
	platform/persistence/elastic/src/ElasticSearchProvider.js
2015-08-24 13:14:43 -07:00
Charles Hacskaylo
44ed4e0e0d [Mobile] IN PROGRESS: Minor tweak for line-height in top-bar
open #74
2015-08-24 12:39:50 -07:00
Pete Richards
b860db302c [Framework] Bump angular to 1.4.4
Upgrade angular to latest version, also update angular-route.
2015-08-24 12:39:48 -07:00
Charles Hacskaylo
e96d3e3738 [Mobile] IN PROGRESS: Significant redo of object-header
open #74
Added .bar .l-flex using display: flex in object header;
2015-08-24 12:22:08 -07:00
Pete Richards
f1ca9ff15e Merge remote-tracking branch 'origin/open1334' into open1416 2015-08-24 11:55:27 -07:00
Pete Richards
9eb23a62bc Merge branch 'open75' into open-master 2015-08-24 10:42:19 -07:00
Pete Richards
9b6a839c06 Merge branch 'open-jpl48' into open-master 2015-08-24 10:39:17 -07:00
Victor Woeltjen
6aaa887e65 [Imagery] Start off with empty timestamp
Show nothing in the timestamp area when there is no
data yet available for image telemetry, WTD-1170.
2015-08-24 09:39:42 -07:00
Pete Richards
1e332da11b [Docs] ElasticSearch is not Couch 2015-08-24 09:04:03 -07:00
Pete Richards
3a050cc5b8 [Style] space after operator 2015-08-24 09:03:31 -07:00
Charles Hacskaylo
039d692e4c Forgot to add new .scss file
open #74
2015-08-21 15:10:19 -07:00
Charles Hacskaylo
ee608cc4a4 [Mobile] IN PROGRESS: General fixes, spurred by mobile, for object-header
open #74
Attempting to layout using flex - not working;
See http://jsfiddle.net/charlesh88/cpf9zjts/9/ for working example;
New _flex.scss added;
This commit is changed elements that are mostly solid;
2015-08-21 15:09:23 -07:00
Shivam Dave
d0183d44c9 [Actions] Remove Action
When an ascendant or parent or currently
selected object is removed the user is navigated
to the parent of the object being removed. Added variables
to RemoveAction test to test removing currently selected
domainObject.
2015-08-21 13:04:47 -07:00
Shivam Dave
a7cc06a28b Merge remote-tracking branch 'upstream/master' 2015-08-21 09:08:00 -07:00
Charles Hacskaylo
da8eb334e3 [Mobile] Sanding of mobile styles continues, in progress
open #74
CSS and markup changes for split pane holders;
drop shadow added to tree area;
Tree item cleanups;
This or earlier commit broke treeview nav action;
TO-DO: fix treeview nav action to hide menu;
2015-08-20 18:36:44 -07:00
Charles Hacskaylo
67592def90 [Mobile] Sanding of mobile styles, in progress
open #74
CSS and markup changes for mobile,
particularly on grid-item;
Mod to behavior in tree for mobile nav:
leaf node grid-item click now navs to item;
Fixed info-button to work properly with mod to
infoButtonGesture.js;
2015-08-20 16:11:45 -07:00
Charles Hacskaylo
3484b315cf [Mobile] Sanding of mobile styles, cherry-pick to master
open #74
CSS and markup changes for mobile
that are good for master now;
2015-08-20 16:09:35 -07:00
Charles Hacskaylo
b1e1e85bbd Merging in latest openmctweb master
open74
Had to resolve conflicts
2015-08-20 10:36:41 -07:00
Charles Hacskaylo
249a9b2eb2 [Frontend] Better sorting indicators added to styles
JPL #48
Simplified styles to indicate sort by asc and desc in table th elements;
(cherry picked from commit 15a2416)
2015-08-19 18:17:15 -07:00
Charles Hacskaylo
02abbdf4fe Resolving conflict in platform/.../theme-espresso.css
#75
Merged in master branch;
Re-rendered platform/.../theme-espresso.css;
2015-08-19 16:22:21 -07:00
Charles Hacskaylo
08d68f99a5 [Frontend] Fix word wrapping issues in hover bubble
#75
CSS modified to utilize word-break property;
2015-08-19 16:09:55 -07:00
Victor Woeltjen
f27e4d6e06 Merge branch 'open-master' into open1482c
Merge in latest in preparation to merge; WTD-1482

Conflicts:
	platform/commonUI/browse/src/creation/CreationService.js
	platform/core/src/models/RootModelProvider.js
	platform/entanglement/src/services/LinkService.js
	platform/entanglement/src/services/MoveService.js
2015-08-19 15:00:52 -07:00
Victor Woeltjen
a4a9acd2ea Merge branch 'open-master' into open-965
Merge in latest into topic branch for WTD-965 to
resolve conflicts.

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
2015-08-19 14:16:56 -07:00
Pete Richards
c118234bbf [Style] Brace after if criteria 2015-08-19 13:55:02 -07:00
Pete Richards
a94763041e [Move] correct logic and specification 2015-08-19 13:16:36 -07:00
Pete Richards
26892e7104 [Location] isLink/isOriginal are antonyms
Simplify implementation of isLink/isOriginal for better maintainability.
2015-08-19 11:49:45 -07:00
Pete Richards
5c74365f4b [Root] Root model provider sets location
Root model provider sets the location of roods so that the location
capability does not need special handling for this.
2015-08-19 11:49:03 -07:00
Pete Richards
94854e5965 [Location] can retrieve contextual location
Clarify naming of method for retrieving contextual location of a domain
object.

Default behavior for objects that do not have a context is to return
undefined.  Note that default behavior is not specified and could change
if needed.
2015-08-19 11:33:45 -07:00
Pete Richards
9cf30f4213 [Location] setPrimaryLocation takes location.
Rename "persistLocation" to be more clearly named, and make it take an
argument to allow for greater control outside the capability.
2015-08-19 11:25:41 -07:00
Pete Richards
eb776e69c0 [JSDoc] Document LocationCapability constructor 2015-08-19 11:13:24 -07:00
Shivam Dave
c4dd4f5c45 [Mobile] Merge
Merged with master.
2015-08-19 11:01:58 -07:00
slhale
432ec519b6 Merge branch 'search' into open70
Conflicts:
	platform/commonUI/browse/res/templates/browse.html
2015-08-19 10:05:38 -07:00
Charles Hacskaylo
7f65ba236c [Frontend] Tweaks to Load More results button
#70
2015-08-19 09:44:23 -07:00
Charles Hacskaylo
3a86f5e746 [Frontend] Tweak to Load More button label
#70
2015-08-18 19:54:50 -07:00
Charles Hacskaylo
4e3e3653a3 [Frontend] Styling for search elements
#70
Significant .scss and markup changes across search;
New symbols font (v2.2) char for clear icon;
To-do: style "load more" element;
2015-08-18 19:51:47 -07:00
slhale
d3ea67fbd9 [Search] Templates vs representations
Made the search and search-menu templates into
representations, to be more consistent.
2015-08-18 16:54:36 -07:00
slhale
9ebc04ef14 [Search] Cleanup and documentation 2015-08-18 16:08:16 -07:00
Charles Hacskaylo
e426e0e5ec Merging in latest from master
#70
2015-08-18 15:23:42 -07:00
slhale
3d1e1659c2 [Search] Update tests
for 100% coverage.
2015-08-18 12:37:47 -07:00
slhale
17f2bb966b [Search] Update tests and remove redundancy
Updated the generic provider test. Removed index
checking from the generic search worker, because
that checking is already done (more efficiently)
in the generic search provider.
2015-08-18 12:27:04 -07:00
slhale
a98b65286f [Search] Update tests
Updated the SearchController tests for more coverage,
due to additions to the controller. Fixed a small
logic error in controller.areMore()
2015-08-18 11:28:12 -07:00
slhale
17aa666519 [Search] Remove unnecsissary controller
Removed the SearchItemController, as the logic was simple
enough to be done in one line in the search item
representation html.
2015-08-18 10:19:20 -07:00
Victor Woeltjen
f6cf4c3215 [Code Style] Fix error in persistence
Fix typo in persistence provider for ElasticSearch related
to refactoring to use prototypes, WTD-1482.
2015-08-17 17:00:21 -07:00
Victor Woeltjen
86f0a9100f [Code Style] Fix merge error
Fix merge error in ContextMenuAction which caused
test failure. WTD-1482.
2015-08-17 16:57:46 -07:00
Charles Hacskaylo
f4b87cf70d [Project source] Updated icomoon.io symbols font project file 2015-08-17 15:47:28 -07:00
Charles Hacskaylo
366ec3d516 [Frontend] Styles for tabular views and view sections
Original issue: https://github.jpl.nasa.gov/MissionControl/vista/issues/30

New CSS and symbols to support tabular views;
Required by JPL branch vista30 (https://github.jpl.nasa.gov/MissionControl/vista/tree/vista30)
2015-08-17 15:11:27 -07:00