From 35c7c6ab1bea037156038eebc77f5ab5b41e62e8 Mon Sep 17 00:00:00 2001
From: Arjit Chaudhary <arjit.c@gmail.com>
Date: Sat, 29 Aug 2015 18:46:14 +0530
Subject: [PATCH 1/3] Display a message if no Group is found

Screenshot: http://i.imgur.com/ac9okNO.png
---
 html/pages/device-groups.inc.php | 36 +++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/html/pages/device-groups.inc.php b/html/pages/device-groups.inc.php
index 891b42c20..e5e6c9918 100644
--- a/html/pages/device-groups.inc.php
+++ b/html/pages/device-groups.inc.php
@@ -3,23 +3,31 @@ require_once 'includes/modal/new_device_group.inc.php';
 require_once 'includes/modal/delete_device_group.inc.php';
 
 $no_refresh = true;
-
+$group_count_check = array_filter(GetDeviceGroups());
+if(!empty($group_count_check)) { 
 echo '<div class="row"><div class="col-sm-12"><span id="message"></span></div></div>';
 echo '<div class="table-responsive">';
 echo '<table class="table table-condensed table-hover"><thead><tr>';
 echo '<th>Name</th><th>Description</th><th>Pattern</th><th>Actions</th>';
 echo '</tr></thead><tbody>';
-foreach (GetDeviceGroups() as $group) {
-    echo '<tr id="row_'.$group['id'].'">';
-    echo '<td>'.$group['name'].'</td>';
-    echo '<td>'.$group['desc'].'</td>';
-    echo '<td>'.$group['pattern'].'</td>';
-    echo '<td>';
-        echo "<button type='button' class='btn btn-primary btn-sm' aria-label='Edit' data-toggle='modal' data-target='#create-group' data-group_id='".$group['id']."' name='edit-device-group'><span class='glyphicon glyphicon-pencil' aria-hidden='true'></span></button> ";
-        echo "<button type='button' class='btn btn-danger btn-sm' aria-label='Delete' data-toggle='modal' data-target='#confirm-delete' data-group_id='".$group['id']."' name='delete-device-group'><span class='glyphicon glyphicon-trash' aria-hidden='true'></span></button>";
-    echo '</td>';
-    echo '</tr>';
-}
-
+	foreach (GetDeviceGroups() as $group) {
+	    echo '<tr id="row_'.$group['id'].'">';
+	    echo '<td>'.$group['name'].'</td>';
+	    echo '<td>'.$group['desc'].'</td>';
+	    echo '<td>'.$group['pattern'].'</td>';
+	    echo '<td>';
+	        echo "<button type='button' class='btn btn-primary btn-sm' aria-label='Edit' data-toggle='modal' data-target='#create-group' data-group_id='".$group['id']."' name='edit-device-group'><span class='glyphicon glyphicon-pencil' aria-hidden='true'></span></button> ";
+	        echo "<button type='button' class='btn btn-danger btn-sm' aria-label='Delete' data-toggle='modal' data-target='#confirm-delete' data-group_id='".$group['id']."' name='delete-device-group'><span class='glyphicon glyphicon-trash' aria-hidden='true'></span></button>";
+	    echo '</td>';
+	    echo '</tr>';
+	}
+} else { //if $group_count_check is empty, aka no group found, then display a message to the user.
+	echo "<center>Looks like no groups have been created, let's create one now. Click on <b>Create New Group</b> to create one.</center><br>";
+	echo "<center><button type='button' class='btn btn-primary btn-sm' aria-label='Add' data-toggle='modal' data-target='#create-group' data-group_id='' name='create-device-group'>Create new Group</button></center>";
+}	
 echo '</tbody></table></div>';
-echo "<button type='button' class='btn btn-primary btn-sm' aria-label='Add' data-toggle='modal' data-target='#create-group' data-group_id='' name='create-device-group'>Create new Group</button> ";
+
+if(!empty($group_count_check)) { //display create new node group when $group_count_check has a value so that the user can define more groups in the future.
+echo "<hr>";
+echo "<center><button type='button' class='btn btn-primary btn-sm' aria-label='Add' data-toggle='modal' data-target='#create-group' data-group_id='' name='create-device-group'>Create new Group</button></center>";
+}

From 6b9315bdce469cebeef87ee02b4aad7f55497bfb Mon Sep 17 00:00:00 2001
From: Arjit Chaudhary <arjit.c@gmail.com>
Date: Sat, 29 Aug 2015 21:27:11 +0530
Subject: [PATCH 2/3] Fixed indents and coding style.

---
 html/pages/device-groups.inc.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/html/pages/device-groups.inc.php b/html/pages/device-groups.inc.php
index e5e6c9918..8cc08e020 100644
--- a/html/pages/device-groups.inc.php
+++ b/html/pages/device-groups.inc.php
@@ -21,13 +21,14 @@ echo '</tr></thead><tbody>';
 	    echo '</td>';
 	    echo '</tr>';
 	}
