diff --git a/app/views/disk_wizard/done.html.slim b/app/views/disk_wizard/done.html.slim
index 37630cc..3a1dbad 100644
--- a/app/views/disk_wizard/done.html.slim
+++ b/app/views/disk_wizard/done.html.slim
@@ -32,15 +32,14 @@ css:
font-size: large;
}
-.row
- br/
+.row.p-2.d-inline-block
- if user_selections['debug']
- .col-md-10.col-md-offset-1
+ div
.panel.panel-warning
- .panel-heading
+ .h4.mt-3
| Debug Information
span.glyphicon.glyphicon-info-sign
- .panel-body.text-left
+ .panel-body.text-left style="font-size: 14px;"
p.text-muted
| Note:
p.text-muted
@@ -49,15 +48,16 @@ css:
| 2. Pipeline character(|) has encoded as exclamation character(!).
p.text-muted
| 3. Order(#) of the commands does matter if you try to execute them manually.
+
table.table.table-bordered.table-hover
thead
tr.active
th.text-center.text-primary style=("width: 5%;")
- | #
+ | #
th.text-center.text-primary style=("width: 20%;")
- | Command name
+ | Command name
th.text-center.text-primary
- | Parameters
+ | Parameters
tbody
- count = 0
@@ -108,7 +108,7 @@ css:
| Get Debug infomation
#fpaste_loading.col-md-8.col-md-offset-2
- = image_tag "disk_wizard/progress.gif"
+ / = image_tag "disk_wizard/progress.gif"
p.text-primary
span.glyphicon.glyphicon-time
| Please wait.Generating fpaste URL.......
diff --git a/app/views/disk_wizard/error.html.slim b/app/views/disk_wizard/error.html.slim
index afc4cbb..df9808f 100644
--- a/app/views/disk_wizard/error.html.slim
+++ b/app/views/disk_wizard/error.html.slim
@@ -9,6 +9,7 @@ javascript:
$('#debug_info').slideDown();
});
}
+
$(function () {
$('#fpaste_url').tooltip();
var $loading = $('#fpaste_loading').hide();
@@ -19,6 +20,10 @@ javascript:
});
});
+ function sendReport(){
+ //
+ }
+
css:
/* Fix for conflicts with platform CSS */
@@ -55,44 +60,49 @@ css:
bottom: 0px;
}
-.alert.alert-danger.fade.in
- button.close aria-hidden="true" data-dismiss="alert" type="button"
- | ×
- h4 Oh snap! You got an error!
- .well
- p.text-primary.text-center
- = @exception
- | \.
+ #fpaste_loading{
+ display: inline-block;
+ margin: 0 auto;
+ margin-top: 20px;
+ font-size: 13px;
+ }
- .row.text-center
+div style="background: #f5cece;padding: 15px;"
+ h4 style="color: #f56b6b;" Oh snap! You got an error!
+ p style="font-size: 13px;"
+ = @exception
+ | \.
+
+ .row.text-center.d-inline-block
button#get_debug_info.btn.btn-warning onclick="getDebugURL();"
| Get Debug infomation
- button#send_crash_report.btn.btn-default onclick="sendReport();"
+ button#send_crash_report.btn.btn-default.ml-4.mr-4 onclick="sendReport();"
span.glyphicon.glyphicon-send
| Send Report to Amahi
- a.btn.btn-default href="/tab/disks/disk_wizards" type="button"
+ a.btn.btn-default href="/tab/disks/disk_wizard" type="button"
| Or try again
.row
#fpaste_loading.col-md-8.col-md-offset-2
- = image_tag "disk_wizard/progress.gif"
+ / = image_tag "disk_wizard/progress.gif"
p.text-primary
span.glyphicon.glyphicon-time
| Please wait.Generating fpaste URL.......
- #debug_info.col-md-10.col-md-offset-1 style=("display: none;")
- .panel.panel-default
+
+ #debug_info.col-md-10.col-md-offset-1.mx-auto style=("display: none;")
+ .panel.panel-default.p-2.mt-3
form.form-inline.text-center role="form"
- .form-group.has-success.has-feedback
+ .form-group.has-success.has-feedback.pl-2
label.control-label for="fpaste_url"
| URL:
span.glyphicon.glyphicon-globe
- input#fpaste_url.form-control autocomplete="off" data-placement="top" data-toggle="tooltip" onclick="$(this).select();" placeholder=("Generating URL..") style=("width: 500px;") title=("Press Ctrl+c to coppy URL to clipboard") type="text" /
+ input#fpaste_url.form-control autocomplete="off" data-placement="top" data-toggle="tooltip" onclick="$(this).select();" placeholder=("Generating URL..") style=("width: 500px;font-size:14px;") title=("Press Ctrl+C to copy URL to clipboard") type="text" /
span.glyphicon.glyphicon-ok.form-control-feedback
.panel-body.text-left
- p.text-primary
+ p.text-primary.mt-2
| After generating your paste, copy the generated url above.
p.text-primary
| Head over to the Amahi IRC channel, and share your link with one of the helpful folks there.
- p.text-info
+ span.text-info
| Good Luck! Thanks for choosing Amahi.
\ No newline at end of file
diff --git a/app/views/disk_wizard/progress.html.slim b/app/views/disk_wizard/progress.html.slim
index 5294897..e45daf7 100644
--- a/app/views/disk_wizard/progress.html.slim
+++ b/app/views/disk_wizard/progress.html.slim
@@ -2,8 +2,8 @@
javascript:
$(document).ready(function () {
- // start_processing();
- // setInterval(ajaxd, 2000);
+ start_processing();
+ setInterval(ajaxd, 2000);
});
function ajaxd() {
@@ -13,16 +13,23 @@ javascript:
type: "GET",
dataType: "json",
url: "get_progress",
- // data : "user=success",
+ data : "user=success",
success: function (progress) {
- // alert(progress.message + progress.percentage);
+ console.log("progress is ");
+ console.log(progress);
+
$("#progress_message").html(progress.message);
- if (progress.percentage < 0) {
- window.location.href = "error";
+
+ if(progress.percentage < 0 || progress.percentage > 100){
+ window.location.href = "error";
}
- if (progress.percentage == 100)
- window.location.href = "complete";
+ if(progress.percentage == 100){
+ window.location.href = "complete";
+ }else if(progress.percentage >= 0){
+ $("#disk-wizard-progress")[0].style.width = progress.percentage + "%";
+ $("#disk-wizard-progress")[0].innerHTML = progress.percentage + "%";
+ }
}
});
}
@@ -39,7 +46,7 @@ javascript:
.panel-body
.row.mt-4.mb-2 style="display: inline-block;"
.progress.active style="width: 500px; display: inline-block;"
- .progress-bar.progress-bar-striped.bg-info.progress-bar-animated aria-valuemax="100" aria-valuemin="0" aria-valuenow="100" role="progressbar" style=("width: 100%")
+ #disk-wizard-progress.progress-bar.progress-bar-striped.bg-info.progress-bar-animated aria-valuemax="100" aria-valuemin="0" aria-valuenow="100" role="progressbar" style=("width: 0%")
| 0%
p.text-primary
span#progress_message Please wait...