From 8a0de44b96102afa4753065309a8a0b7a2fe9630 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Wed, 22 Apr 2015 17:25:46 +0100
Subject: [PATCH 1/2] Updated link names

---
 html/includes/print-menubar.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index b428d4e079..2f7f6afb95 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -55,16 +55,17 @@ if (isset($config['site_style']) && ($config['site_style'] == 'dark' || $config[
           <li class="dropdown-submenu">
             <a href="<?php echo(generate_url(array('page'=>'alerts'))); ?>"><i class="fa fa-exclamation-circle fa-fw fa-lg"></i> Alerts</a>
             <ul class="dropdown-menu scrollable-menu">
-            <li><a href="<?php echo(generate_url(array('page'=>'alerts'))); ?>"><i class="fa fa-bell fa-fw fa-lg"></i> Alerts</a></li>
-            <li><a href="<?php echo(generate_url(array('page'=>'alert-log'))); ?>"><i class="fa fa-th-list fa-fw fa-lg"></i> Alert Log</a></li>
-            <li><a href="<?php echo(generate_url(array('page'=>'alert-stats'))); ?>"><i class="fa fa-bar-chart fa-fw fa-lg"></i> Alert Stats</a></li>
+            <li><a href="<?php echo(generate_url(array('page'=>'alerts'))); ?>"><i class="fa fa-bell fa-fw fa-lg"></i> Notifications</a></li>
+            <li><a href="<?php echo(generate_url(array('page'=>'alert-log'))); ?>"><i class="fa fa-th-list fa-fw fa-lg"></i> Historical Log</a></li>
+            <li><a href="<?php echo(generate_url(array('page'=>'alert-stats'))); ?>"><i class="fa fa-bar-chart fa-fw fa-lg"></i> Statistics</a></li>
 <?php
 if ($_SESSION['userlevel'] >= '10') {
 ?>
-<li><a href="<?php echo(generate_url(array('page'=>'alert-rules'))); ?>"><i class="fa fa-tasks fa-fw fa-lg"></i> Alert Rules</a></li>
+<li role="presentation" class="dropdown-header"> Settings</li>
+<li><a href="<?php echo(generate_url(array('page'=>'alert-rules'))); ?>"><i class="fa fa-tasks fa-fw fa-lg"></i> Rules</a></li>
 <li><a href="<?php echo(generate_url(array('page'=>'alert-schedule'))); ?>"><i class="fa fa-calendar fa-fw fa-lg"></i> Maintenance Windows</a></li>
-<li><a href="<?php echo(generate_url(array('page'=>'alert-map'))); ?>"><i class="fa fa-link fa-fw fa-lg"></i> Alert Map</a></li>
-<li><a href="<?php echo(generate_url(array('page'=>'templates'))); ?>"><i class="fa fa-sitemap fa-fw fa-lg"></i> Alert Templates</a></li>
+<li><a href="<?php echo(generate_url(array('page'=>'alert-map'))); ?>"><i class="fa fa-link fa-fw fa-lg"></i> Rule Mapping</a></li>
+<li><a href="<?php echo(generate_url(array('page'=>'templates'))); ?>"><i class="fa fa-sitemap fa-fw fa-lg"></i> Templates</a></li>
 <?php
 }
 ?>

From 16db7268a95ab1f7b087f547d92cb5e34d9488af Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Wed, 22 Apr 2015 17:37:11 +0100
Subject: [PATCH 2/2] Removing seperator

---
 html/includes/print-menubar.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 2f7f6afb95..6c15928e0f 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -61,7 +61,6 @@ if (isset($config['site_style']) && ($config['site_style'] == 'dark' || $config[
 <?php
 if ($_SESSION['userlevel'] >= '10') {
 ?>
-<li role="presentation" class="dropdown-header"> Settings</li>
 <li><a href="<?php echo(generate_url(array('page'=>'alert-rules'))); ?>"><i class="fa fa-tasks fa-fw fa-lg"></i> Rules</a></li>
 <li><a href="<?php echo(generate_url(array('page'=>'alert-schedule'))); ?>"><i class="fa fa-calendar fa-fw fa-lg"></i> Maintenance Windows</a></li>
 <li><a href="<?php echo(generate_url(array('page'=>'alert-map'))); ?>"><i class="fa fa-link fa-fw fa-lg"></i> Rule Mapping</a></li>