Merge pull request #6343 from PsiOmegaDelta/NanoUI

NanoUI - Button fix
This commit is contained in:
Mloc
2014-09-13 15:33:26 +01:00
3 changed files with 12 additions and 12 deletions
+2 -2
View File
@@ -40,8 +40,8 @@
{{:helper.link('Cycle to Interior', 'arrowthickstop-1-e', {'command' : 'cycle_int'}, data.processing ? 'disabled' : null)}}
</div>
<div class="itemContent" style="padding-top: 2px">
{{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, data.processing ? 'yellowBackground' : null)}}
{{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, data.processing ? 'yellowBackground' : null)}}
{{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, data.processing ? null : null)}}
{{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, data.processing ? null : null)}}
</div>
</div>
<div style="padding-left: 10px; width: 80px; float: left">
+5 -5
View File
@@ -11,7 +11,7 @@
<span class="bad" style="float:left">DOCKED-OVERRIDE ENABLED</span>
{{/if}}
<span style="float:right">
{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : null)}}
{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? null : null)}}
</span>
</div>
{{else data.docking_status == "docking"}}
@@ -22,7 +22,7 @@
<span class="bad" style="float:left">DOCKING-OVERRIDE ENABLED</span>
{{/if}}
<span style="float:right">
{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : null)}}
{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? null : null)}}
</span>
</div>
{{else data.docking_status == "undocking"}}
@@ -33,7 +33,7 @@
<span class="bad" style="float:left">UNDOCKING-OVERRIDE ENABLED</span>
{{/if}}
<span style="float:right">
{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : null)}}
{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? null : null)}}
</span>
</div>
{{else data.docking_status == "undocked"}}
@@ -44,12 +44,12 @@
<span class="bad" style="float:left">OVERRIDE ENABLED</span>
{{/if}}
<span style="float:right">
{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : null)}}
{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? null : null)}}
</span>
</div>
{{else}}
<span class="bad">ERROR</span>
{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? 'redBackground' : null)}}
{{:helper.link('Override', 'alert', {'command' : 'toggle_override'}, null, data.override_enabled ? null : null)}}
{{/if}}
</div>
</div>
+5 -5
View File
@@ -19,18 +19,18 @@
</div>
<div class="itemContent" style="padding-top: 2px; width: 100%">
{{if data.interior_status.state == "open"}}
{{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, 'redBackground')}}
{{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, null)}}
{{else}}
{{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, data.processing ? 'yellowBackground' : null)}}
{{:helper.link('Force exterior door', 'alert', {'command' : 'force_ext'}, null, data.processing ? null : null)}}
{{/if}}
{{if data.exterior_status.state == "open"}}
{{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, 'redBackground')}}
{{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, null)}}
{{else}}
{{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, data.processing ? 'yellowBackground' : null)}}
{{:helper.link('Force interior door', 'alert', {'command' : 'force_int'}, null, data.processing ? null : null)}}
{{/if}}
</div>
</div>
<div class="item" style="padding-top: 10px; width: 100%">
{{:helper.link('Abort', 'cancel', {'command' : 'abort'}, data.processing ? null : 'disabled', data.processing ? 'redBackground' : null)}}
{{:helper.link('Abort', 'cancel', {'command' : 'abort'}, data.processing ? null : 'disabled', data.processing ? null : null)}}
</div>
</div>