Use span instead of button for upload buttons, otherwise FF and IE hiccup...
(cherry picked from commit ee3bc84
)
master
parent
b1ba513e32
commit
4994d488cf
|
@ -197,22 +197,22 @@
|
||||||
<div style="display: none;" data-bind="visible: loginState.isUser">
|
<div style="display: none;" data-bind="visible: loginState.isUser">
|
||||||
<div class="row-fluid upload-buttons">
|
<div class="row-fluid upload-buttons">
|
||||||
{% if enableSdSupport %}
|
{% if enableSdSupport %}
|
||||||
<button class="btn btn-primary fileinput-button span6" data-bind="css: {disabled: !$root.loginState.isUser()}" style="margin-bottom: 10px">
|
<span class="btn btn-primary fileinput-button span6" data-bind="css: {disabled: !$root.loginState.isUser()}" style="margin-bottom: 10px">
|
||||||
<i class="icon-upload-alt icon-white"></i>
|
<i class="icon-upload-alt icon-white"></i>
|
||||||
<span>Upload</span>
|
<span>Upload</span>
|
||||||
<input id="gcode_upload" type="file" name="gcode_file" class="fileinput-button" data-url="/ajax/gcodefiles/upload" data-bind="enable: loginState.isUser()">
|
<input id="gcode_upload" type="file" name="gcode_file" class="fileinput-button" data-url="/ajax/gcodefiles/upload" data-bind="enable: loginState.isUser()">
|
||||||
</button>
|
</span>
|
||||||
<button class="btn btn-primary fileinput-button span6" data-bind="css: {disabled: !$root.loginState.isUser()}" style="margin-bottom: 10px">
|
<span class="btn btn-primary fileinput-button span6" data-bind="css: {disabled: !$root.loginState.isUser()}" style="margin-bottom: 10px">
|
||||||
<i class="icon-upload-alt icon-white"></i>
|
<i class="icon-upload-alt icon-white"></i>
|
||||||
<span>Upload to SD</span>
|
<span>Upload to SD</span>
|
||||||
<input id="gcode_upload_sd" type="file" name="gcode_file" class="fileinput-button" data-url="/ajax/gcodefiles/upload" data-bind="enable: loginState.isUser()">
|
<input id="gcode_upload_sd" type="file" name="gcode_file" class="fileinput-button" data-url="/ajax/gcodefiles/upload" data-bind="enable: loginState.isUser()">
|
||||||
</button>
|
</span>
|
||||||
{% else %}
|
{% else %}
|
||||||
<button class="btn btn-primary fileinput-button span12" data-bind="css: {disabled: !$root.loginState.isUser()}" style="margin-bottom: 10px">
|
<span class="btn btn-primary fileinput-button span12" data-bind="css: {disabled: !$root.loginState.isUser()}" style="margin-bottom: 10px">
|
||||||
<i class="icon-upload-alt icon-white"></i>
|
<i class="icon-upload-alt icon-white"></i>
|
||||||
<span>Upload</span>
|
<span>Upload</span>
|
||||||
<input id="gcode_upload" type="file" name="gcode_file" class="fileinput-button" data-url="/ajax/gcodefiles/upload" data-bind="enable: loginState.isUser()">
|
<input id="gcode_upload" type="file" name="gcode_file" class="fileinput-button" data-url="/ajax/gcodefiles/upload" data-bind="enable: loginState.isUser()">
|
||||||
</button>
|
</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
<div id="gcode_upload_progress" class="progress" style="width: 100%;">
|
<div id="gcode_upload_progress" class="progress" style="width: 100%;">
|
||||||
|
|
Loading…
Reference in New Issue