Commit 640d3195 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Remove the upper right close button from the imaging modal,

and replace with a hidden close button at the bottom, that
is displayed when imaging is complete.
parent c7a9f423
...@@ -82,7 +82,8 @@ define(['underscore', 'js/quickvm_sup', 'filesize', ...@@ -82,7 +82,8 @@ define(['underscore', 'js/quickvm_sup', 'filesize',
$('#tracker-finishing').addClass('progtrckr-done'); $('#tracker-finishing').addClass('progtrckr-done');
$('#tracker-ready').removeClass('progtrckr-todo'); $('#tracker-ready').removeClass('progtrckr-todo');
$('#tracker-ready').addClass('progtrckr-done'); $('#tracker-ready').addClass('progtrckr-done');
$('#imaging-spinner').addClass("invisible"); $('#imaging-spinner').addClass("hidden");
$('#imaging-close').removeClass("hidden");
completion_callback(0); completion_callback(0);
return; return;
} }
...@@ -95,6 +96,7 @@ define(['underscore', 'js/quickvm_sup', 'filesize', ...@@ -95,6 +96,7 @@ define(['underscore', 'js/quickvm_sup', 'filesize',
$('#tracker-ready').addClass('progtrckr-done'); $('#tracker-ready').addClass('progtrckr-done');
$('#tracker-ready').html("Failed"); $('#tracker-ready').html("Failed");
$('#imaging-spinner').addClass("invisible"); $('#imaging-spinner').addClass("invisible");
$('#imaging-close').removeClass("hidden");
completion_callback(1); completion_callback(1);
return; return;
} }
...@@ -104,7 +106,8 @@ define(['underscore', 'js/quickvm_sup', 'filesize', ...@@ -104,7 +106,8 @@ define(['underscore', 'js/quickvm_sup', 'filesize',
// ready or failed above. // ready or failed above.
// //
if (_.has(value, "exited")) { if (_.has(value, "exited")) {
$('#imaging-spinner').addClass("invisible"); $('#imaging-spinner').addClass("hidden");
$('#imaging-close').removeClass("hidden");
completion_callback(0); completion_callback(0);
return; return;
} }
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
<div class='modal-dialog'> <div class='modal-dialog'>
<div class='modal-content'> <div class='modal-content'>
<div class='modal-header'> <div class='modal-header'>
<button type='button' class='close' data-dismiss='modal'
aria-hidden='true'>&times;</button>
<h4><center>Please wait while we make your disk image</center></h4> <h4><center>Please wait while we make your disk image</center></h4>
</div> </div>
<div class='row'> <div class='row'>
...@@ -26,7 +24,13 @@ ...@@ -26,7 +24,13 @@
<td id='imaging_modal_image_size'></td> <td id='imaging_modal_image_size'></td>
</tr> </tr>
</table> </table>
<center><img id='imaging-spinner' src='images/spinner.gif' /></center> <center>
<img id='imaging-spinner' src='images/spinner.gif' />
<button type='button' id='imaging-close'
class='btn btn-default btn-sm hidden'
data-dismiss='modal'>
Close</button>
</center>
<br> <br>
</div> </div>
</div> </div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment