Permalink
Browse files

A moment of silence for John's progress bar, please

  • Loading branch information...
1 parent 2878781 commit a2fd6ce4ec3998e8d730e5884f7e45714cf1ca89 @oldpatricka oldpatricka committed Dec 19, 2012
@@ -3,7 +3,6 @@
{
width: 800px;
height: 500px;
- padding: 10px;
}
#phantom_lc_heading_div
@@ -9,13 +9,13 @@ function phantom_cloud_edit_enable(enable) {
$("#phantom_cloud_edit_add").removeAttr("disabled", "disabled");
$("#phantom_cloud_edit_remove").removeAttr("disabled", "disabled");
$('#phantom_cloud_edit_name').removeAttr("disabled", "disabled");
- $('#phantom_cloud_edit_loading_image').hide();
+ $('#loading').hide();
}
else {
$("#phantom_cloud_edit_add").attr("disabled", "disabled");
$("#phantom_cloud_edit_remove").attr("disabled", "disabled");
$("#phantom_cloud_edit_name").attr("disabled", "disabled");
- $('#phantom_cloud_edit_loading_image').show();
+ $('#loading').show();
$("#phantom_cloud_edit_access").val("");
$("#phantom_cloud_edit_secret").val("");
$("#phantom_cloud_edit_keyname_list").empty();
@@ -22,7 +22,7 @@ function phantom_lc_buttons(enabled) {
$("#phantom_lc_up").removeAttr("disabled", "disabled");
$("#phantom_lc_down").removeAttr("disabled", "disabled");
phantom_lc_change_image_type();
- $('#phantom_lc_loading_image').hide();
+ $('#loading').hide();
}
else {
$("#phantom_lc_name_select").attr("disabled", "disabled");
@@ -38,7 +38,7 @@ function phantom_lc_buttons(enabled) {
$("#phantom_lc_remove").attr("disabled", "disabled");
$("#phantom_lc_up").attr("disabled", "disabled");
$("#phantom_lc_down").attr("disabled", "disabled");
- $('#phantom_lc_loading_image').show();
+ $('#loading').show();
}
}
@@ -66,7 +66,7 @@ function phantom_lc_reload_success_func(obj) {
}
catch (err) {
alert("There was a problem loading the page. Please try again later. ".concat(err.message));
- $('#phantom_lc_loading_image').hide();
+ $('#loading').hide();
}
}
@@ -84,7 +84,7 @@ function phantom_lc_select_new_cloud() {
catch(err)
{
alert("There was a problem on the page. ".concat(err.message));
- $('#phantom_lc_loading_image').hide();
+ $('#loading').hide();
}
phantom_lc_buttons(true);
}
@@ -15,9 +15,18 @@
{% endblock %}
{% block bodytag %}onload="phantom_cloud_edit_load_page();"{% endblock %}
{% block nimbus_body %}
-<div class="" id="xstatus_bar_div">
- <img src="/static/images/loading4.gif" id="phantom_cloud_edit_loading_image"/>
+<div class="container-fluid inner-container">
+ <div class="row-fluid">
+ <div class="span2">
+ <div id="loading" class="progress progress-striped active">
+ <div class="bar" style="width: 100%"></div>
+ </div>
+ </div>
+ <div class="span10" id="alert-container">
+ </div>
+ </div>
</div>
+
<div>
<form action="." method="post" class="form-horizontal">{% csrf_token %}
<div class="control-group" >
@@ -17,8 +17,16 @@
{% block bodytag %}onload="phantom_lc_load();"{% endblock %}
{% block nimbus_body %}
-<div>
- <img src="/static/images/loading4.gif" id="phantom_lc_loading_image"/>
+<div class="container-fluid inner-container">
+ <div class="row-fluid">
+ <div class="span2">
+ <div id="loading" class="progress progress-striped active">
+ <div class="bar" style="width: 100%"></div>
+ </div>
+ </div>
+ <div class="span10" id="alert-container">
+ </div>
+ </div>
</div>
<div id="phantom_lc_content" class="container-fluid inner-container">

0 comments on commit a2fd6ce

Please sign in to comment.