From ff290a508d5d86ecf31593b1a03ea147c57ad9b3 Mon Sep 17 00:00:00 2001
From: Paul Gear <github@libertysys.com.au>
Date: Sun, 15 Jun 2014 17:31:57 +1000
Subject: [PATCH 1/3] It's time we got with the current year

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

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 4c2a1dd7ac..ba1702c71f 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1136,7 +1136,7 @@ if (isset($config['enable_printers']) && $config['enable_printers'])
 # No changes below this line #
 //////////////////////////////
 
-$config['version']  = "2013.dev";
+$config['version']  = "2014.master";
 $config['project_name_version'] = $config['project_name'] . " " . $config['version'];
 
 if (isset($config['rrdgraph_def_text']))

From 737394ebbe3fd208b1d21b796d5f709545126e92 Mon Sep 17 00:00:00 2001
From: Paul Gear <github@libertysys.com.au>
Date: Tue, 17 Jun 2014 07:07:55 +1000
Subject: [PATCH 2/3] Use narrower column for vertical status summary

---
 html/pages/front/default.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/html/pages/front/default.php b/html/pages/front/default.php
index 50a4bda2eb..d7f0c664ca 100644
--- a/html/pages/front/default.php
+++ b/html/pages/front/default.php
@@ -11,7 +11,15 @@ echo("<div class=\"front-box $frontbox_class\">
 
 echo('
   <div class="row">
-    <div class="col-md-8">
+');
+if ($config['vertical_summary']) {
+  echo('    <div class="col-md-9">');
+}
+else
+{
+  echo('    <div class="col-md-8">');
+}
+echo('
       <div class="row">
         <div class="col-md-12">
 ');
@@ -125,15 +133,16 @@ echo('</div>');
 echo('
   </div>
   </div>
-  <div class="col-md-4">
 ');
 
 if ($config['vertical_summary'])
 {
+  echo('   <div class="col-md-3">');
   include_once("includes/device-summary-vert.inc.php");
 }
 else
 {
+  echo('   <div class="col-md-4">');
   include_once("includes/device-summary-horiz.inc.php");
 }
 

From d1e3998fd257e1c4fb258d5d8d9f0db24663db52 Mon Sep 17 00:00:00 2001
From: Paul Gear <github@libertysys.com.au>
Date: Tue, 17 Jun 2014 07:10:45 +1000
Subject: [PATCH 3/3] Remove Makefile - used only for local testing

---
 .gitignore |  1 +
 Makefile   | 30 ------------------------------
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 Makefile

diff --git a/.gitignore b/.gitignore
index 4ebd6e7d3b..d5f013cb1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+Makefile
 config.php
 .index
 logs
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 4ad69d63df..0000000000
--- a/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-GIT=git
-SYNC=rsync -rtvx --cvs-exclude --exclude '.*.swp'
-TEST_DEST=librenms:/opt/librenms/
-
-default:	check
-	$(GIT) merge master
-	$(SYNC) html includes $(TEST_DEST)
-
-test t:	merge check push-testing gc
-
-dev d:	merge check push-dev gc
-
-check:
-	for i in `$(GIT) diff --name-only`; do php -l $$i; done
-
-gc:
-	$(GIT) gc
-
-merge:
-	$(GIT) merge master
-
-pull:
-	$(GIT) pull
-
-push-dev:
-	$(GIT) push
-
-push-testing:
-	$(GIT) push testing
-