From 4ee9200db085e6754589dc3fe3b4a36fa75b1fde Mon Sep 17 00:00:00 2001
From: Alan Gregory <alan@opcaonet.com.br>
Date: Fri, 2 Oct 2015 17:05:36 -0300
Subject: [PATCH 1/4] Moved Device Groups SubMenu

Space fix
---
 html/includes/print-menubar.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 220112c51e..179049cc17 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -129,16 +129,18 @@ foreach (dbFetchRows($sql,$param) as $devtype) {
     echo('            <li><a href="devices/type=' . $devtype['type'] . '/"><i class="fa fa-angle-double-right fa-fw fa-lg"></i> ' . ucfirst($devtype['type']) . '</a></li>');
 }
 
-require_once '../includes/device-groups.inc.php';
-
-foreach( GetDeviceGroups() as $group ) {
-    echo '<li><a href="'.generate_url(array('page'=>'devices','group'=>$group['id'])).'" alt="'.$group['desc'].'"><i class="fa fa-th fa-fw fa-lg"></i> '.ucfirst($group['name']).'</a></li>';
-}
-unset($group);
-
         echo ('</ul>
              </li>');
-
+            require_once '../includes/device-groups.inc.php';
+            $devices_groups = GetDeviceGroups();
+            if (count($devices_groups) > 0 ){
+                echo '<li class="dropdown-submenu"><a ><i class="fa fa-th fa-fw fa-lg"></i> Groups</a><ul class="dropdown-menu scrollable-menu">';
+                foreach( GetDeviceGroups() as $group ) {
+                    echo '<li><a href="'.generate_url(array('page'=>'devices','group'=>$group['id'])).'" alt="'.$group['desc'].'"><i class="fa fa-th fa-fw fa-lg"></i> '.ucfirst($group['name']).'</a></li>';
+                }
+                unset($group);
+                echo '</ul></li>';
+            }
 if ($_SESSION['userlevel'] >= '10') {
     if ($config['show_locations']) {
         echo('

From 4f6fa8a947f9af68301addd947a952eb5f385714 Mon Sep 17 00:00:00 2001
From: Alan Gregory <alan@opcaonet.com.br>
Date: Fri, 2 Oct 2015 17:18:34 -0300
Subject: [PATCH 2/4] Fix double query

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

diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 179049cc17..ac40706d66 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -135,7 +135,7 @@ foreach (dbFetchRows($sql,$param) as $devtype) {
             $devices_groups = GetDeviceGroups();
             if (count($devices_groups) > 0 ){
                 echo '<li class="dropdown-submenu"><a ><i class="fa fa-th fa-fw fa-lg"></i> Groups</a><ul class="dropdown-menu scrollable-menu">';
-                foreach( GetDeviceGroups() as $group ) {
+                foreach( $devices_groups as $group ) {
                     echo '<li><a href="'.generate_url(array('page'=>'devices','group'=>$group['id'])).'" alt="'.$group['desc'].'"><i class="fa fa-th fa-fw fa-lg"></i> '.ucfirst($group['name']).'</a></li>';
                 }
                 unset($group);

From 20db0e29b24ce57c54a75858c1ff8e80af774eec Mon Sep 17 00:00:00 2001
From: Alan Gregory <alan@opcaonet.com.br>
Date: Mon, 5 Oct 2015 12:27:12 -0300
Subject: [PATCH 3/4] Renamed menu name.

---
 html/includes/print-menubar.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index ac40706d66..3ebd0f7ab8 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -134,7 +134,7 @@ foreach (dbFetchRows($sql,$param) as $devtype) {
             require_once '../includes/device-groups.inc.php';
             $devices_groups = GetDeviceGroups();
             if (count($devices_groups) > 0 ){
-                echo '<li class="dropdown-submenu"><a ><i class="fa fa-th fa-fw fa-lg"></i> Groups</a><ul class="dropdown-menu scrollable-menu">';
+                echo '<li class="dropdown-submenu"><a ><i class="fa fa-th fa-fw fa-lg"></i> Device Groups</a><ul class="dropdown-menu scrollable-menu">';
                 foreach( $devices_groups as $group ) {
                     echo '<li><a href="'.generate_url(array('page'=>'devices','group'=>$group['id'])).'" alt="'.$group['desc'].'"><i class="fa fa-th fa-fw fa-lg"></i> '.ucfirst($group['name']).'</a></li>';
                 }
@@ -531,7 +531,7 @@ if ($_SESSION['userlevel'] >= '10') {
            </ul>
            </li>
            <li role="presentation" class="divider"></li>');
-} 
+}
 
 if ($_SESSION['authenticated']) {
     echo('

From 7b15f2d29dda31f995b63cf8fdae2474d616bbf0 Mon Sep 17 00:00:00 2001
From: Alan Gregory <alan@opcaonet.com.br>
Date: Tue, 6 Oct 2015 08:12:31 -0300
Subject: [PATCH 4/4] Fixed missing href

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

diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 3ebd0f7ab8..684b1dc569 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -134,7 +134,7 @@ foreach (dbFetchRows($sql,$param) as $devtype) {
             require_once '../includes/device-groups.inc.php';
             $devices_groups = GetDeviceGroups();
             if (count($devices_groups) > 0 ){
-                echo '<li class="dropdown-submenu"><a ><i class="fa fa-th fa-fw fa-lg"></i> Device Groups</a><ul class="dropdown-menu scrollable-menu">';
+                echo '<li class="dropdown-submenu"><a href="#"><i class="fa fa-th fa-fw fa-lg"></i> Device Groups</a><ul class="dropdown-menu scrollable-menu">';
                 foreach( $devices_groups as $group ) {
                     echo '<li><a href="'.generate_url(array('page'=>'devices','group'=>$group['id'])).'" alt="'.$group['desc'].'"><i class="fa fa-th fa-fw fa-lg"></i> '.ucfirst($group['name']).'</a></li>';
                 }