Merge pull request #232 from libertysys/master

Update version, narrower column for vertical status summary

.gitignore

@@ -1,3 +1,4 @@
+Makefile
 config.php
 .index
 logs

Makefile

@@ -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
-

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");
 }
 

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']))