Robert Marshall 9 yıl önce
ebeveyn
işleme
0358722094

+ 1 - 1
Model/DiskInfo.php

@@ -18,7 +18,7 @@ class DiskInfo {
 			$bytes/=1024;
 			$index++;
 		}
-		return round($bytes, 2)." ".self::$Postfix[$index];
+		return round($bytes, 2).self::$Postfix[$index];
 	}
 
 	private function FreeSpace() {

+ 4 - 4
View/Status/index.view

@@ -4,10 +4,10 @@
 	<?=$uptime['days']?> days, <?=$uptime['hours']?> hours and <?=$uptime['minutes']?> minutes
 	<h3>Load</h3>
 	<table class="alternatingRows">
-		<tr><td>1</td><td><?= $load[0]*100 ?>% (<?= ($load[0]/4)*100 ?>% core avg)</td></tr>
-		<tr><td>5</td><td><?= $load[1]*100 ?>% (<?= ($load[1]/4)*100 ?>% core avg)</td></tr>
-		<tr><td>15</td><td><?= $load[2]*100 ?>% (<?= ($load[2]/4)*100 ?>% core avg)</td></tr>
-		<tr><td>CPU Temp</td><td><?=round($cpuTemp)?>&deg;C</td></tr>
+		<tr><td>1 min avg</td><td><?= $load[0]*100 ?>% (<?= ($load[0]/4)*100 ?>% core avg)<div class="percentageBar"><div style="width:<?=($load[0]/4)*100?>%"></div></td></tr>
+		<tr><td>5 min avg</td><td><?= $load[1]*100 ?>% (<?= ($load[1]/4)*100 ?>% core avg)<div class="percentageBar"><div style="width:<?=($load[1]/4)*100?>%"></div></td></tr>
+		<tr><td>15 min avg</td><td><?= $load[2]*100 ?>% (<?= ($load[2]/4)*100 ?>% core avg)<div class="percentageBar"><div style="width:<?=($load[2]/4)*100?>%"></div></td></tr>
+		<tr><td>CPU Temp</td><td><?=round($cpuTemp)?>&deg;C<div class="percentageBar"><div style="width:<?=($cpuTemp/90)*100?>%"></div></td></tr>
 		<tr><td>RAM</td><td><?=round($memFree/1024,2)?>MB free of <?=round($memTotal/1024,2)?>MB (<?=round($memUsage)?>% used)<div class="percentageBar"><div style="width:<?=$memUsage?>%"></div></td></tr>
 	</table>
 	<h3>Disc Space</h3>

+ 1 - 0
View/Weight/index.view

@@ -125,6 +125,7 @@
 			</tr>
 			<?php
 				$last10=array_slice($readings, count($readings)-10);
+				$last10=array_reverse($last10);
 				foreach ($last10 as $reading){
 					echo '<tr><td>',date("d/m/y", strtotime($reading->Timestamp)),'</td><td>',$reading->Weight,'</td><td>',round($reading->Bmi,1),'</td><td>',$reading->Fat,'</td></tr>';
 				}

+ 3 - 0
css/style-small.css

@@ -34,3 +34,6 @@ dl {
 .row.col-md-4 > .col {
   width: 100%;
 }
+table {
+  width: 100%;
+}

+ 4 - 0
less/style-small.less

@@ -45,4 +45,8 @@ dl{
 	&.col-md-1>.col, &.col-md-2>.col, &.col-md-3>.col, &.col-md-4>.col{
 		width: 100%;
 	}
+}
+
+table{
+	width:100%;
 }