ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-03-14 16:26:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated modes

Browse Source
This commit is contained in:
Henry 2016-07-11 11:18:23 -07:00
parent 0017b77439
commit 11caa8396a
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/features/conductor-v2/res/templates/mode-selector/mode-menu.html
View File

@ -22,8 +22,8 @@
<div class="contents"> <div class="contents">
<div class="pane left menu-items"> <div class="pane left menu-items">
<ul> <ul>
<li ng-repeat="option in ngModel.options" <li ng-repeat="(selected, option) in ngModel.options"
ng-click="ngModel.selected=option.key"> ng-click="ngModel.selected=selected">
<a <a
ng-mouseover="representation.activeMetadata = option" ng-mouseover="representation.activeMetadata = option"
ng-mouseleave="representation.activeMetadata = undefined"> ng-mouseleave="representation.activeMetadata = undefined">

2
platform/features/conductor-v2/res/templates/mode-selector/mode-selector.html
View File

@ -39,7 +39,7 @@
<span ng-controller="ClickAwayController as modeController"> <span ng-controller="ClickAwayController as modeController">
<div class="s-menu-btn" <div class="s-menu-btn"
ng-click="modeController.toggle()"> ng-click="modeController.toggle()">
<span class="title-label">{{ngModel.selected}}</span> <span class="title-label">{{ngModel.options[ngModel.selected].label}}</span>
</div> </div>
<div class="menu super-menu mini mode-selector-menu" <div class="menu super-menu mini mode-selector-menu"
ng-show="modeController.isActive()"> ng-show="modeController.isActive()">

16
platform/features/conductor-v2/src/TimeConductorController.js
View File

@ -62,26 +62,26 @@ define(
$scope.modeModel = { $scope.modeModel = {
selected: 'fixed', selected: 'fixed',
options: [ options: {
{ 'fixed': {
key: 'fixed',
glyph: '\ue604', glyph: '\ue604',
label: 'Fixed',
name: 'Fixed Timespan Mode', name: 'Fixed Timespan Mode',
description: 'Query and explore data that falls between two fixed datetimes.' description: 'Query and explore data that falls between two fixed datetimes.'
}, },
{ 'realtime': {
key: 'realtime',
glyph: '\u0043', glyph: '\u0043',
label: 'Real-time',
name: 'Real-time Mode', name: 'Real-time Mode',
description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will automatically advance themselves based on a UTC clock.' description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will automatically advance themselves based on a UTC clock.'
}, },
{ 'latest': {
key: 'latest',
glyph: '\u0044', glyph: '\u0044',
label: 'Latest',
name: 'Latest Available Data Mode', name: 'Latest Available Data Mode',
description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will only advance when data becomes available.' description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will only advance when data becomes available.'
} }
] }
} }
} }