ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-15 09:20:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,847 Commits 993 Branches 212 Tags 192 MiB
4e9348cb28
Commit Graph

1643 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
f1ca9ff15e Merge remote-tracking branch 'origin/open1334' into open1416 2015-08-24 11:55:27 -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
Victor Woeltjen
6aaa887e65 [Imagery] Start off with empty timestamp 
Show nothing in the timestamp area when there is no
data yet available for image telemetry, WTD-1170.
 2015-08-24 09:39:42 -07:00
Pete Richards
1e332da11b [Docs] ElasticSearch is not Couch 2015-08-24 09:04:03 -07:00
Pete Richards
3a050cc5b8 [Style] space after operator 2015-08-24 09:03:31 -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
Pete Richards
c118234bbf [Style] Brace after if criteria 2015-08-19 13:55:02 -07:00
Pete Richards
a94763041e [Move] correct logic and specification 2015-08-19 13:16:36 -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
Pete Richards
26892e7104 [Location] isLink/isOriginal are antonyms 
Simplify implementation of isLink/isOriginal for better maintainability.
 2015-08-19 11:49:45 -07:00
Pete Richards
5c74365f4b [Root] Root model provider sets location 
Root model provider sets the location of roods so that the location
capability does not need special handling for this.
 2015-08-19 11:49:03 -07:00
Pete Richards
94854e5965 [Location] can retrieve contextual location 
Clarify naming of method for retrieving contextual location of a domain
object.

Default behavior for objects that do not have a context is to return
undefined.  Note that default behavior is not specified and could change
if needed.
 2015-08-19 11:33:45 -07:00
Pete Richards
9cf30f4213 [Location] setPrimaryLocation takes location. 
Rename "persistLocation" to be more clearly named, and make it take an
argument to allow for greater control outside the capability.
 2015-08-19 11:25:41 -07:00
Pete Richards
eb776e69c0 [JSDoc] Document LocationCapability constructor 2015-08-19 11:13:24 -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
3a86f5e746 [Frontend] Tweak to Load More button label 
#70
 2015-08-18 19:54:50 -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
slhale
9ebc04ef14 [Search] Cleanup and documentation 2015-08-18 16:08:16 -07:00
Charles Hacskaylo
e426e0e5ec Merging in latest from master 
#70
 2015-08-18 15:23:42 -07:00