Skip to content

Commit e193e3d

Browse files
charlesh88charlesh88
committed
Merge open933 latest, resolve conflicts
Fixes #933 Fair amount of manual fixing in time-conductor.html
1 parent 8214c8e commit e193e3d

File tree

1 file changed

+72
-63
lines changed

1 file changed

+72
-63
lines changed

‎platform/features/conductor-v2/res/templates/time-conductor.html

+72-63
Original file line numberDiff line numberDiff line change
@@ -8,69 +8,78 @@
88
</div>
99

1010
<div class="flex-elem holder grows l-flex-col l-time-conductor-inner">
11-
<!-- Holds inputs and ticks -->
12-
<div class="l-time-conductor-ticks l-row-elem l-flex-row flex-elem no-margin">
13-
<form class="abs l-time-conductor-inputs-holder"
14-
ng-submit="tcController.updateBoundsFromForm(formModel)">
15-
<span class="l-time-range-input-w start-date">
16-
<mct-control key="'datetime-field'"
17-
structure="{
18-
format: 'utc',
19-
validate: tcController.validateStart
20-
}"
21-
ng-model="formModel"
22-
ng-mouseup="tcController.changing['start'] = true"
23-
ng-blur="tcController.changing['start'] = false; tcController.updateBoundsFromForm(formModel)"
24-
field="'start'"
25-
class="time-range-start">
26-
</mct-control>
27-
</span>
28-
<span class="l-time-range-input-w start-delta"
29-
ng-class="{'hide':(modeModel.selected === 'fixed')}">
30-
<mct-control key="'datetime-field'"
31-
structure="{
32-
format: 'duration',
33-
validate: tcController.validateStartDelta
34-
}"
35-
ng-model="formModel"
36-
ng-mouseup="tcController.changing['startDelta'] = true"
37-
ng-blur="tcController.changing['startDelta'] = false; tcController.updateDeltasFromForm(formModel)"
38-
field="'startDelta'"
39-
class="time-delta-start">
40-
</mct-control>
41-
</span>
42-
<span class="l-time-range-input-w end-delta"
43-
ng-class="{'hide':(modeModel.selected === 'fixed')}">
44-
<mct-control key="'datetime-field'"
45-
structure="{
46-
format: 'duration',
47-
validate: tcController.validateEndDelta
48-
}"
49-
ng-model="formModel"
50-
ng-mouseup="tcController.changing['endDelta'] = true"
51-
ng-blur="tcController.changing['endDelta'] = false; tcController.updateDeltasFromForm(formModel)"
52-
field="'endDelta'"
53-
class="time-delta-end">
54-
</mct-control>
55-
</span>
56-
<span class="l-time-range-input-w end-date"
57-
ng-controller="ToggleController as t2">
58-
<mct-control key="'datetime-field'"
59-
structure="{
60-
format: 'utc',
61-
validate: tcController.validateEnd
62-
}"
63-
ng-model="formModel"
64-
ng-mouseup="tcController.changing['end'] = true"
65-
ng-blur="tcController.changing['end'] = false; tcController.updateBoundsFromForm(formModel)"
66-
field="'end'"
67-
class="time-range-end">
68-
</mct-control>
69-
</span>
70-
<input type="submit" class="hidden">
71-
</form>
72-
<mct-conductor-axis></mct-conductor-axis>
73-
</div>
11+
<!-- Holds inputs and ticks -->
12+
<div class="l-time-conductor-ticks l-row-elem l-flex-row flex-elem no-margin">
13+
<form class="abs l-time-conductor-inputs-holder"
14+
ng-submit="tcController.updateBoundsFromForm(formModel)">
15+
<span class="l-time-range-w start-w">
16+
<span class="l-time-range-input-w start-date">
17+
<mct-control key="'datetime-field'"
18+
structure="{
19+
format: 'utc',
20+
validate: tcController.validateStart
21+
}"
22+
ng-model="formModel"
23+
ng-mouseup="tcController.changing['start'] = true"
24+
ng-blur="tcController.changing['start'] = false; tcController.updateBoundsFromForm(formModel)"
25+
field="'start'"
26+
class="time-range-input">
27+
</mct-control>
28+
</span>
29+
<span class="l-time-range-input-w time-delta start-delta"
30+
ng-class="{'hide':(modeModel.selected === 'fixed')}">
31+
-
32+
<mct-control key="'datetime-field'"
33+
structure="{
34+
format: 'duration',
35+
validate: tcController.validateStartDelta
36+
}"
37+
ng-model="formModel"
38+
ng-mouseup="tcController.changing['startDelta'] = true"
39+
ng-blur="tcController.changing['startDelta'] = false; tcController.updateDeltasFromForm(formModel)"
40+
field="'startDelta'"
41+
class="hrs-min-input">
42+
</mct-control>
43+
</span>
44+
</span>
45+
46+
47+
<span class="l-time-range-w end-w">
48+
<span class="l-time-range-input-w time-delta end-delta"
49+
ng-class="{'hide':(modeModel.selected === 'fixed')}">
50+
+
51+
<mct-control key="'datetime-field'"
52+
structure="{
53+
format: 'duration',
54+
validate: tcController.validateEndDelta
55+
}"
56+
ng-model="formModel"
57+
ng-mouseup="tcController.changing['endDelta'] = true"
58+
ng-blur="tcController.changing['endDelta'] = false; tcController.updateDeltasFromForm(formModel)"
59+
field="'endDelta'"
60+
class="hrs-min-input">
61+
</mct-control>
62+
</span>
63+
<span class="l-time-range-input-w end-date"
64+
ng-controller="ToggleController as t2">
65+
<mct-control key="'datetime-field'"
66+
structure="{
67+
format: 'utc',
68+
validate: tcController.validateEnd
69+
}"
70+
ng-model="formModel"
71+
ng-mouseup="tcController.changing['end'] = true"
72+
ng-blur="tcController.changing['end'] = false; tcController.updateBoundsFromForm(formModel)"
73+
field="'end'"
74+
class="time-range-input">
75+
</mct-control>
76+
</span>
77+
</span>
78+
79+
<input type="submit" class="hidden">
80+
</form>
81+
<mct-conductor-axis></mct-conductor-axis>
82+
</div>
7483

7584
<!-- Holds data availability, time of interest -->
7685
<div class="l-data-visualization l-row-elem l-flex-row flex-elem"></div>

0 commit comments

Comments
 (0)