From 94eb372945ed32aeb8c10fa58383f130b3d802d0 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Thu, 5 Dec 2013 11:47:19 +0000
Subject: [PATCH 1/4] $subformat was being set rather than checked in if
 statement

Line 266, changed = to == so the if statement works.
---
 html/pages/devices.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/pages/devices.inc.php b/html/pages/devices.inc.php
index 173525d93..dcd263224 100644
--- a/html/pages/devices.inc.php
+++ b/html/pages/devices.inc.php
@@ -263,7 +263,7 @@ if($format == "graph")
 } else {
 
   echo('<table cellspacing="0" class="devicetable sortable" width="100%">');
-  if ($subformat = "detail")
+  if ($subformat == "detail")
   {
     echo('<tr class="tablehead">
     <th></th>

From 5cce6fd773c695a82d59ea35b02e82c955e1a64c Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Thu, 5 Dec 2013 12:12:02 +0000
Subject: [PATCH 2/4] Update INSTALL_RHEL.md

---
 doc/INSTALL_RHEL.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/INSTALL_RHEL.md b/doc/INSTALL_RHEL.md
index 34ce98c77..83fdcd147 100644
--- a/doc/INSTALL_RHEL.md
+++ b/doc/INSTALL_RHEL.md
@@ -90,7 +90,7 @@ First, create and chown the `rrd` directory and create the `logs` directory
 
 Note that if you're not running Ubuntu, you may need to change the owner to whomever the webserver runs as.
 
-Next, add the following to `/etc/apache2/sites-available/librenms.conf`
+Next, add the following to `/etc/httpd/conf.d/librenms.conf`
 
     <VirtualHost *:80>
       DocumentRoot /opt/librenms/html/

From 29a35feea4944bc505df002cf8e976190177627f Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Thu, 5 Dec 2013 22:22:22 +0000
Subject: [PATCH 3/4] Updated hostbox-basic.inc.php as number of <td>'s were
 incorrect

Added 3 <td>'s to resolve table formatting and ensure view looks consistent with details page.
---
 html/includes/hostbox-basic.inc.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/html/includes/hostbox-basic.inc.php b/html/includes/hostbox-basic.inc.php
index e4bd2b991..3a8d5a208 100644
--- a/html/includes/hostbox-basic.inc.php
+++ b/html/includes/hostbox-basic.inc.php
@@ -28,9 +28,16 @@ $device['os_text'] = $config['os'][$device['os']]['text'];
 
 echo('  <tr class="'.$class.'" bgcolor="' . $bg . '" onmouseover="this.style.backgroundColor=\'#fdd\';" onmouseout="this.style.backgroundColor=\'' . $bg . '\';"
           onclick="location.href=\'device/'.$device['device_id'].'/\'" style="cursor: pointer;">
+          <td width="1" style="background-color: '.$table_tab_colour.';"></td>
+          <td width="40" class="paddedcell" align="center" valign="middle">' . $image . '</td>
           <td width="300"><span style="font-size: 15px;">' . generate_device_link($device) . '</span></td>'
         );
 
+echo('<td width="55">');
+if ($port_count) { echo(' <img src="images/icons/port.png" align=absmiddle /> '.$port_count); }
+echo('<br />');
+if ($sensor_count) { echo(' <img src="images/icons/sensors.png" align=absmiddle /> '.$sensor_count); }
+echo('</td>');
 echo('    <td>' . $device['hardware'] . ' ' . $device['features'] . '</td>');
 echo('    <td>' . $device['os_text'] . ' ' . $device['version'] . '</td>');
 echo('    <td>' . formatUptime($device['uptime'], 'short') . ' <br />');

From 08d6087d60e3dfa89f4c7141ec96d4a70783927d Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Thu, 5 Dec 2013 22:24:58 +0000
Subject: [PATCH 4/4] Fixed detail/basic view code so this now runs correctly

Added || $subformat == "basic" to if statement that checked for just details view before.
---
 html/pages/devices.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/pages/devices.inc.php b/html/pages/devices.inc.php
index dcd263224..99c832da8 100644
--- a/html/pages/devices.inc.php
+++ b/html/pages/devices.inc.php
@@ -263,7 +263,7 @@ if($format == "graph")
 } else {
 
   echo('<table cellspacing="0" class="devicetable sortable" width="100%">');
-  if ($subformat == "detail")
+  if ($subformat == "detail" || $subformat == "basic")
   {
     echo('<tr class="tablehead">
     <th></th>