pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update controls-* to control-*

Browse source
This commit is contained in:
Paul de Vries 2015-10-28 15:32:31 +00:00
parent 4b0ef23f34
commit fba4648e37
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/octoprint/templates/tabs/control.jinja2
View file

@ -26,7 +26,7 @@
<div class="jog-panel" style="display: none;" data-bind="visible: loginState.isUser">
<!-- XY jogging control panel -->
<div id="controls-jog-xy" class="jog-panel">
<div id="control-jog-xy" class="jog-panel">
<h1>X/Y</h1>
<div>
<button id="control-yinc" class="btn box" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('y',1) }"><i class="icon-arrow-up"></i></button>
@ -41,7 +41,7 @@
</div>
</div>
<!-- Z jogging control panel -->
<div id="controls-jog-z" class="jog-panel">
<div id="control-jog-z" class="jog-panel">
<h1>Z</h1>
<div>
<button id="control-zinc" class="btn box" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendJogCommand('z',1) }"><i class="icon-arrow-up"></i></button>
@ -55,7 +55,7 @@
</div>
<!-- Jog distance -->
<div id="controls-jog-distance" class="distance">
<div id="control-jog-distance" class="distance">
<div id="jog_distance" class="btn-group" data-toggle="buttons-radio">
<button type="button" id="control-distance01" class="btn distance" data-distance="0.1" data-bind="enable: loginState.isUser()">0.1</button>
<button type="button" id="control-distance1" class="btn distance" data-distance="1" data-bind="enable: loginState.isUser()">1</button>
@ -65,13 +65,13 @@
</div>
<!-- Feed rate -->
<div id="controls-jog-feedrate" class="jog-panel">
<div id="control-jog-feedrate" class="jog-panel">
<input type="number" style="width: 153px" data-bind="slider: {min: 50, max: 150, step: 1, value: feedRate, tooltip: 'hide'}">
<button class="btn btn-block" style="width: 169px" data-bind="enable: isOperational() && loginState.isUser(), click: function() { $root.sendFeedRateCommand() }">{{ _('Feed rate:') }}<span data-bind="text: feedRate() + '%'"></span></button>
</div>
</div>
<!-- Extrusion control panel -->
<div id="controls-jog-extrusion" class="jog-panel" style="display: none;" data-bind="visible: loginState.isUser">
<div id="control-jog-extrusion" class="jog-panel" style="display: none;" data-bind="visible: loginState.isUser">
<h1>Tool (E)</h1>
<div>
<div class="btn-group control-box">
@ -96,7 +96,7 @@
</div>
</div>
<!-- General control panel -->
<div id="controls-jog-general" class="jog-panel" style="display: none;" data-bind="visible: loginState.isUser">
<div id="control-jog-general" class="jog-panel" style="display: none;" data-bind="visible: loginState.isUser">
<h1>{{ _('General') }}</h1>
<div>
<button class="btn btn-block control-box" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: function() { $root.sendCustomCommand({type:'command',command:'M18'}) }">{{ _('Motors off') }}</button>
@ -106,7 +106,7 @@
</div>
<!-- Container for custom controls -->
<div id="controls-jog-custom" style="clear: both; display: none;" data-bind="visible: loginState.isUser, template: { name: $root.displayMode, foreach: controls }"></div>
<div id="control-jog-custom" style="clear: both; display: none;" data-bind="visible: loginState.isUser, template: { name: $root.displayMode, foreach: controls }"></div>
<!-- Templates for custom controls -->
<script type="text/html" id="customControls_containerTemplate_nameless">