From d9b1cce70bc2a94548052fd07167dc462f60952b Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Thu, 11 Mar 2010 03:38:22 +0000
Subject: [PATCH] add some nice new icons for overview. are they nice? i don't
 know. they're certainly nicer than a kick in the balls though, eh?

git-svn-id: http://www.observium.org/svn/observer/trunk@1003 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/images/icons/cpuload.png                   | Bin 0 -> 611 bytes
 html/images/icons/mempool.png                   | Bin 0 -> 544 bytes
 html/pages/device/overview/mempools.inc.php     |   6 +++---
 html/pages/device/overview/processors.inc.php   |  10 ++++++++--
 html/pages/device/overview/temperatures.inc.php |   2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 html/images/icons/cpuload.png
 create mode 100644 html/images/icons/mempool.png

diff --git a/html/images/icons/cpuload.png b/html/images/icons/cpuload.png
new file mode 100644
index 0000000000000000000000000000000000000000..8734e777a1799c9a9d0293d692b3549f2506f418
GIT binary patch
literal 611
zcmV-p0-XJcP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)d~|4Iy9fcBxe8s0q{vg
zK~y-)rIS5q6hRn<pWT_A-MzvTA`;O{VGKghNCE*NU}1A$5hQA~5mH!*!A21eE`_A9
zvN3{{R)&*Eh*+FLDjPvWJxR0)f(P-=Gzx-uJAW22F(D^PeBoufXP)8vCMcDP4}f!Q
zBi{RIN~NN2wVJ-!YWly$Ip;H-t+!MvdbviMxI0g|QvIi!M+=9!aH0nQ2@pk!a;1vu
z03~CH6labuLl83irVE@0JQ#~MhH|CK_~||X!i{7Vr$lMW*`YcYhX)Z#k|qghE=46N
zBA1XP2>{lZ-v(<DDn=wR{XKgKa|Qal8>r|Lj~5OgyaOZ2LJfeicB?^@C`JZr?Az7B
z%cTZg`BR8Uk|Z%vq7ZR}iq)SDP7c%v1Bu8L;M*)gFoKYRtH+<SP~VNS4(lvaZv%{N
z1GqeToq&LkwHe+oe<i;c4&`@pq|-3iH;(rJo~iq{+5>LS+(amWlo3J-J~!s*-9O61
z*EP)dJ6L0}#{PPO-3oZ}uA3-Ts8|uj3L!smu=5$dStASro-Xy${E-2R?G0dc-WEsb
z9nLu}J?g;u9cXRPR%3Ci1{(odXN(OGaBuF_CfwpYz>Bt<xbkIXv%!_~LtGm>hSnKb
xD?=NN)@$d68cm~7Ux!IxdUEo{_J8C5<|lAN08`nh^nm~X002ovPDHLkV1lX$`TPI?

literal 0
HcmV?d00001

diff --git a/html/images/icons/mempool.png b/html/images/icons/mempool.png
new file mode 100644
index 0000000000000000000000000000000000000000..958d85abf7d1e56027f28a957b0b5bc0307db161
GIT binary patch
literal 544
zcmV+*0^j|KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005!Nkl<Zc-muR
z00KKZyZ;PmfQgBTfti^(laZ0}^PfL|mi+to4_yhvp+kol8DR#*#l>MLSiXEYn2wB$
z#E@IGXc58yb93|mDJdxoTeofn*$P+W=;#Qh_wV12qS?d4gJI5`ISeOHo@8WPv}V_T
zZ%0#x8~2|w^tIQcDE#~PFPKI)6a<PY8yPedr5U#FKh1#Q0%Cx-w>QEC^H*&B?_y)b
z@bKv?hK}ZH6osOqqG0;<>(?ma6}7Dl^3q}qdybrgxIj-&?|)WS7Q==O8&DMT@bG}?
zFJHc(hzA4&Fie{^jp5RzON@+j7H{}(ZK})g`rSu{#@bS%yiniV%^)ho&v5kgWrz!u
zl$8D#6%{e8TD6KO1H!_>82bA981CJ>$H+Ki-m3q`dKwI0zW-pTEX^azfcEZ53_P41
z3}-LhfVe<hT>O7UMFqo>B}-5g0>cJO1O1939upJ8(9zMs@bcwLM#iZ#m;Tq*P-gi1
z|35=vUOI|GV`F15efI2G6!HE^GZ~nHY4GZeyAT%uL;HV2Lj%LSdGm<!LQ+x^14unE
zb{H8aPh0d~RYie;g@u_RD<hF81E$TG&+zBZUxwRv9za|GOsfCe+uMoK3<H&wm7t^!
i$xJ}-pCsJ~zz6_Fm$Q7Mh&-SG0000<MNUMnLSTYI!vK{4

literal 0
HcmV?d00001

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("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
-  echo("<p style='padding: 0px 5px 5px;' class=sectionhead>Memory Pools</p>");
+  echo("<p style='padding: 0px 5px 5px;' class=sectionhead><img align='absmiddle' src='".$config['base_url']."/images/icons/mempool.png'> Memory Pools</p>");
   echo("<table width=100% cellspacing=0 cellpadding=5>");
   $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("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
-  echo("<p style='padding: 0px 5px 5px;' class=sectionhead>Processors</p>");
+  echo("<p style='padding: 0px 5px 5px;' class=sectionhead><img align='absmiddle' src='".$config['base_url']."/images/icons/cpuload.png'> Processors</p>");
   echo("<table width=100% cellspacing=0 cellpadding=5>");
   $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("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
-  echo("<p class=sectionhead>Temperatures</p>");
+  echo("<p class=sectionhead><img align='absmiddle' src='".$config['base_url']."/images/icons/temperature.png'> Temperatures</p>");
   $i = '1';
   $temps = mysql_query("SELECT * FROM temperature WHERE device_id = '" . $device['device_id'] . "'");
   echo("<table width=100% valign=top>");