From 4ac6e31d40dd8e9658d09a5b30fbbef78e2b4522 Mon Sep 17 00:00:00 2001
From: Paul Gear <github@libertysys.com.au>
Date: Tue, 29 Oct 2013 08:22:08 +1000
Subject: [PATCH 1/5] First layout fix attempt

---
 html/includes/header.inc.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/html/includes/header.inc.php b/html/includes/header.inc.php
index 0e52cf957..46fbb7f77 100644
--- a/html/includes/header.inc.php
+++ b/html/includes/header.inc.php
@@ -1,13 +1,16 @@
 
+<div id="gumax-header">
+  <div id="gumax-p-logo">
 <?php
 if ($config['title_image'])
 {
 ?>
-<div id="gumax-header">
-  <div id="gumax-p-logo">
     <div id="p-logo">
       <a style="background-image: url('<?php echo($config['title_image']); ?>');" accesskey="z" href=""></a>
     </div>
+<?php
+}
+?>
     <script type="text/javascript"> if (window.isMSIE55) fixalpha(); </script>
   </div>
   <!-- end of gumax-p-logo -->
@@ -16,7 +19,6 @@ if ($config['title_image'])
   <div id="gumax-p-login">
 
 <?php
-}
 
 $toggle_url = preg_replace('/(\?|\&)widescreen=(yes|no)/', '', $_SERVER['REQUEST_URI']);
 if (strstr($toggle_url,'?')) { $toggle_url .= '&amp;'; } else { $toggle_url .= '?'; }

From c0a6f7808a85001b0afbbca781e128d75645fd27 Mon Sep 17 00:00:00 2001
From: pandom <anthonyburke@anthonyburke.net>
Date: Tue, 29 Oct 2013 09:27:24 +1100
Subject: [PATCH 2/5] Update INSTALL.md

Updated aptitude to apt-get install mysql-server mysql-client snmpd.
Dropped sudo - assumption user is authorized.
---
 INSTALL.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/INSTALL.md b/INSTALL.md
index 10547911e..3f23c3edd 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -3,7 +3,7 @@ NOTE: These instructions assume you are using a separate server for your databas
 
 ## On the DB Server ##
 
-    aptitude install mysql-server mysql-client snmpd
+    apt-get install mysql-server mysql-client snmpd
     mysql -uroot -p
 
 enter root mysql password

From e4dd93baed0ffa405ec58179c4715a0e5515387b Mon Sep 17 00:00:00 2001
From: Paul Gear <github@libertysys.com.au>
Date: Tue, 29 Oct 2013 08:38:20 +1000
Subject: [PATCH 3/5] Use project name in the absence of a logo

---
 html/includes/header.inc.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/html/includes/header.inc.php b/html/includes/header.inc.php
index 46fbb7f77..033e2c7e9 100644
--- a/html/includes/header.inc.php
+++ b/html/includes/header.inc.php
@@ -1,16 +1,18 @@
 
 <div id="gumax-header">
   <div id="gumax-p-logo">
-<?php
-if ($config['title_image'])
-{
-?>
     <div id="p-logo">
-      <a style="background-image: url('<?php echo($config['title_image']); ?>');" accesskey="z" href=""></a>
-    </div>
 <?php
-}
+      if ($config['title_image'])
+      {
+        echo('<a style="background-image: ' . $config['title_image'] . '" accesskey="z" href=""></a>');
+      }
+      else
+      {
+        echo('<h2>'.$config['project_name'].'</h2>');
+      }
 ?>
+    </div>
     <script type="text/javascript"> if (window.isMSIE55) fixalpha(); </script>
   </div>
   <!-- end of gumax-p-logo -->

From e9005d6ba83f984585ac505342e7a374d2135280 Mon Sep 17 00:00:00 2001
From: Paul Gear <github@libertysys.com.au>
Date: Tue, 29 Oct 2013 08:40:20 +1000
Subject: [PATCH 4/5] Add link to project name

---
 html/includes/header.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/includes/header.inc.php b/html/includes/header.inc.php
index 033e2c7e9..069ae6203 100644
--- a/html/includes/header.inc.php
+++ b/html/includes/header.inc.php
@@ -9,7 +9,7 @@
       }
       else
       {
-        echo('<h2>'.$config['project_name'].'</h2>');
+        echo('<a href=""><h2>'.$config['project_name'].'</h2></a>');
       }
 ?>
     </div>

From 4eb90d1eb553806965702e46f4d8b3c840d5b06e Mon Sep 17 00:00:00 2001
From: Tyler Christiansen <tyler.christiansen@outlook.com>
Date: Mon, 28 Oct 2013 18:20:13 -0700
Subject: [PATCH 5/5] Add root disclaimer, replace `aptitude` with `apt-get`

---
 INSTALL.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/INSTALL.md b/INSTALL.md
index 3f23c3edd..c971c463a 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,6 +1,9 @@
 NOTE: What follows is a very rough list of commands.  This works on a fresh install of Ubuntu 12.04.
+
 NOTE: These instructions assume you are using a separate server for your database.  You will need to adjust the instructions if you are running the database on the same server.
 
+NOTE: These instructions assume you are the root user.  If you are not, prepend `sudo` to all shell commands (the ones that aren't at `mysql>` prompts) or temporarily become a user with root privileges with `sudo -s`.
+
 ## On the DB Server ##
 
     apt-get install mysql-server mysql-client snmpd
@@ -30,7 +33,7 @@ now restart MySQL
 
 ## On the NMS ##
 
-    aptitude install libapache2-mod-php5 php5-cli php5-mysql php5-gd php5-snmp php-pear snmp graphviz php5-mcrypt apache2 fping imagemagick whois mtr-tiny nmap python-mysqldb snmpd mysql-client php-net-ipv4 php-net-ipv6 rrdtool
+    apt-get install libapache2-mod-php5 php5-cli php5-mysql php5-gd php5-snmp php-pear snmp graphviz php5-mcrypt apache2 fping imagemagick whois mtr-tiny nmap python-mysqldb snmpd mysql-client php-net-ipv4 php-net-ipv6 rrdtool
     cd /opt
     git clone https://github.com/librenms/librenms.git librenms
     cd /opt/librenms