diff --git a/html/images/icons/cpuload.png b/html/images/icons/cpuload.png
new file mode 100644
index 000000000..8734e777a
Binary files /dev/null and b/html/images/icons/cpuload.png differ
diff --git a/html/images/icons/mempool.png b/html/images/icons/mempool.png
new file mode 100644
index 000000000..958d85abf
Binary files /dev/null and b/html/images/icons/mempool.png differ
diff --git a/html/pages/device/overview/mempools.inc.php b/html/pages/device/overview/mempools.inc.php
index 89141c88c..f89809160 100644
--- a/html/pages/device/overview/mempools.inc.php
+++ b/html/pages/device/overview/mempools.inc.php
@@ -2,18 +2,18 @@
if(mysql_result(mysql_query("SELECT count(*) from mempools WHERE device_id = '" . $device['device_id'] . "'"),0)) {
echo("
");
- echo("
Memory Pools
");
+ echo("
Memory Pools
");
echo("
");
$mempool_rows = '1';
$mempools = mysql_query("SELECT * FROM `mempools` WHERE device_id = '" . $device['device_id'] . "'");
while($mempool = mysql_fetch_array($mempools)) {
if(is_integer($mempool_rows/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
$perc = round($mempool['mempool_used'] / ($mempool['mempool_total']) * 100,2);
+
$text_descr = $mempool['mempool_descr'];
$text_descr = str_replace("Routing Processor", "RP", $text_descr);
$text_descr = str_replace("Switching Processor", "SP", $text_descr);
- $text_descr = str_replace("Processor", "Proc", $text_descr);
- $text_descr = str_replace("Sub-Module", "Mod", $text_descr);
+ $text_descr = str_replace("Sub-Module", "Module ", $text_descr);
$text_descr = str_replace("DFC Card", "DFC", $text_descr);
$mempool_url = "/device/".$device['device_id']."/health/memory/";
diff --git a/html/pages/device/overview/processors.inc.php b/html/pages/device/overview/processors.inc.php
index 25e889f51..6952447c1 100644
--- a/html/pages/device/overview/processors.inc.php
+++ b/html/pages/device/overview/processors.inc.php
@@ -3,7 +3,7 @@
if(mysql_result(mysql_query("SELECT count(*) from processors WHERE device_id = '" . $device['device_id'] . "'"),0)) {
$processor_rows = 0;
echo("");
- echo("
Processors
");
+ echo("
Processors
");
echo("
");
$i = '1';
$procs = mysql_query("SELECT * FROM `processors` WHERE device_id = '" . $device['device_id'] . "'");
@@ -19,7 +19,13 @@ if(mysql_result(mysql_query("SELECT count(*) from processors WHERE device_id = '
$mini_url = $config['base_url'] . "/graph.php?id=".$proc['processor_id']."&type=processor&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
$text_descr = $proc['processor_descr'];
- $text_descr = short_hrDeviceDescr($proc['processor_descr']);
+ $text_descr = str_replace("Routing Processor", "RP", $text_descr);
+ $text_descr = str_replace("Switching Processor", "SP", $text_descr);
+ $text_descr = str_replace("Sub-Module", "Module ", $text_descr);
+ $text_descr = str_replace("DFC Card", "DFC", $text_descr);
+
+ # disable short hrDeviceDescr. need to make this prettier.
+ #$text_descr = short_hrDeviceDescr($proc['processor_descr']);
$perc = $proc['processor_usage'];
diff --git a/html/pages/device/overview/temperatures.inc.php b/html/pages/device/overview/temperatures.inc.php
index 1e9744a08..1a865dfd0 100644
--- a/html/pages/device/overview/temperatures.inc.php
+++ b/html/pages/device/overview/temperatures.inc.php
@@ -5,7 +5,7 @@ if(mysql_result(mysql_query("SELECT count(temp_id) from temperature WHERE device
$total = mysql_result(mysql_query("SELECT count(temp_id) from temperature WHERE device_id = '" . $device['device_id'] . "'"),0);
$rows = round($total / 2,0);
echo("");
- echo("
Temperatures
");
+ echo("
Temperatures
");
$i = '1';
$temps = mysql_query("SELECT * FROM temperature WHERE device_id = '" . $device['device_id'] . "'");
echo("