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,847 Commits 989 Branches 212 Tags 191 MiB
4e9348cb28
Commit Graph

641 Commits

Author SHA1 Message Date
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
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
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
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
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
79529e4879 [Treeview] Open in new tab settings 
When an object is opened in a new tab, the left
pane will be closed by default. Otherwise it will
be open by default. #72.
 2015-08-20 13:14:57 -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
4b3ca316e1 [Treeview] Update tests 
For the existence of ngModel
 2015-08-20 11:50:44 -07:00
slhale
3f7b874b38 [Treeview] Remove console.log 2015-08-20 11:47:16 -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
29b1cfa890 [Treeview] Rename variable for clarity 
paneModel's pane to leftPane, for clarity
once a right pane is added.
 2015-08-19 16:47:12 -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
slhale
4a730f875f [Treeview] Clicking toggles model property 
Clicking on the pane tab icon toggles ngModel.pane
 2015-08-19 16:29:55 -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
8108a3b81c [Treeview] Html style 2015-08-19 16:02:49 -07:00
slhale
b8958edf72 [Treeview] Fixing errors, commits 2015-08-19 16:00:51 -07:00
slhale
2b00b71da9 [Treeview] Error fixing 
Trying to get mctSplitter error to be fixed.
Reverting to an extent.
 2015-08-19 15:45:17 -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
ffd80ed42b [Treeview] Style 
Changed indentation in the html
 2015-08-19 13:12:37 -07:00
slhale
8dad6a3fd5 Merge browse files from branch 'mobile' into open72 2015-08-19 13:04:11 -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
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
Charles Hacskaylo
e426e0e5ec Merging in latest from master 
#70
 2015-08-18 15:23:42 -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
slhale
e159b7a15d [Search] mct-control textfield breaks focus 
Set up bundle.json so that the search bar could
be a mct-control, but left the control itself
commented out because then CSS styling would not
work due to lack of access to parent elements.
 2015-08-17 11:47:40 -07:00
Victor Woeltjen
bf417a14e0 Merge remote-tracking branch 'origin/open-master' into open1482c 
Merge latest into topic branch for WTD-1482
 2015-08-17 11:01:39 -07:00
slhale
7b4934ec55 [Search] Shorter menu transition 2015-08-17 10:33:26 -07:00
slhale
5e3caf6252 [Search] Shorter menu transition 2015-08-14 16:35:14 -07:00
slhale
31337eaf4f [Search] Text clear size & hover 
The search bar clear button now gets
highlighted when hovered over, and the
click area is slightly larger.
 2015-08-14 15:38:02 -07:00
slhale
0f6287e715 [Search] Fix overflow 
Fixed the text positioning in the filter
options display so that the text does not
overflow the bottom.
 2015-08-14 15:22:53 -07:00
slhale
0cfd881510 [Search] Menu transition and highlights 
The search menu fades in and out when open
and closed. Hovering over 'ALL' in the
menu now highlights it.
 2015-08-14 15:05:54 -07:00
slhale
cc05c50769 [Search] Smaller checkbox size 
in the search menu.
 2015-08-14 14:11:26 -07:00
slhale
d6d16f8f1c [Search] Font and spacing 
Use em for filter options positioning. Cursor
as pointer for menu. Results list padding fix.
 2015-08-14 11:58:32 -07:00
slhale
bcea3832ed [Search] Search menu & display tweaks 
Clicking on names of options in the search
menu will now toggle the checkboxes. The
filter options display now says when no
filters are selected. Slightly moved the
search menu to the left.
 2015-08-14 11:06:40 -07:00
slhale
94662cb904 [Search] Search filter options display style 
Created a box around the options display.
 2015-08-14 10:52:03 -07:00