From 748bd338e52ea7cd9c510d74897a6ba98ef3feae Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Sat, 12 Jun 2010 16:48:53 +0000
Subject: [PATCH] make displaying of per-device health page options menu closer
 to global. add overview icons (bulb)

git-svn-id: http://www.observium.org/svn/observer/trunk@1154 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/images/icons/greyscale/overview.png | Bin 0 -> 694 bytes
 html/images/icons/overview.png           | Bin 0 -> 782 bytes
 html/includes/graphs/storage.inc.php     |   1 +
 html/includes/print-menubar.php          |   3 +--
 html/pages/device/health.inc.php         |  30 ++++++++++++++++-------
 5 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 html/images/icons/greyscale/overview.png
 create mode 100644 html/images/icons/overview.png

diff --git a/html/images/icons/greyscale/overview.png b/html/images/icons/greyscale/overview.png
new file mode 100644
index 0000000000000000000000000000000000000000..88e67645bd5c4c87740511ac2007b2bd188485da
GIT binary patch
literal 694
zcmV;n0!jUeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB9600009a7bBm000id000id0mpBsWB>pF8FWQhbW?9;ba!ELWdKlNX>N2bPDNB8
zb~7$DE;UJt{NMlp0y9ZOK~y+Tm6FMd+CdP9=a5?-AmjmZ3*?dq@E~3?g6ELDKn`97
zPXQ5<gN_Fg1r-q$7jVHPj0>))xFA8n4YyGd-1il&bT!OB%#Z}rP;@n2^>x*+`sU`@
z>U27v8jXgxR;xV}i^W|&pWmlasYyH@|4H_*&*PbMyWM`>YPEj!dOaAA$FN*3VY}VJ
zZnuN^d=3N*kw^r*UT>4Y-aY}5%a`?fJu@5*X#(1My@u6l1&hUk8o~~T0~87cuv)E?
zSS<F6ft1VT@7-<}_WL~z#Qk(S!TEfqhCae3lL_?$fdIH%E*}FR)ZT11V_rWVk2LVn
z@QhU<U^E)RU@!oUMzdo8>2&(A*=%U3_!9c40iF>&oldEtK15*Jo<gCxFaXj|7yHLV
z3?O2H-|vS|C<MV^5S&gYG@DH*l}Z%S@ApBeRQ|3Ykw|>Y<#K?f5;4JOGy)kTHKGsQ
z<#IWYk<u8C#{&j~A<R^e$z)y-VJaAmz1nOxnuM@Qr9yqRT1{KRD(>#?_CBBQ&681*
zHr^5P2qE|P_e=$tT&-5YZnr}=o5kc4nZU<CeyDIb{NCYk49sRTM59p(!Q^Bz2@;6}
zWHQ;(?RIni`Wx|re3B0$k?2TN2C-NSLZJ}&d_HhEoQuh1V*NAu@lqfVJP?sUuh)Z0
zr2?r`3b(hnqpOlJh`gA@--e^b>F9Ji;BvY3s{s~^<ui}R+pyW}3ya0Nkn*=$t@g{+
cfd2{n1xBYHJV~m&SO5S307*qoM6N<$g4p6RssI20

literal 0
HcmV?d00001

diff --git a/html/images/icons/overview.png b/html/images/icons/overview.png
new file mode 100644
index 0000000000000000000000000000000000000000..d22fde8ba46eabd4335e4fa88077e80f96b92d62
GIT binary patch
literal 782
zcmV+p1M&QcP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!ph-kQR5;6(
zlIu%TaTv#a(VOVK(H{^I6cQFlZ%j;$+>0XYhLR!1P*SpVQi>)dUV<_*6qInHGcnEb
zQfX6|c{lO4l#RKaZC-XZ&u-_k%Q@eEE?Qa!_Tt0u@H@}<^E~``A^=3}gr(l4vU*i7
zyV6Lx=4yE7RGGkx6gV71cjvY=iqb#p!ylZn>j-Cf+b>x95wMRT==lzjH$f681f9ze
zR{P)>$i_z3RfAovII&B>n%*Ds>XegyS_9EX5sW0f1d*FX&^tjGBX?Rzej4t{=ddW_
z9h>UH!(o9}TURNVdq{y5qM#$E1yaxnNWKtKkRh^p1YA9U=z#4*HY{(h_k{(nnF>pQ
znJ2Y6(rFb^z)nJ2p<svrP5v2);3J_8f^`b|7cqQTu=VwkPvlk+WXBQYX2|$jGWG(3
z?pYF;ByTW+fcrB9+bi(aJcwQj%ay03u)wa)HTyOvNcTnX<|5Le987mQm|i)Uo($Mq
zW#BDkVD&fPr>nqIQ&_2v{yl+xxUhm5uO{Q#!J8DY)klFd<r5x&HOR?%A8X|Y;aN(A
zB<W#o&xN60HWU^(M@tWE_R5z%i!I~<^`M(#LSfF51(r$!XUxM!O(aBi7_M&}(3Tz(
zES<SWckKcFr7&u}BbD|nw8Gh$`BOkTZ-+VKJ=mLNU^ETTmK+aIZJ9U!TBL1kpYl%|
zRJYgH8WX{*lOe7pLA1sppt%e~Q6%QdqTS~9JBfR4;xC3&Pm*gNXZV|IAEK`6ES{E}
zK|xMBuEn2})XI``|6Jvr6f5MEvZWPDWgF`18&Uo2C9WjL(|gtKDNy9x8XXuMgv~}{
zdU^)0o0^d#i`DI0FrcbPOSyD`O-MK|#l^)+7n5SS?uO#5eGC4FA2kmZ^8r4%O#lD@
M07*qoM6N<$f{2b{H2?qr

literal 0
HcmV?d00001

diff --git a/html/includes/graphs/storage.inc.php b/html/includes/graphs/storage.inc.php
index 6b0f483a9c..c56c195d62 100644
--- a/html/includes/graphs/storage.inc.php
+++ b/html/includes/graphs/storage.inc.php
@@ -22,6 +22,7 @@ $rrd_options .= " -b 1024";
     $rrd_options .= " DEF:$storage[storage_id]free=$rrd:free:AVERAGE";
     $rrd_options .= " CDEF:$storage[storage_id]size=$storage[storage_id]used,$storage[storage_id]free,+";
     $rrd_options .= " CDEF:$storage[storage_id]perc=$storage[storage_id]used,$storage[storage_id]size,/,100,*";
+
     $rrd_options .= " LINE1.25:$storage[storage_id]perc#" . $colour . ":'$descr'";
     $rrd_options .= " GPRINT:$storage[storage_id]size:LAST:%6.2lf%sB";
     $rrd_options .= " GPRINT:$storage[storage_id]free:LAST:%6.2lf%sB";
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index f0d5fa7122..e060ffb50e 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -23,10 +23,9 @@
 
 <div class="menu2">
 <ul>
-<li><a class="menu2four" href="overview/"><img src="images/16/lightbulb.png" border="0" align="absmiddle" /> Status</a>
+<li><a class="menu2four" href="overview/"><img src="images/16/lightbulb.png" border="0" align="absmiddle" /> Overview</a>
         <table><tr><td>
         <ul>
-        <li><a href="overview/"><img src="images/16/zoom.png" border="0" align="absmiddle" /> Overview</a></li>
         <?php if (isset($config['enable_map']) && $config['enable_map']) {
           echo('<li><a href="map/"><img src="images/16/map.png" border="0" align="absmiddle" /> Network Map</a></li>');
         } ?>
diff --git a/html/pages/device/health.inc.php b/html/pages/device/health.inc.php
index c22e503882..c6443c00df 100644
--- a/html/pages/device/health.inc.php
+++ b/html/pages/device/health.inc.php
@@ -9,6 +9,7 @@ $volts = mysql_result(mysql_query("select count(*) from voltage WHERE device_id
 $freqs = mysql_result(mysql_query("select count(*) from frequency WHERE device_id = '" . $device['device_id'] . "'"), 0);
 $current = mysql_result(mysql_query("select count(*) from current WHERE device_id = '" . $device['device_id'] . "'"), 0);
 
+$datas[] = 'overview';
 if ($processor) { $datas[] = 'processors'; }
 if ($memory) { $datas[] = 'memory'; }
 if ($storage) { $datas[] = 'storage'; }
@@ -18,6 +19,8 @@ if ($volts) { $datas[] = 'voltages'; }
 if ($freqs) { $datas[] = 'frequencies'; }
 if ($current) { $datas[] = 'current'; }
 
+
+$type_text['overview'] = "Overview";
 $type_text['temperatures'] = "Temperatures";
 $type_text['memory'] = "Memory Pools";
 $type_text['storage'] = "Disk Usage";
@@ -29,15 +32,22 @@ $type_text['current'] = "Current";
 
 print_optionbar_start();
 
-if(!$_GET['opta']) { echo("<b>"); }
-echo("<a href='".$config['base_url']."/device/" . $device['device_id'] . "/health/'>Main</a>\n");
-if(!$_GET['opta']) { echo("</b>"); }
-
+if(!$_GET['opta']) { $_GET['opta'] = "overview"; }
 
+unset($sep);
 foreach ($datas as $type) {
-  if ($_GET['opta'] == $type) { echo("<strong>"); }
-  echo(" | <a href='".$config['base_url']."/device/" . $device['device_id'] . "/health/" . $type . "/'>" . $type_text[$type] ."</a>\n");
+
+  echo($sep);
+
+  if ($_GET['opta'] == $type) {
+    echo("<strong>");
+    echo('<img src="images/icons/'.$type.'.png" class="optionicon" />');
+  } else {
+    echo('<img src="images/icons/greyscale/'.$type.'.png" class="optionicon" />');
+  }
+  echo("<a href='".$config['base_url']."/device/".$device['device_id']."/health/" . $type . "/" . $_GET['optb']. "/'> " . $type_text[$type] ."</a>\n");
   if ($_GET['opta'] == $type) { echo("</strong>"); }
+  $sep = " | ";
 }
 
 print_optionbar_end();
@@ -47,9 +57,11 @@ if (is_file("pages/device/health/".mres($_GET['opta']).".inc.php"))
    include("pages/device/health/".mres($_GET['opta']).".inc.php"); 
 } else { 
   foreach ($datas as $type) {
-    $graph_title = $type_text[$type];
-    $graph_type = "device_".$type;
-    include ("includes/print-device-graph.php"); 
+    if($type != "overview") {
+      $graph_title = $type_text[$type];
+      $graph_type = "device_".$type;
+      include ("includes/print-device-graph.php"); 
+    }
   }
 }