diff options
| author | Jim P <jim@pingle.org> | 2012-01-11 08:17:38 -0800 |
|---|---|---|
| committer | Jim P <jim@pingle.org> | 2012-01-11 08:17:38 -0800 |
| commit | c6678f31b0e48b310bd49e392b6977a77c174e10 (patch) | |
| tree | 8a6e89793eba072c83f07da0ef5bbf0ad2f1f0b8 /usr/local/www/widgets | |
| parent | 12c7b5778418734a7ebbd816bb75522ca17a2a54 (diff) | |
| parent | e9ca9b9a35c5e7c9c2fb6025c54da420d901cc49 (diff) | |
| download | pfsense-c6678f31b0e48b310bd49e392b6977a77c174e10.zip pfsense-c6678f31b0e48b310bd49e392b6977a77c174e10.tar.gz | |
Merge pull request #37 from Joecowboy/master
Dashboard widget fixes and mods
Diffstat (limited to 'usr/local/www/widgets')
3 files changed, 17 insertions, 7 deletions
diff --git a/usr/local/www/widgets/javascript/cpu_graphs.js b/usr/local/www/widgets/javascript/cpu_graphs.js index a411912..3d91b5f 100644 --- a/usr/local/www/widgets/javascript/cpu_graphs.js +++ b/usr/local/www/widgets/javascript/cpu_graphs.js @@ -242,6 +242,5 @@ function GraphDraw(graph) { for(var i = 0; i < count; i++) graph['spans'][i].style.marginTop = getMargin(i); - jQuery('#' + graph['spans'][count - 1]).fadeIn(500); -} - +// jQuery('#' + graph['spans'][count - 1]).fadeIn(500); +}
\ No newline at end of file diff --git a/usr/local/www/widgets/widgets/deactivated/cpu_graphs.widget.php b/usr/local/www/widgets/widgets/deactivated/cpu_graphs.widget.php index fa48610..a7e7882 100644 --- a/usr/local/www/widgets/widgets/deactivated/cpu_graphs.widget.php +++ b/usr/local/www/widgets/widgets/deactivated/cpu_graphs.widget.php @@ -61,12 +61,12 @@ require_once("functions.inc"); <script language="javascript" type="text/javascript"> // Graph 1 - graph[0] = GraphInitialize('GraphOutput', 200, 50, 2); + graph[0] = GraphInitialize('GraphOutput', 200, 50, 4); graph_dir[0] = GL_END; last_val[0] = Math.floor(Math.random() * 50); last_val_span[0] = document.getElementById('LastValue0'); - //GraphSetVMax(graph[0], 100); - //GraphDynamicScale(graph[0]); + GraphSetVMax(graph[0], 100); + GraphDynamicScale(graph[0]); -</script> +</script>
\ No newline at end of file diff --git a/usr/local/www/widgets/widgets/system_information.widget.php b/usr/local/www/widgets/widgets/system_information.widget.php index 9a7dc55..7dab2cc 100644 --- a/usr/local/www/widgets/widgets/system_information.widget.php +++ b/usr/local/www/widgets/widgets/system_information.widget.php @@ -200,6 +200,17 @@ $curcfg = $config['system']['firmware']; <?= $mbufs_total ?>/<?= $mbufs_max ?> </td> </tr> + <?php if (get_temp() != ""): ?> + <tr> + <td width="25%" class="vncellt">Temperature</td> + <td width="75%" class="listr"> + <?php $TempMeter = $temp = get_temp(); ?> + <img src="./themes/<?= $g['theme']; ?>/images/misc/bar_left.gif" height="15" width="4" border="0" align="middle" alt="left bar" /><img src="./themes/<?= $g['theme']; ?>/images/misc/bar_blue.gif" height="15" name="tempwidtha" id="tempwidtha" width="<?= $TempMeter; ?>" border="0" align="middle" alt="red bar" /><img src="./themes/<?= $g['theme']; ?>/images/misc/bar_gray.gif" height="15" name="tempwidthb" id="tempwidthb" width="<?= (100 - $TempMeter); ?>" border="0" align="middle" alt="gray bar" /><img src="./themes/<?= $g['theme']; ?>/images/misc/bar_right.gif" height="15" width="5" border="0" align="middle" alt="right bar" /> + + <input style="border: 0px solid white;" size="30" name="tempmeter" id="tempmeter" value="<?= $temp."°C"; ?>" /> + </td> + </tr> + <?php endif; ?> <tr> <td width="25%" class="vncellt">CPU usage</td> <td width="75%" class="listr"> |
