mirror
/
kiln-controller-max31856
kopia lustrzana https://github.com/jbruce12000/kiln-controller
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Updated UI

pull/1/head
chrono 2013-11-24 20:55:24 +01:00
rodzic bf8a649905
commit 3db2f93df0
2 zmienionych plików z 13 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
public/assets/css/picoreflow.css
Wyświetl plik

@ -33,7 +33,7 @@ font-weight: normal;
-webkit-border-radius: 7px;
-moz-border-radius: 7px;
border-radius: 7px;
background: #3F3E3A url(assets/images/panel_bg.png) repeat;
background: #3F3E3A url('/picoreflow/assets/images/panel_bg.png') repeat;
-moz-box-shadow: 0 0 1.1em 0 rgba(0,0,0,0.35),inset 0 0 9px 2px #000;
-webkit-box-shadow: 0 0 1.5em 0 rgba(0,0,0,0.35),inset 0 0 9px 2px #000;
box-shadow: 0 0 1.1em 0 rgba(0,0,0,0.35),inset 0 0 9px 2px #000;
@ -54,7 +54,7 @@ box-shadow: 0 0 1.1em 0 rgba(0,0,0,0.35),inset 0 0 9px 2px #000;
}
.panel-heading {
background: #fafafa url('assets/images/page_bg.png') repeat-x;
background: #fafafa url('/picoreflow/assets/images/page_bg.png') repeat-x;
overflow: hidden;
}

19
public/index.html
Wyświetl plik

@ -25,16 +25,11 @@
<div class="pull-left" style="margin: 14px">
<span id="act_temp" class="display" style="color: #75890c">25 &deg;C</span>
<span id="target_temp" class="display">OFF</span>
<span id="state" class="display" style="font-size: 14px">Idle</span>
<span id="state" class="display" style="font-size: 14px; text-align: center; padding-right:0">Idle</span>
<span id="eta" class="display" style="width: 60px">-</span>
<span id="power" class="display" style="width: 35px;">&nbsp;</span>
</div>
<div class="pull-right" style="margin: 14px">
<button id="nav_start" type="button" class="btn btn-success" data-toggle="modal" data-target="#myModal"><span class="glyphicon glyphicon-forward"></span> Start</button>
<button id="nav_stop" type="button" class="btn btn-danger" onclick="abortTask()"><span class="glyphicon glyphicon-stop"></span> Stop</button>
</div>
<div class="clearfix"></div>
<div class="progress progress-striped active" style="margin: 14px; margin-top: 0">
@ -58,11 +53,16 @@
</span>
</div><!-- /input-group -->
<div class="btn-group btn-group-sm pull-right">
<div class="btn-group btn-group-sm">
<!--<button type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span></button>-->
<button type="button" class="btn btn-default" onclick="enterEditMode()"><span class="glyphicon glyphicon-pencil"></span></button>
</div>
<div class="pull-right">
<button id="nav_start" type="button" class="btn btn-success" data-toggle="modal" data-target="#myModal"><span class="glyphicon glyphicon-forward"></span> Start</button>
<button id="nav_stop" type="button" class="btn btn-danger" onclick="abortTask()"><span class="glyphicon glyphicon-stop"></span> Stop</button>
</div>
</div>
<div class="panel-body" style='padding: 0'>
<div id="graph_container" style="min-width: 400px; height: 400px; margin: 0 auto"></div>
@ -583,6 +583,9 @@ $(function() {
updateProgress(parseInt(parseFloat(x.runtime)/parseFloat(x.totaltime)*100));
$('#act_temp').html(Highcharts.numberFormat(x.temperature, 0) + ' \xB0C');
$('#power').css("background-color", (x.power > 0.5 ? "#75890c" : "#1F1E1A") );
if (x.target == 0)
{
$('#target_temp').html('OFF');
@ -605,7 +608,7 @@ $(function() {
var seconds = left - minutes * 60;
$('#eta').html(minutes+':'+ (seconds < 10 ? "0" : "") + seconds);
$('#power').css("background-color", (x.power > 0.5 ? "#75890c" : "#1F1E1A") );
}
else