From c231ce7a139bf518fcbdeecbb25654b1bae6595b Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Sat, 12 Jun 2010 15:18:12 +0000
Subject: [PATCH] newer icons, clean up style of some health pages

git-svn-id: http://www.observium.org/svn/observer/trunk@1151 61d68cd4-352d-0410-923a-c4978735b2b8
---
 discovery.php                           |   2 +-
 html/images/icons/greyscale/storage.png | Bin 607 -> 766 bytes
 html/images/icons/storage.png           | Bin 644 -> 793 bytes
 html/pages/health/processors.inc.php    |   2 ++
 html/pages/health/storage.inc.php       |   2 +-
 html/pages/health/temperatures.inc.php  |   4 +++-
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/discovery.php b/discovery.php
index 5873a9bd69..a231c76941 100755
--- a/discovery.php
+++ b/discovery.php
@@ -41,7 +41,7 @@ if(!$where) {
 
 if (file_exists('.svn'))
 {
-  list(,$dbu_rev) = split(': ',@shell_exec('svn info database-update.sql|grep ^Revision'));
+  list(,$dbu_rev) = preg_split('/: /',@shell_exec('svn info database-update.sql|grep ^Revision'));
 
   $device_query = mysql_query("SELECT revision FROM `dbSchema`");
   if ($rev = @mysql_fetch_array($device_query)) 
diff --git a/html/images/icons/greyscale/storage.png b/html/images/icons/greyscale/storage.png
index 6034d45d99dca4d76a9a94771d00fa0d9126bf95..6c0f1b978cb8ef5e4448daac13b10b270d63cba2 100644
GIT binary patch
delta 671
zcmV;Q0$}~$1pWn(NDB?t000fv0g!KboRL!}e*$hvL_t(IPnD9(PFhhEhIiU`X!;cG
z$VYI_K*dBK!9?41(%`_Ti6MrhVjMWYFu)n1BL#J$2{xh<1R){<g52aHaud1wcl{?h
z#-<~8vd%espZ$Mpt$%N&WL#ceuK4}_;mOGfyk0L34-av0Z~(X4jh&sH|6+G{x9{<I
ze^#hf7Z(>FMLg*D`{;B!h{a+k7K=zGlj!w&Xt&$AzrRN|o5k(zEfR?Ya=9F#Lx~US
z?Ck8b&*y7H#?{poU)rFM07CiQY&KD=)sRl7Q7)HRT}J?))ba80R{_*1Vg`<vmlxdK
z-9akTvOhmRqt$9@0KN&37V84|qNLx^f78>`8byP_0MTd^fj|J&YE_%F3LTKiWN>qH
zgG!}BpK1aaRYICRKR<7BBh6zL!iK{k=u5ZTeFfC(bsQZXA)n7fDsKv4TFK*kC=}`m
z1cgFD6EXAK!8Mjn0J9S!-t|QLLx~v{nimd-wN1>(czAetHISw2CURXoLogVmf04h`
z{{Fs`ebFptqT>u6+x7J|;_<i!V|KR3f2mXokw^q`7k(4)hiA?W>|H+vy?6aM^?z)y
zR4Qrky}do3l1H3pOV=MCAMy0`^iTh9Cyho!6Z4|+LP-TFC66lm;Wef~ESE4nIOjUg
zUKi5?nl2tRl+)?#vrm@zo}k9%e{v1f#KdH6d3hNlBO@>v449dj!Q$c~tX3<wwzjan
zy$y%M0lVFf&CN}$t*yagv0!Ow38Jkiqj54eH}?%DlL-q83m|NDbrl;M8?f1I8id02
z^>vudW^K>>{5)o7X9)<X@p0qNv9XD+ME{-9k^NJD0Sft0e_aflf&c&j2>?k&PDHLk
FV1o8KKa>Cf

delta 510
zcmV<a0RjI01>XdaNDB_b000id0mpBsWRX)Re*w=)L_t(IPtB9LYcf$3#nbr*rAeDI
zf5B8P;4&(RIG~7#AOx`!6)h~>Ku|#}+_05#!=-S+1$P?-K`_>yygS9@3rY7i892;k
z=FRV(bKje%r$2SM-R>7AP7nmnY&LT|&vPb|iL+X*oX6wgg25mc3WZ*NHSKgd6~$ul
zf1_HhB9TZS8jT{AN+Flap;RiN(P&^kpQF?1e1yYc#SaMU@K&i*z&gO?a=~acLZ{Qg
z;cy@liJ(@iNr2PoL~GuD0GRbCvk0%(3%lJ8i^T#KLlTPs_8x&i0GUh%e!oBZ4Zu1n
znB6ON==b~RcDrO%R<GB?Xf(oVwZi3ce?dN<zp^=f#b9<{7mEd^(<x~2zW}NUIv$U)
z*=%sVUU5F3$>po;g5`gwhqUN7z+f=IWHP~Sx5Mpr!{hOQ&*yuW0r7ZTBszWEYPHa8
zHX(|lB&sRSa5%(lHpB6F#QlCpGMN-*0Ly=*2-$2Fu~<w}xm?D6zn4YxNvG2&XcP)q
zE|*jvWq{3Q6YBN)gB*~^GR=dAwqCEX-EMI>9Hg4IvE6Pz*trqD?SxXPd{(JcI<;EO
zlUOa?Ng9oY*J`!A!C+vAlh^6>`sY9O3;my&Psz-XvwmpLk^lez07*qoM6N<$f-2wo
AIsgCw

diff --git a/html/images/icons/storage.png b/html/images/icons/storage.png
index 79bf874f14b6e02074ef76330d51f89ea5af09d0..5dd9b8beae525bb335236b2c5203a9ac56f80c5e 100755
GIT binary patch
delta 770
zcmV+d1O5Dj1(^nrBYyw{b3#c}2nYxWd<bNS00009a7bBm000fw000fw0YWI7cmMzZ
z8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10+vZcK~y-6jgrf1BUcnf
z*L~DOE|(symej~Ho)~O!+j!RG2mC4igoeyA%cTDy-=Kki!GB|8;gO9nN(X}}gC3T2
ztM09PGYAnRO&}Z2?65dz?=3<I+}zy!T2<9oYprz7;he)-i*pX|J^z*v!bvH=U0+}S
zEXL!ps_VMExVTVtT{D}_Xti3b*K0<j5zaZ5%jFL0y(djm?(Xh95NT^|&wF1*QPg;P
zdgAo-lswOQeSdugKuSro*`%&(>bhpJSP;iCQcCN+|0t`f8UPj`O;fbiESF1)qF^$a
zFrUv6LLh_ypxf;NptUZ6Pug1BkD@4e?>Rg?<l*6g?RLx2(GkPp5br&8T?4RMtuV&W
z>2!#qC{$H7(AL_4lu|k8xV^pQ^74{qvq=a6?>!-eoqu`FW|Qf3N|t3rQKW!@tg5OX
z$8mChf6vLu30aomy+<iUtJNaUbF|hw$l2K$kB^VUahw33w3PB7ilRtLNuKAs*cOWg
z#u&W!yuH2AZnp^`AcP=IQ{p&|q?9AAlseK{)9G|bk_2ll0Nd@Bq9{;G(dl${;6|gt
zU@&04UVkHmIMTpSDMh2vKq<xE-X3LH((Co;cDsZS&|0IlCQVZ|o6T-V2r<+lguYVh
z9~tL)PL^dPNdkZ|24f6GQDBVOK|=@w9YXjppU-)DdExl@7-I}&S?){=A^b4U&(A2O
z2qApX@9*z<mSvoupa0PL|5C5lV>+EOo6YvbmwPWi%`YxKx5nc!2L}g?MkD(DKJ9j!
z{r!ECBq4-=bB?ksF~;DWW3$;XnLNB{A$To{x7O9w6;TwSwI)fDzfYtrORTk2RmEnr
zVY}VpoMW|G0sOAL55Il?{>LwX{NF$Pr5gD5C)C?uK$*|tng9R*07*qoM6N<$g5z#=
AZU6uP

delta 620
zcmV-y0+aoj280EWBYy%*Nkl<Zc-qC&TSyd97zgnGT%6gRnZ3*=*{YdP_Fy5YEeJ{E
z8s+v-h!ugbhzXI<LlIGIP;?;>%Y-hn3(-TMp!QT6W@TVl4^c~m8YDzUwyvwT>t39l
znPz5TVd*iUc{$9v{NVq6=MebEk62Tn{`NqPMADlgs}h!^G=C&T1*z?@&@>7;7Ns^0
zd8+&^;B9#O7vS#fW%pHX3sYuJn2tm-FUzoMhpY^Z0-8cGXTlayKzMmMHWHl5@9}z4
zIe@3T-&0?;V`$<>1XGJqe2FI^r4<xe&2SaiQ0sKS<rGn9F{9(@>jMF=XE+CF=<2&y
zv`#!Z7mXvFNPi)sMNnkbSYv4t1!g^hfKrEm$)EH0`%W~rXMu|I-R$9=<#R{2m)c`1
zG015ds;Xu~QWOQ2VZrkp>^2)7zWcoN<m2>)F<)EC0IGd=>K?Qnd`YL`h{xlQWhDy`
z1d#zuECim1Xt(3HR@~$M$L`S!t*;E=P}iet{^tF@Uw@%_Boj#}N-jWaT`=i@AiyEo
zwUI}2&%pKG_M;aKz}G)A-r_3X6<Sz?BuU2METHv~A}KHo1GCv=Ao-#dH;2dHTxr@{
zYXFxAUwm(>*jzk1IfGCv0aBYQTQ8z+Yf1KwtR$B)G!uZGaiXT=7zRImoxRlP-e>@O
zuKLfk?Pad&blP}ApP)z*Jd+1by90UzQv28Iuqr1Ya25n-7u37YC(b@Q*K#Y{#<J5L
z)!ODtiXbRJkD%wzv>{W-45DR{RYm;}ym9LN+P{VW0{j8&(ajN7<@=}r0000<MNUMn
GLSTYuyefA9

diff --git a/html/pages/health/processors.inc.php b/html/pages/health/processors.inc.php
index 8d4ee63680..781aa32eaf 100644
--- a/html/pages/health/processors.inc.php
+++ b/html/pages/health/processors.inc.php
@@ -8,6 +8,8 @@
 
    if(devicepermitted($proc['device_id'])) { 
 
+    if(!is_integer($i/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
+
     $device = $proc;
 
     $text_descr = $proc['processor_descr'];
diff --git a/html/pages/health/storage.inc.php b/html/pages/health/storage.inc.php
index fd49ae19fc..f2166d13a9 100644
--- a/html/pages/health/storage.inc.php
+++ b/html/pages/health/storage.inc.php
@@ -6,7 +6,7 @@ $sql  = "SELECT * FROM `storage` AS S, `devices` AS D WHERE S.device_id = D.devi
 $query = mysql_query($sql);
 
 echo("<div style='padding: 5px;'>
-        <table width=100% cellspacing=0 cellpadding=2>");
+        <table width=100% cellspacing=0 cellpadding=6>");
 
 echo("<tr class=tablehead>
         <th width=280>Device</th>
diff --git a/html/pages/health/temperatures.inc.php b/html/pages/health/temperatures.inc.php
index 830b64ba68..4c1847e491 100644
--- a/html/pages/health/temperatures.inc.php
+++ b/html/pages/health/temperatures.inc.php
@@ -8,7 +8,7 @@ if($_SESSION['userlevel'] >= '5') {
 
 $query = mysql_query($sql);
 
-echo('<table cellspacing="0" cellpadding="2" width="100%">');
+echo('<table cellspacing="0" cellpadding="6" width="100%">');
 
 echo('<tr class=tablehead>
         <th width="280">Device</th>
@@ -30,6 +30,8 @@ while($temp = mysql_fetch_array($query))
   $temp_popup = "<a onmouseover=\"return overlib('<img src=\'$weekly_temp\'>', LEFT);\" onmouseout=\"return nd();\">
         " . $temp['temp_descr'] . "</a>";
 
+  $temp['temp_current'] = round($temp['temp_current'],1);
+
   $temp_perc = $temp['temp_current'] / $temp['temp_limit'] * 100;
   $temp_colour = percent_colour($temp_perc);