From 483b86d92f1d05c9724f257315d8a93a939d947b Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Fri, 20 Apr 2012 10:36:59 +0000
Subject: [PATCH] enable previous period button in graph browser for all
 graphs. doesn't work everywhere yet. add drbd icon. add apps menu.

git-svn-id: http://www.observium.org/svn/observer/trunk@3064 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/images/icons/drbd.png      | Bin 0 -> 349 bytes
 html/includes/print-menubar.php |  33 ++++++++++++++++++++++++++++++--
 html/pages/graphs.inc.php       |   6 +++---
 3 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 html/images/icons/drbd.png

diff --git a/html/images/icons/drbd.png b/html/images/icons/drbd.png
new file mode 100644
index 0000000000000000000000000000000000000000..16012054406a4cc8fb848ceab8c17e1ca6723b4f
GIT binary patch
literal 349
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qucLG}_)Usv{9%-l?-jFw4$Wk4aR64!{5;QX|b
z^2DN4hJeJ(yb?V>*ARs=V?9$nLj!{^MGJwdc6z!vhFJK&y==&J$U&g>VW19+f5PhA
zOH02hP13GlbG_76!KS;0b)&%UDNQ%H97DErN(rzSp8Ca~<2T`$($VAZ4xG82;(0_u
zx$=qBwdQVycM6<y#DiiCHdL?e|9+s*RmG`G{aAw6zKF$Z8RfqiUQ~ROBO88d>4asv
z&vqoWvCQNBw7EggIrxoWVr%*8z}FWl4s-D9Y;4SD-lKECKp>gpu6beE>#MB2?6+%@
nu13W>&R^92$ofZj{X=%Q%X7cJS#ic1=m`c-S3j3^P6<r_tvi3J

literal 0
HcmV?d00001

diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 5615f8a06d..2ff1525809 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -1,5 +1,7 @@
 <?php
 
+## FIXME - this could do with some performance improvements, i think. possible rearranging some tables and setting flags at poller time (nothing changes outside of then anyways)
+
 $service_alerts = dbFetchCell("SELECT COUNT(service_id) FROM services WHERE service_status = '0'");
 $if_alerts      = dbFetchCell("SELECT COUNT(interface_id) FROM `ports` WHERE `ifOperStatus` = 'down' AND `ifAdminStatus` = 'up' AND `ignore` = '0'");
 
@@ -387,6 +389,34 @@ foreach (array_keys($menu_sensors) as $item)
 
 <?php
 
+$app_count = dbFetchCell("SELECT COUNT(`app_id`) FROM `applications`");
+
+
+
+if ($_SESSION['userlevel'] >= '5' && ($app_count) > "0")
+{
+?>
+
+    <li><a href="apps/" class="drop"><img src="images/icons/apps.png" border="0" align="absmiddle" /> Apps</a><!-- Begin Home Item -->
+        <div class="dropdown_1column"><!-- Begin 1 column container -->
+          <ul>
+<?php
+
+  $rows = dbFetchRows("SELECT `app_type` FROM `applications` GROUP BY `app_type` ORDER BY `app_type`");
+  foreach ($rows as $row)
+  {
+echo('
+        <li><a href="applications/app='.$row['app_type'].'/"><img src="images/icons/'.$row['app_type'].'.png" border="0" align="absmiddle" /> '.$row['app_type'].' </a></li>');
+  }
+
+?>
+          </ul>
+      </div>
+    </li>
+
+<?php
+}
+
 $routing_count['bgp']  = dbFetchCell("SELECT COUNT(bgpPeer_id) from `bgpPeers`");
 $routing_count['ospf'] = dbFetchCell("SELECT COUNT(ospf_instance_id) FROM `ospf_instances` WHERE `ospfAdminStat` = 'enabled'");
 $routing_count['cef']  = dbFetchCell("SELECT COUNT(cef_switching_id) from `cef_switching`");
@@ -398,11 +428,10 @@ if ($_SESSION['userlevel'] >= '5' && ($routing_count['bgp']+$routing_count['ospf
 ?>
 
     <li><a href="routing/" class="drop"><img src="images/16/arrow_branch.png" border="0" align="absmiddle" /> Routing</a><!-- Begin Home Item -->
-
         <div class="dropdown_1column"><!-- Begin 1 column container -->
-
           <ul>
 
+
 <?php
   $separator = 0;
 
diff --git a/html/pages/graphs.inc.php b/html/pages/graphs.inc.php
index 44790845d9..04eeedce34 100644
--- a/html/pages/graphs.inc.php
+++ b/html/pages/graphs.inc.php
@@ -231,8 +231,8 @@ if (!$auth)
   }
 
   ### FIXME : do this properly
-  if($type == "port" && $subtype == "bits")
-  {
+#  if($type == "port" && $subtype == "bits")
+#  {
     echo(' | ');
     if ($vars['previous'] == "yes")
     {
@@ -240,7 +240,7 @@ if (!$auth)
     } else {
       echo(generate_link("Show Previous",$vars, array('page' => "graphs", 'previous' => "yes")));
     }
-  }
+#  }
 
   echo('<div style="float: right;">');