Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam

This commit is contained in:
make-ing 2015-09-04 17:27:32 +02:00
commit d714e907c5

View file

@ -77,7 +77,7 @@
<span class="icon-exclamation-sign"></span>
Do not power off the Machine during the flashing process.
</div>
<div data-bind="visible: !isLocked() && !isFlashing ">
<div data-bind="visible: !isLocked() && !isFlashing() ">
{{ _('Position') }}: <strong data-bind="text: laserPos"></strong>
<a href="#control_btns" style="margin-top: -5px;"
class="btn btn-xs pull-right"