diff --git a/public/assets/css/picoreflow.css b/public/assets/css/picoreflow.css index 3b09ef0..cabeaa4 100644 --- a/public/assets/css/picoreflow.css +++ b/public/assets/css/picoreflow.css @@ -93,7 +93,7 @@ background: #3F3E3A; background-color: #75890c; font-family: "LCDN"; color: #D6FC13; - text-shadow: 0 -1px #999999, 1px 0 #999999, 0 1px #999999, -1px 0 #999999; + text-shadow: 0 -1px #333, 1px 0 #333, 0 1px #333, -1px 0 #333; } .btn-success { diff --git a/public/assets/js/picoreflow.js b/public/assets/js/picoreflow.js index 3b969db..a150131 100644 --- a/public/assets/js/picoreflow.js +++ b/public/assets/js/picoreflow.js @@ -40,13 +40,13 @@ function update_profile(id) } -function updateProgress(percentage, eta) +function updateProgress(percentage) { if(state=="RUNNING") { if(percentage > 100) percentage = 100; $('#progressBar').css('width', percentage+'%'); - if(percentage>9) $('#progressBar').html(parseInt(percentage)+'% - '+ eta); + //if(percentage>9) $('#progressBar').html(parseInt(percentage)+'% - '+ eta); } else { @@ -296,18 +296,19 @@ ws_status.onclose = function() var seconds = left - minutes * 60; eta = minutes+':'+ (seconds < 10 ? "0" : "") + seconds; + updateProgress(parseFloat(x.runtime)/parseFloat(x.totaltime)*100); + $('#state').html(parseInt(parseFloat(x.runtime)/parseFloat(x.totaltime)*100) + '% ' + eta); + } else { $("#nav_start").show(); $("#nav_stop").hide(); + $('#state').html(state); } } - $('#state').html(state); - - updateProgress(parseFloat(x.runtime)/parseFloat(x.totaltime)*100,eta); $('#act_temp').html(parseInt(x.temperature) + ' \xB0C'); $('#heat').css("background-color", (x.heat > 0.5 ? "rgba(233, 28, 0, 0.84)" : "rgba(46, 12, 12, 0.62") );