From 476316f7f8782a4d8d9037ff534376a860806f7f Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Sun, 10 Jan 2010 20:20:18 +0000
Subject: [PATCH] html fixes on locations page

git-svn-id: http://www.observium.org/svn/observer/trunk@665 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/topnav.inc |  1 -
 html/pages/locations.php | 25 +++++++++++--------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/html/includes/topnav.inc b/html/includes/topnav.inc
index a7e960737..ff676125a 100644
--- a/html/includes/topnav.inc
+++ b/html/includes/topnav.inc
@@ -85,5 +85,4 @@ if($services['down']) { $services['bgcolour'] = "#ffcccc"; } else { $services['b
     <td> ) </td>
     <td width="5"></td>
   </tr>
-  <tr>
 </table>
diff --git a/html/pages/locations.php b/html/pages/locations.php
index e6a10ed50..8c44c27e7 100644
--- a/html/pages/locations.php
+++ b/html/pages/locations.php
@@ -1,5 +1,5 @@
 <?php
-echo("<table cellpadding=7 cellspacing=0 class=devicetable width=100%>");
+echo('<table cellpadding="7" cellspacing="0" class="devicetable" width="100%">');
 
 if($_SESSION['userlevel'] == '10') {
   $sql = "SELECT `location` FROM `devices` GROUP BY `location` ORDER BY `location`";
@@ -27,21 +27,18 @@ while($device = mysql_fetch_array($device_query)) {
      $hostalerts = mysql_result(mysql_query("SELECT COUNT(device_id) FROM devices AS D, devices_perms AS P WHERE location = '" . $device['location'] . "' AND status = '0'"),0); 
    }
 
-   if($hostalerts) { $alert = "<img src='images/16/flag_red.png'>"; } else { $alert = ""; }
+   if($hostalerts) { $alert = '<img src="images/16/flag_red.png" alt="alert" />'; } else { $alert = ""; }
 
-   $loc = $device[location];
-
-   if($loc != "") { 
-     echo("<table border=0 cellspacing=0 cellpadding=7 class=devicetable width=100%>
-           <tr bgcolor='$bg'>
-             <td class=interface width=300><a class='list-bold' href='?page=devices&location=$device[location]'>$loc</a></td>
-             <td width='100'>$alert</td>
-             <td width='100'>$num devices</td>
-             <td width='100'>$net network</td>
-	     <td width='100'>$srv servers</td>
-             <td width='100'>$fwl firewalls</td>
+   if($device['location'] != "") { 
+     echo('      <tr bgcolor="' . $bg . '">
+             <td class="interface" width="300"><a class="list-bold" href="?page=devices&amp;location=' . urlencode($device['location']) . '">' . $device['location'] . '</a></td>
+             <td width="100">' . $alert . '</td>
+             <td width="100">' . $num . ' devices</td>
+             <td width="100">' . $net . ' network</td>
+	     <td width="100">' . $srv . ' servers</td>
+             <td width="100">' . $fwl . ' firewalls</td>
            </tr>
-         ");
+         ');
 
     $done = "yes";
   }