alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/master' into open181

Browse Source 
Conflicts:
	platform/commonUI/general/res/templates/controls/time-controller.html
This commit is contained in:
Victor Woeltjen
2015-10-21 14:40:42 -07:00
parent 07818b0a6d fb0ce1eca8
commit 608800ae63
32 changed files with 1295 additions and 731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/commonUI/general/res/templates/controls/time-controller.html
View File

@@ -19,16 +19,14 @@
this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information.
-->
<!-- MINE -->
<div class="l-time-controller" ng-controller="TimeRangeController">
<div ng-controller="TimeRangeController">
<div class="l-time-range-inputs-holder">
<span class="l-time-range-inputs-elem ui-symbol type-icon">&#x43;</span>
<span class="l-time-range-input" ng-controller="ToggleController as t1">
<!--<span class="lbl">Start</span>-->
<span class="s-btn time-range-start">
<input type="text" ng-model="boundsModel.start"></input>
<a class="ui-symbol icon icon-calendar" ng-click="t1.toggle()">
</a>
<a class="ui-symbol icon icon-calendar" ng-click="t1.toggle()"></a>
<mct-popup ng-if="t1.isActive()">
<div mct-click-elsewhere="t1.setState(false)">
<mct-control key="'datetime-picker'"