c85cec0445
Merge remote-tracking branch 'upstream/master' into mobile_ins
2015-09-01 14:51:05 -07:00
01f2fab70f
[Create] Filter out control-less properties
...
When properties have no control defined, don't show them
in the create dialog (but do show them in metadata, e.g.
info bubble.) For nasa/openmctweb#92
2015-09-01 11:48:15 -07:00
b39753d0a6
[Entanglement] Separate out location
...
Separate out location property from the CreationService,
instead handle in the entanglement bundle; this is
consistent with changes for identity management (attaching
a creator to newly-created domain object models).
for nasa/openmctweb#92
2015-09-01 10:57:56 -07:00
e3eda5112c
[Identity] Expose creation service as provider
...
Expose creation service as a provider of a composite service;
this allows it to be decorated by the identity bundle to
attach a creator, for nasa/openmct#92
2015-09-01 10:41:27 -07:00
e193223a37
[Mobile] Browse Cleaned
...
Cleaned up the browse.html
file to remove the excess inspector comments
and helper comments regarding individual
objects.
2015-08-31 14:14:05 -07:00
cb5429979a
[Mobile] layout adjustment
...
Currently mobile css transition does
not work on phone portrait. Added
some not reached css classes used in old
slide menu.
2015-08-31 14:13:14 -07:00
46deabafee
Merge branch 'mobile' into mobile_ins
2015-08-31 13:43:45 -07:00
021d105fd0
Merge remote-tracking branch 'upstream/open95' into mobile
2015-08-31 13:37:43 -07:00
7ffbc9ad2f
[Remove Action] Check
...
Added check for traverseObject
context because prior to this,
was not checked.
2015-08-31 13:37:22 -07:00
90f62b92a5
[Frontend] Super-minor cleanups in .scss files
...
open #93
2015-08-31 12:54:52 -07:00
5a991076ea
[Frontend] CSS and markup tweaks to enable flex layout
...
open #93
Layout frame and imagery markup modified;
2015-08-31 12:34:34 -07:00
78e8c15281
[Mobile] Tests
...
Removed treeSlide from the
browse controller test.
2015-08-28 14:18:49 -07:00
1f9728d29c
[Mobile] Tests
...
BrowseObjectControllerSpec adjusted
to have a mockAgenstService. Test
completed.
2015-08-28 14:07:46 -07:00
08794346c8
[Mobile] Browse Object
...
Added comments and removed unnecessary
commented out code.
2015-08-28 13:56:48 -07:00
00f71d3882
[Mobile] Browse Object
...
By default, on opening the page in a
mobile device will have the tree menu closed.
Also simplified the if statement to a ternary
operation.
2015-08-28 13:55:09 -07:00
4cb01eb917
[Mobile] Browse Object
...
Added agentService to BrowseObjectController.
2015-08-28 13:53:53 -07:00
8e6505c80f
[Mobile] Phone Portrait Close
...
Used merged function to close the
left tree on selection of an object
on phone portrait.
2015-08-28 13:38:29 -07:00
0521b09bec
[Mobile] Merge
...
Added comments to _layout.scss
2015-08-28 13:17:17 -07:00
2b7a4d40eb
[Mobile] Merge
...
Moved some of css 'sanding' over
to merged in slide menu. Also adjusted with
to be same as old show/hide tree dimensions.
2015-08-28 12:48:41 -07:00
43523046da
[Mobile] Merge3
...
Set the placement of hamburger button as before
however moved it into browse.html and tied to
slide pane model.
2015-08-28 11:46:21 -07:00
d8e9b0e8e8
[Mobile] Merge2
...
Hamburger button used to perform slide
temporarily, also it has a different location
on mobile/desktop & different widths. Splitter is
working as intended on desktop.
2015-08-28 11:10:02 -07:00
2a288cd740
[Mobile] Merge 1
...
Part 1 of merge, sliding menu not
working, however right representation
works and the left tree is expanded.
2015-08-28 10:38:45 -07:00
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
683b3f7511
Merge remote-tracking branch 'github/mobile' into open74-m-master
2015-08-27 12:56:47 -07:00
510e7d1261
[Mobile] Merge
...
Merged with master, getting the
RemoveAction changes.
2015-08-27 12:15:48 -07:00
80a91970f6
Merge remote-tracking branch 'github/mobile' into open74-m-mobile
2015-08-27 11:34:14 -07:00
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
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
1961adf8d6
[Mobile] Fixed font-size and line-height problem in tree
...
open #74
2015-08-27 10:33:32 -07:00
5230bdfc6b
Merge pull request #86 from nasa/open51
...
Addresses nasa/openmct#51
2015-08-27 10:02:24 -07:00
687d86790e
[Action] RemoveAction
...
Added comments regarding change in
checking of traversed objects.
2015-08-27 09:49:26 -07:00
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
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
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
67cb5f8077
[Mobile] Tests
...
Completed test for the BrowseController
Spec that takes in an undefined context.
2015-08-26 21:08:33 -07:00
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
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
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
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
1cbca41c53
Merge remote-tracking branch 'github/mobile' into open74-merge-mobile
2015-08-26 16:55:15 -07:00
a27083c28c
[Mobile] IN PROGRESS: tweaked padding in form-row
...
open #74
2015-08-26 16:54:13 -07:00
def5e17bb8
[Mobile] Merge
...
Merged open73 into mobile. Search bar is currently
covering the create button slightly.
2015-08-26 14:07:52 -07:00
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
b8b9721ddc
[Mobile] IN PROGRESS: Hide name in view-switcher in mobile
...
open #74
2015-08-26 13:04:09 -07:00
c0201f04c0
[Inspector] Splitter undefined checking
...
Added undefined checking in case the splitter
has no associated element with a 'slide'
class. #73 .
2015-08-26 12:55:26 -07:00
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
7a69bffb4a
[Inspector] Add test
...
Added a test to the browse object controller to
regain 100% coverage. Tests initilization of
ngModel properties. #73 .
2015-08-26 10:51:34 -07:00
9a3009f327
[Mobile] IN PROGRESS: Styling on Create menu
...
open #74
2015-08-26 10:50:14 -07:00
05fb7173aa
[Inpsector] Inspector icon
...
Change from gear to info icon. #73 .
2015-08-26 10:44:11 -07:00
57d1876dd8
[Inspector] Fix inspector pane transition
...
Changed the pane transition so that on
pane open the inspector becomes invisible
after the pane starts opening. #73 .
2015-08-26 10:43:03 -07:00