-} else { //if $group_count_check is empty, aka no group found, then display a message to the user.
+} 
+else { //if $group_count_check is empty, aka no group found, then display a message to the user.
 	echo "<center>Looks like no groups have been created, let's create one now. Click on <b>Create New Group</b> to create one.</center><br>";
 	echo "<center><button type='button' class='btn btn-primary btn-sm' aria-label='Add' data-toggle='modal' data-target='#create-group' data-group_id='' name='create-device-group'>Create new Group</button></center>";
 }	
 echo '</tbody></table></div>';
 
 if(!empty($group_count_check)) { //display create new node group when $group_count_check has a value so that the user can define more groups in the future.
-echo "<hr>";
-echo "<center><button type='button' class='btn btn-primary btn-sm' aria-label='Add' data-toggle='modal' data-target='#create-group' data-group_id='' name='create-device-group'>Create new Group</button></center>";
+	echo "<hr>";
+	echo "<center><button type='button' class='btn btn-primary btn-sm' aria-label='Add' data-toggle='modal' data-target='#create-group' data-group_id='' name='create-device-group'>Create new Group</button></center>";
 }

From 6febdbecd182f3ef2bff737ae6f4874f9f05dbbf Mon Sep 17 00:00:00 2001
From: Arjit Chaudhary <arjit.c@gmail.com>
Date: Sat, 29 Aug 2015 22:42:04 +0530
Subject: [PATCH 3/3] Updated indents, pulled Line #24 into the if { }

---
 html/pages/device-groups.inc.php | 34 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/html/pages/device-groups.inc.php b/html/pages/device-groups.inc.php
index 8cc08e020..533f9259a 100644
--- a/html/pages/device-groups.inc.php
+++ b/html/pages/device-groups.inc.php
@@ -5,28 +5,28 @@ require_once 'includes/modal/delete_device_group.inc.php';
 $no_refresh = true;
 $group_count_check = array_filter(GetDeviceGroups());
 if(!empty($group_count_check)) { 
-echo '<div class="row"><div class="col-sm-12"><span id="message"></span></div></div>';
-echo '<div class="table-responsive">';
-echo '<table class="table table-condensed table-hover"><thead><tr>';
-echo '<th>Name</th><th>Description</th><th>Pattern</th><th>Actions</th>';
-echo '</tr></thead><tbody>';
-	foreach (GetDeviceGroups() as $group) {
-	    echo '<tr id="row_'.$group['id'].'">';
-	    echo '<td>'.$group['name'].'</td>';
-	    echo '<td>'.$group['desc'].'</td>';
-	    echo '<td>'.$group['pattern'].'</td>';
-	    echo '<td>';
-	        echo "<button type='button' class='btn btn-primary btn-sm' aria-label='Edit' data-toggle='modal' data-target='#create-group' data-group_id='".$group['id']."' name='edit-device-group'><span class='glyphicon glyphicon-pencil' aria-hidden='true'></span></button> ";
-	        echo "<button type='button' class='btn btn-danger btn-sm' aria-label='Delete' data-toggle='modal' data-target='#confirm-delete' data-group_id='".$group['id']."' name='delete-device-group'><span class='glyphicon glyphicon-trash' aria-hidden='true'></span></button>";
-	    echo '</td>';
-	    echo '</tr>';
-	}
+	echo '<div class="row"><div class="col-sm-12"><span id="message"></span></div></div>';
+	echo '<div class="table-responsive">';
+	echo '<table class="table table-condensed table-hover"><thead><tr>';
+		echo '<th>Name</th><th>Description</th><th>Pattern</th><th>Actions</th>';
+		echo '</tr></thead><tbody>';
+			foreach (GetDeviceGroups() as $group) {
+			    echo '<tr id="row_'.$group['id'].'">';
+			    echo '<td>'.$group['name'].'</td>';
+			    echo '<td>'.$group['desc'].'</td>';
+			    echo '<td>'.$group['pattern'].'</td>';
+			    echo '<td>';
+			        echo "<button type='button' class='btn btn-primary btn-sm' aria-label='Edit' data-toggle='modal' data-target='#create-group' data-group_id='".$group['id']."' name='edit-device-group'><span class='glyphicon glyphicon-pencil' aria-hidden='true'></span></button> ";
+			        echo "<button type='button' class='btn btn-danger btn-sm' aria-label='Delete' data-toggle='modal' data-target='#confirm-delete' data-group_id='".$group['id']."' name='delete-device-group'><span class='glyphicon glyphicon-trash' aria-hidden='true'></span></button>";
+			    echo '</td>';
+			    echo '</tr>';
+			}
+		echo '</tbody></table></div>';	
 } 
 else { //if $group_count_check is empty, aka no group found, then display a message to the user.
 	echo "<center>Looks like no groups have been created, let's create one now. Click on <b>Create New Group</b> to create one.</center><br>";
 	echo "<center><button type='button' class='btn btn-primary btn-sm' aria-label='Add' data-toggle='modal' data-target='#create-group' data-group_id='' name='create-device-group'>Create new Group</button></center>";
 }	
-echo '</tbody></table></div>';
 
 if(!empty($group_count_check)) { //display create new node group when $group_count_check has a value so that the user can define more groups in the future.
 	echo "<hr>";