summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2016-04-25 08:58:51 -0400
committerStephen Beaver <sbeaver@netgate.com>2016-04-25 08:58:51 -0400
commit8067ebef4e07cf2c62654ac3533a9ce0495bb9da (patch)
treeafe8057e4ad81c2336450d01828bb9f37ef4623d /src
parent842fb4936059c6aa73b03468fca83afcfd5b28eb (diff)
parenteb442fec8bd079760a53372bd9eaed7c502f2e98 (diff)
downloadpfsense-8067ebef4e07cf2c62654ac3533a9ce0495bb9da.zip
pfsense-8067ebef4e07cf2c62654ac3533a9ce0495bb9da.tar.gz
Merge pull request #2909 from phil-davis/patch-4
Diffstat (limited to 'src')
-rw-r--r--src/usr/local/www/widgets/widgets/system_information.widget.php13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/usr/local/www/widgets/widgets/system_information.widget.php b/src/usr/local/www/widgets/widgets/system_information.widget.php
index 28189e3..1face09 100644
--- a/src/usr/local/www/widgets/widgets/system_information.widget.php
+++ b/src/usr/local/www/widgets/widgets/system_information.widget.php
@@ -242,9 +242,12 @@ $filesystems = get_mounted_filesystems();
<tr>
<th><?=gettext("Temperature");?></th>
<td>
- <?php $TempMeter = $temp = get_temp(); ?>
- <div id="tempPB"></div>
- <span id="tempmeter"><?= $temp."&#176;C"; ?></span>
+ <?php $temp_deg_c = get_temp(); ?>
+ <div class="progress">
+ <div id="tempPB" class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="<?=$temp_deg_c?>" aria-valuemin="0" aria-valuemax="100" style="width: <?=$temp_deg_c?>%">
+ </div>
+ </div>
+ <span id="tempmeter"><?= $temp_deg_c . "&deg;C"; ?></span>
</td>
</tr>
<?php endif; ?>
@@ -429,10 +432,10 @@ function updateCPU(x) {
function updateTemp(x) {
if ($("#tempmeter")) {
- $("#tempmeter").html(x + '\u00B0' + 'C');
+ $("#tempmeter").html(x + '&deg;' + 'C');
}
if ($('#tempPB')) {
- $("#tempPB").progressbar( { value: parseInt(x) } );
+ setProgress('tempPB', parseInt(x));
}
}
OpenPOWER on IntegriCloud