ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-04-22 10:01:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,101 Commits 1,001 Branches 216 Tags
Commit Graph

2101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shivam Dave
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
Shivam Dave
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
Shivam Dave
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
Shivam Dave
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
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
Victor Woeltjen
97acf2012a Merge pull request #87 from nasa/open84 
[Search] Hide link icons in search results
 2015-08-27 10:00:34 -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
slhale
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
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
slhale
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
Charles Hacskaylo
9a3009f327 [Mobile] IN PROGRESS: Styling on Create menu 
open #74
 2015-08-26 10:50:14 -07:00
slhale
05fb7173aa [Inpsector] Inspector icon 
Change from gear to info icon. #73.
 2015-08-26 10:44:11 -07:00
slhale
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
slhale
7119f6f3a1 [Inspector] Splitter drag temporarily removes transition 
Dragging mct-splitter will remove a 'slide'
class from the splitter's sibling while a
drag is in process, and then replace the
'slide' class. This allows the left and right
panes to have slide transitions for open/close,
but not when the splitter is being dragged. #73.
 2015-08-26 10:23:18 -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
slhale
86d398d8ff [Inspector] Fix location label text 
Fixed the location object labels so that their
overflow text properly gets hidden, and so that
the direction arrows are aligned with the
labels. #73.
 2015-08-25 16:30:57 -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
slhale
5cc634e946 Merge branch 'open72' into open73 
Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
 2015-08-25 15:02:57 -07:00
slhale
7e837c266d Merge branch 'master' of https://github.com/nasa/openmctweb into open73 
Conflicts:
	platform/commonUI/browse/res/templates/browse.html
 2015-08-25 14:59:13 -07:00
slhale
cd204af71c [Treeview] Compatability with search 
Update to hide search bar when the pane is
closed. #72.
 2015-08-25 14:55:23 -07:00
slhale
4e9348cb28 Merge branch 'master' of https://github.com/nasa/openmctweb into open72 
Conflicts:
	platform/commonUI/browse/res/templates/browse.html
 2015-08-25 14:52:51 -07:00
Shivam Dave
0fa330adff [Mobile] Tests 
Adjusted TreeNodeControllerSpec to
test setObject prototype.
 2015-08-25 14:49:38 -07:00
Victor Woeltjen
509badb225 Merge pull request #55 from nasa/search 
[Search] Create search UI
 2015-08-25 14:41:19 -07:00