From 3315713bf9ceace448531b9c868f220e5a2eea87 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Wed, 9 Jun 2010 16:43:09 +0000
Subject: [PATCH] alphabetically order hosts on processor and memory health
 status pages instead of having them scattered around ungrouped

git-svn-id: http://www.observium.org/svn/observer/trunk@1110 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/pages/health/memory.inc.php     |  2 +-
 html/pages/health/processors.inc.php | 41 ++++++++++++++--------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/html/pages/health/memory.inc.php b/html/pages/health/memory.inc.php
index a4388159b..4066a4b52 100644
--- a/html/pages/health/memory.inc.php
+++ b/html/pages/health/memory.inc.php
@@ -3,7 +3,7 @@
   echo("<div style='margin-top: 5px; padding: 0px;'>");
   echo("<table width=100% cellpadding=6 cellspacing=0>");
   $i = '1';
-  $mempools = mysql_query("SELECT * FROM `mempools` AS M, `devices` as D WHERE D.device_id = M.device_id");
+  $mempools = mysql_query("SELECT * FROM `mempools` AS M, `devices` as D WHERE D.device_id = M.device_id ORDER BY D.hostname");
   while($mempool = mysql_fetch_array($mempools)) {
    if(devicepermitted($mempool['device_id'])) {
     if(!is_integer($i/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
diff --git a/html/pages/health/processors.inc.php b/html/pages/health/processors.inc.php
index 744fead04..24f31066a 100644
--- a/html/pages/health/processors.inc.php
+++ b/html/pages/health/processors.inc.php
@@ -1,9 +1,9 @@
 <?php
 
   echo("<div style='margin-top: 5px; padding: 0px;'>");
-  echo("<table width=100% cellpadding=6 cellspacing=0>");
+  echo("  <table width=100% cellpadding=6 cellspacing=0>");
   $i = '1';
-  $procs = mysql_query("SELECT * FROM `processors` AS P, `devices` AS D WHERE D.device_id = P.device_id");
+  $procs = mysql_query("SELECT * FROM `processors` AS P, `devices` AS D WHERE D.device_id = P.device_id ORDER BY D.hostname");
   while($proc = mysql_fetch_array($procs)) {
 
    if(devicepermitted($proc['device_id'])) { 
@@ -33,17 +33,15 @@
     } elseif($perc > '25') { $left_background='5b93bf'; $right_background='92b7d3';
     } else { $left_background='9abf5b'; $right_background='bbd392'; }
 
-    echo("<tr bgcolor=$row_colour>
-           <td>".generatedevicelink($proc)."</td>
-
-           <td class=tablehead><a href='".$proc_url."' $proc_popup>" . $text_descr . "</a></td>
-           <td width=90><a href='".$proc_url."'  $proc_popup><img src='$mini_url'></a></td>
-           <td width=200><a href='".$proc_url."' $proc_popup>
-           ".print_percentage_bar (400, 20, $perc, $perc."%", "ffffff", $left_background, (100 - $perc)."%" , "ffffff", $right_background)."
-            </a></td>
-         </tr>");
+    echo("    <tr bgcolor=\"$row_colour\">
+               <td>".generatedevicelink($proc)."</td>
+               <td class=\"tablehead\"><a href='".$proc_url."' $proc_popup>" . $text_descr . "</a></td>
+               <td width=\"90\"><a href=\"".$proc_url."\"  $proc_popup><img src=\"$mini_url\" /></a></td>
+               <td width=\"200\"><a href=\"".$proc_url."\" $proc_popup>
+           ".print_percentage_bar (400, 20, $perc, $perc."%", "ffffff", $left_background, (100 - $perc)."%" , "ffffff", $right_background).'</a></td>
+             </tr>');
  
-  echo("<tr bgcolor='$row_colour'><td colspan=5>");
+  echo('    <tr bgcolor="'.$row_colour.'"><td colspan="5">');
 
   $daily_graph   = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$day&to=$now&width=211&height=100";
   $daily_url     = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$day&to=$now&width=400&height=150";
@@ -57,15 +55,16 @@
   $yearly_graph  = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$year&to=$now&width=211&height=100";
   $yearly_url    = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$year&to=$now&width=400&height=150";
 
-  echo("<a onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT);\" onmouseout=\"return nd();\">
-        <img src='$daily_graph' border=0></a> ");
-  echo("<a onmouseover=\"return overlib('<img src=\'$weekly_url\'>', LEFT);\" onmouseout=\"return nd();\">
-        <img src='$weekly_graph' border=0></a> ");
-  echo("<a onmouseover=\"return overlib('<img src=\'$monthly_url\'>', LEFT);\" onmouseout=\"return nd();\">
-        <img src='$monthly_graph' border=0></a> ");
-  echo("<a onmouseover=\"return overlib('<img src=\'$yearly_url\'>', LEFT);\" onmouseout=\"return nd();\">
-        <img src='$yearly_graph' border=0></a>");
-  echo("</td></tr>");
+  echo("      <a onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT);\" onmouseout=\"return nd();\">
+        <img src="$daily_graph" border=\"0\"></a> ");
+  echo("      <a onmouseover=\"return overlib('<img src=\'$weekly_url\'>', LEFT);\" onmouseout=\"return nd();\">
+        <img src="$weekly_graph" border=\"0\"></a> ");
+  echo("      <a onmouseover=\"return overlib('<img src=\'$monthly_url\'>', LEFT);\" onmouseout=\"return nd();\">
+        <img src="$monthly_graph" border=\"0\"></a> ");
+  echo("      <a onmouseover=\"return overlib('<img src=\'$yearly_url\'>', LEFT);\" onmouseout=\"return nd();\">
+        <img src=\"$yearly_graph\" border=\"0\"></a>");
+  echo("  </td>
+  </tr>");
 
     $i++;
    }