ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-05-13 14:03:21 +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

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

@ -8,69 +8,78 @@
</div> </div>
<div class="flex-elem holder grows l-flex-col l-time-conductor-inner"> <div class="flex-elem holder grows l-flex-col l-time-conductor-inner">
<!-- Holds inputs and ticks --> <!-- Holds inputs and ticks -->
<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-input-w start-date"> <span class="l-time-range-w start-w">
<mct-control key="'datetime-field'" <span class="l-time-range-input-w start-date">
structure="{ <mct-control key="'datetime-field'"
format: 'utc', structure="{
validate: tcController.validateStart format: 'utc',
}" validate: tcController.validateStart
ng-model="formModel" }"
ng-mouseup="tcController.changing['start'] = true" ng-model="formModel"
ng-blur="tcController.changing['start'] = false; tcController.updateBoundsFromForm(formModel)" ng-mouseup="tcController.changing['start'] = true"
field="'start'" ng-blur="tcController.changing['start'] = false; tcController.updateBoundsFromForm(formModel)"
class="time-range-start"> field="'start'"
</mct-control> class="time-range-input">
</span> </mct-control>
<span class="l-time-range-input-w start-delta" </span>
ng-class="{'hide':(modeModel.selected === 'fixed')}"> <span class="l-time-range-input-w time-delta start-delta"
<mct-control key="'datetime-field'" ng-class="{'hide':(modeModel.selected === 'fixed')}">
structure="{ -
format: 'duration', <mct-control key="'datetime-field'"
validate: tcController.validateStartDelta structure="{
}" format: 'duration',
ng-model="formModel" validate: tcController.validateStartDelta
ng-mouseup="tcController.changing['startDelta'] = true" }"
ng-blur="tcController.changing['startDelta'] = false; tcController.updateDeltasFromForm(formModel)" ng-model="formModel"
field="'startDelta'" ng-mouseup="tcController.changing['startDelta'] = true"
class="time-delta-start"> ng-blur="tcController.changing['startDelta'] = false; tcController.updateDeltasFromForm(formModel)"
</mct-control> field="'startDelta'"
</span> class="hrs-min-input">
<span class="l-time-range-input-w end-delta" </mct-control>
ng-class="{'hide':(modeModel.selected === 'fixed')}"> </span>
<mct-control key="'datetime-field'" </span>
structure="{
format: 'duration',
validate: tcController.validateEndDelta <span class="l-time-range-w end-w">
}" <span class="l-time-range-input-w time-delta end-delta"
ng-model="formModel" ng-class="{'hide':(modeModel.selected === 'fixed')}">
ng-mouseup="tcController.changing['endDelta'] = true" +
ng-blur="tcController.changing['endDelta'] = false; tcController.updateDeltasFromForm(formModel)" <mct-control key="'datetime-field'"
field="'endDelta'" structure="{
class="time-delta-end"> format: 'duration',
</mct-control> validate: tcController.validateEndDelta
</span> }"
<span class="l-time-range-input-w end-date" ng-model="formModel"
ng-controller="ToggleController as t2"> ng-mouseup="tcController.changing['endDelta'] = true"
<mct-control key="'datetime-field'" ng-blur="tcController.changing['endDelta'] = false; tcController.updateDeltasFromForm(formModel)"
structure="{ field="'endDelta'"
format: 'utc', class="hrs-min-input">
validate: tcController.validateEnd </mct-control>
}" </span>
ng-model="formModel" <span class="l-time-range-input-w end-date"
ng-mouseup="tcController.changing['end'] = true" ng-controller="ToggleController as t2">
ng-blur="tcController.changing['end'] = false; tcController.updateBoundsFromForm(formModel)" <mct-control key="'datetime-field'"
field="'end'" structure="{
class="time-range-end"> format: 'utc',
</mct-control> validate: tcController.validateEnd
</span> }"
<input type="submit" class="hidden"> ng-model="formModel"
</form> ng-mouseup="tcController.changing['end'] = true"
<mct-conductor-axis></mct-conductor-axis> ng-blur="tcController.changing['end'] = false; tcController.updateBoundsFromForm(formModel)"
</div> field="'end'"
class="time-range-input">
</mct-control>
</span>
</span>
<input type="submit" class="hidden">
</form>
<mct-conductor-axis></mct-conductor-axis>
</div>
<!-- Holds data availability, time of interest --> <!-- Holds data availability, time of interest -->
<div class="l-data-visualization l-row-elem l-flex-row flex-elem"></div> <div class="l-data-visualization l-row-elem l-flex-row flex-elem"></div>