ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-01 10:56:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,870 Commits 989 Branches 212 Tags 191 MiB
5cc634e946
Commit Graph

385 Commits

Author SHA1 Message Date
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
slhale
c4de3505b9 [Inspector] Location horizontal overflow 
Modified location labels to have cut-off text
be indicated by ellipses when the inspection
pane width is small. #73.
 2015-08-25 14:30:42 -07:00
slhale
c3e5fbf713 [Inspector] Location does not include self 
Changed the object inspector's location getting
to not include the object itself in the
location, just its ancestors. #73.
 2015-08-25 13:06:15 -07:00
slhale
5080b5296e [Inspector] Consistent link and nonlink style 
Changed stlying on the labels for parent
lists to have more consistent styling
between the link and nonlink parents. #73.
 2015-08-25 11:14:41 -07:00
slhale
7a7cabedcc [Inspector] Add hovertext and scrolling 
Made the inspector capable of scrolling.
Added hovertext to the contextual and
primary location sections for some
clarification. #73.
 2015-08-25 10:18:31 -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
slhale
33d88ecce0 [Inspector] Update tests 
Updated the object inspector controller spec to test
for the different types of locations. #73.
 2015-08-24 16:16:15 -07:00
slhale
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
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
slhale
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
slhale
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
slhale
b8eaea5624 [Inspector] Add tests 
Added tests for the object inspector controller.
Removed unused objectService dependency. #73.
 2015-08-24 13:01:38 -07:00
slhale
d5062c74a2 [Inspector] Stlying tweak 
Made titles taller so that they weren't
squished with the data.
 2015-08-24 12:35:13 -07:00
slhale
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
slhale
57e3c2554d [Inspector] Pane tab button tweaks 
Changed size and position slightly. Icon when
closed different.
 2015-08-24 10:57:50 -07:00
slhale
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
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
slhale
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
slhale
e53c419e87 [Inspector] Add shadow to link icon 2015-08-24 09:38:35 -07:00
slhale
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
slhale
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
slhale
7b5f07ae45 [Inspector] Inspector style 
Added stlying to the inspector. Still need to find
proper icon. #73.
 2015-08-20 16:52:21 -07:00
slhale
3343475973 [Inspector] Add mct-object-inspector representation 
Still having some styling issues though.
 2015-08-20 16:01:08 -07:00
slhale
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
slhale
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
slhale
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
slhale
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
slhale
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
slhale
570e0f31b2 [Treeview] Rename layout to pane 
To better reflect what the file is modifying
 2015-08-20 12:05:48 -07:00
slhale
83c86c748c [Treeview] Remove unnecissary file 
_splitter.scss merged into _layout.scss, within the
tree folder
 2015-08-20 11:59:03 -07:00
slhale
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
slhale
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
slhale
81ece1190e [Treeview] Collapse button styling 
Made smaller, with flat left side.
 2015-08-20 09:19:09 -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
slhale
62f7ca5a0a [Treeview] Treeview collapse toggle 
Clicking on the pane tab now toggles the
treeview.
 2015-08-19 16:57:11 -07:00
slhale
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
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
slhale
b8958edf72 [Treeview] Fixing errors, commits 2015-08-19 16:00:51 -07:00
slhale
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
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
slhale
8dad6a3fd5 Merge browse files from branch 'mobile' into open72 2015-08-19 13:04:11 -07:00
Charles Hacskaylo
7f65ba236c [Frontend] Tweaks to Load More results button 
#70
 2015-08-19 09:44:23 -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
Charles Hacskaylo
e426e0e5ec Merging in latest from master 
#70
 2015-08-18 15:23:42 -07:00