70324a2198
[Inspector] Separate primary and contextual locations
...
The object inspector now finds both the contextual
location of the link and the primary location of
the original, if the selected object is a link. #73 .
2015-08-24 15:49:57 -07:00
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
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
41198627c3
Merge branch 'master' of https://github.com/nasa/openmctweb into open72
...
Conflicts:
platform/commonUI/general/res/css/theme-espresso.css
2015-08-24 13:08:48 -07:00
454b96c3c9
Merge branch 'master' of https://github.com/nasa/openmctweb into open73
...
Conflicts:
platform/commonUI/general/res/css/theme-espresso.css
2015-08-24 13:06:44 -07:00
b8eaea5624
[Inspector] Add tests
...
Added tests for the object inspector controller.
Removed unused objectService dependency. #73 .
2015-08-24 13:01:38 -07:00
44ed4e0e0d
[Mobile] IN PROGRESS: Minor tweak for line-height in top-bar
...
open #74
2015-08-24 12:39:50 -07:00
d5062c74a2
[Inspector] Stlying tweak
...
Made titles taller so that they weren't
squished with the data.
2015-08-24 12:35:13 -07:00
d877ee3ce3
[Inspector] Use metadata capability
...
Instead of manually getting each entry for
the object inspector, just get the selected
object's metadata capability.
Still need to manually get the parents. #73 .
2015-08-24 12:32:31 -07:00
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
57e3c2554d
[Inspector] Pane tab button tweaks
...
Changed size and position slightly. Icon when
closed different.
2015-08-24 10:57:50 -07:00
67e57081f4
[Inspector] Right pane transition
...
Created the sliding transition for when the
object inspector pane opens or closes.
2015-08-24 10:47:14 -07:00
9eb23a62bc
Merge branch 'open75' into open-master
2015-08-24 10:42:19 -07:00
9b6a839c06
Merge branch 'open-jpl48' into open-master
2015-08-24 10:39:17 -07:00
7715acd4d4
[Inspector] Right pane opens and closes
...
Added collapser button to open and close
the right pane holding the object inspector.
2015-08-24 10:24:35 -07:00
e53c419e87
[Inspector] Add shadow to link icon
2015-08-24 09:38:35 -07:00
6e8dcc6ab8
[Inspector] Fix location label heights
...
Made it so that the last element of the location
does not get misaligned.
Also changed the element background highlighting
and arrow size.
2015-08-24 09:26:39 -07:00
039d692e4c
Forgot to add new .scss file
...
open #74
2015-08-21 15:10:19 -07:00
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
bbcb0e15c9
[Inspector] Location in tree
...
Added a 'location' section for the inspector panel. Its
elements are clickable labels. #73 .
2015-08-21 13:19:49 -07:00
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
7b5f07ae45
[Inspector] Inspector style
...
Added stlying to the inspector. Still need to find
proper icon. #73 .
2015-08-20 16:52:21 -07:00
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
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
3343475973
[Inspector] Add mct-object-inspector representation
...
Still having some styling issues though.
2015-08-20 16:01:08 -07:00
71207d643a
[Inspector] Left pane close works again
...
Moved ng-class up to a parent so that the
left position would be correct relative to
the left split overall. #73 .
2015-08-20 15:21:14 -07:00
d9a65a1844
[Inspector] Add right pane
...
Added a right pane to the page. This was done by
putting an mct-split-pane nested inside of the
existsing mct-split-pane. #73 .
2015-08-20 15:11:16 -07:00
32c7cc2424
[Treeview] Cleanup order
...
Rearrange the sass so that classes appear in the
order that they appear in browse.html, with
correct nesting as well.
No changes to the actual UI from this.
2015-08-20 14:51:32 -07:00
dcfcfa74bb
Merge branch 'master' of https://github.com/nasa/openmctweb into open72
...
Conflicts:
platform/commonUI/general/res/css/theme-espresso.css
2015-08-20 13:25:39 -07:00
503c8e2f03
[Treeview] Collapse button styling
...
Changed color to better match topbar buttons.
Icon changes direction when pane is open vs
closed.
2015-08-20 13:02:40 -07:00
570e0f31b2
[Treeview] Rename layout to pane
...
To better reflect what the file is modifying
2015-08-20 12:05:48 -07:00
83c86c748c
[Treeview] Remove unnecissary file
...
_splitter.scss merged into _layout.scss, within the
tree folder
2015-08-20 11:59:03 -07:00
ed96889fce
[Treeview] Fix splitter bar movement
...
Fixed the splitter bar so that it is now
draggable again.
2015-08-20 11:25:11 -07:00
d2bc8227c7
[Treeview] Create button and slide transition
...
Made the create button visible when the left
pane is closed. Added a transition between
opening and closing the pane.
2015-08-20 10:41:30 -07:00
b1e1e85bbd
Merging in latest openmctweb master
...
open74
Had to resolve conflicts
2015-08-20 10:36:41 -07:00
81ece1190e
[Treeview] Collapse button styling
...
Made smaller, with flat left side.
2015-08-20 09:19:09 -07:00
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
62f7ca5a0a
[Treeview] Treeview collapse toggle
...
Clicking on the pane tab now toggles the
treeview.
2015-08-19 16:57:11 -07:00
e44e50823e
[Treeview] Treeview collapse
...
Clicking on the pane tab now will make the treeview
invisible, and set the width to 0. BUT, this does
not immediately move the splitter bar, though it
does go to the correct width if clicked.
Needs more work.
2015-08-19 16:44:42 -07:00
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
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
b8958edf72
[Treeview] Fixing errors, commits
2015-08-19 16:00:51 -07:00
9c912b62d3
[Treeview] Modified left splitter
...
Added a 'button' (which does not work yet). It
sticks out of the splitter like a tab.
2015-08-19 15:08:27 -07:00
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
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
8dad6a3fd5
Merge browse files from branch 'mobile' into open72
2015-08-19 13:04:11 -07:00
c4dd4f5c45
[Mobile] Merge
...
Merged with master.
2015-08-19 11:01:58 -07:00
7f65ba236c
[Frontend] Tweaks to Load More results button
...
#70
2015-08-19 09:44:23 -07:00
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
e426e0e5ec
Merging in latest from master
...
#70
2015-08-18 15:23:42 -07:00
