ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-05-13 22:13:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge open933 latest, resolve conflicts

Browse Source 
Fixes #933
Fair amount of manual fixing in time-conductor.html
This commit is contained in:
Charles Hacskaylo 2016-07-13 19:16:27 -07:00
parent 8214c8e895
commit e193e3dfba
1 changed files with 72 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
platform/features/conductor-v2/res/templates/time-conductor.html
View File

@ -12,6 +12,7 @@
<div class="l-time-conductor-ticks l-row-elem l-flex-row flex-elem no-margin"> <div class="l-time-conductor-ticks l-row-elem l-flex-row flex-elem no-margin">
<form class="abs l-time-conductor-inputs-holder" <form class="abs l-time-conductor-inputs-holder"
ng-submit="tcController.updateBoundsFromForm(formModel)"> ng-submit="tcController.updateBoundsFromForm(formModel)">
<span class="l-time-range-w start-w">
<span class="l-time-range-input-w start-date"> <span class="l-time-range-input-w start-date">
<mct-control key="'datetime-field'" <mct-control key="'datetime-field'"
structure="{ structure="{
@ -22,11 +23,12 @@
ng-mouseup="tcController.changing['start'] = true" ng-mouseup="tcController.changing['start'] = true"
ng-blur="tcController.changing['start'] = false; tcController.updateBoundsFromForm(formModel)" ng-blur="tcController.changing['start'] = false; tcController.updateBoundsFromForm(formModel)"
field="'start'" field="'start'"
class="time-range-start"> class="time-range-input">
</mct-control> </mct-control>
</span> </span>
<span class="l-time-range-input-w start-delta" <span class="l-time-range-input-w time-delta start-delta"
ng-class="{'hide':(modeModel.selected === 'fixed')}"> ng-class="{'hide':(modeModel.selected === 'fixed')}">
-
<mct-control key="'datetime-field'" <mct-control key="'datetime-field'"
structure="{ structure="{
format: 'duration', format: 'duration',
@ -36,11 +38,16 @@
ng-mouseup="tcController.changing['startDelta'] = true" ng-mouseup="tcController.changing['startDelta'] = true"
ng-blur="tcController.changing['startDelta'] = false; tcController.updateDeltasFromForm(formModel)" ng-blur="tcController.changing['startDelta'] = false; tcController.updateDeltasFromForm(formModel)"
field="'startDelta'" field="'startDelta'"
class="time-delta-start"> class="hrs-min-input">
</mct-control> </mct-control>
</span> </span>
<span class="l-time-range-input-w end-delta" </span>
<span class="l-time-range-w end-w">
<span class="l-time-range-input-w time-delta end-delta"
ng-class="{'hide':(modeModel.selected === 'fixed')}"> ng-class="{'hide':(modeModel.selected === 'fixed')}">
+
<mct-control key="'datetime-field'" <mct-control key="'datetime-field'"
structure="{ structure="{
format: 'duration', format: 'duration',
@ -50,7 +57,7 @@
ng-mouseup="tcController.changing['endDelta'] = true" ng-mouseup="tcController.changing['endDelta'] = true"
ng-blur="tcController.changing['endDelta'] = false; tcController.updateDeltasFromForm(formModel)" ng-blur="tcController.changing['endDelta'] = false; tcController.updateDeltasFromForm(formModel)"
field="'endDelta'" field="'endDelta'"
class="time-delta-end"> class="hrs-min-input">
</mct-control> </mct-control>
</span> </span>
<span class="l-time-range-input-w end-date" <span class="l-time-range-input-w end-date"
@ -64,9 +71,11 @@
ng-mouseup="tcController.changing['end'] = true" ng-mouseup="tcController.changing['end'] = true"
ng-blur="tcController.changing['end'] = false; tcController.updateBoundsFromForm(formModel)" ng-blur="tcController.changing['end'] = false; tcController.updateBoundsFromForm(formModel)"
field="'end'" field="'end'"
class="time-range-end"> class="time-range-input">
</mct-control> </mct-control>
</span> </span>
</span>
<input type="submit" class="hidden"> <input type="submit" class="hidden">
</form> </form>
<mct-conductor-axis></mct-conductor-axis> <mct-conductor-axis></mct-conductor-axis>