From 9dc1a5f55414444d58eb87065baae42070c0c7f4 Mon Sep 17 00:00:00 2001 From: Nigel Kukard <nkukard@lbsd.net> Date: Thu, 30 Apr 2009 17:33:28 +0000 Subject: [PATCH] * Various cosmetic fixes --- webui/group-main.php | 4 ++-- webui/includes/header.php | 2 +- webui/user-groups.php | 6 +++--- webui/wisp-locations-manage.php | 2 +- webui/wisp-user-list.php | 4 +++- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/webui/group-main.php b/webui/group-main.php index fb802bed..9295f152 100644 --- a/webui/group-main.php +++ b/webui/group-main.php @@ -62,8 +62,8 @@ printHeader(array( <option value="add">Add Group</option> <option value="delete">Delete Group</option> <option disabled="disabled"> - - - - - - - - - - - </option> - <option value="members">List Users</option> - <option value="members">List Attributes</option> + <option value="members">Users</option> + <option value="members">Attributes</option> </select> </div> diff --git a/webui/includes/header.php b/webui/includes/header.php index 2f65025b..6842cc74 100644 --- a/webui/includes/header.php +++ b/webui/includes/header.php @@ -79,8 +79,8 @@ function printHeader($params = NULL) <ul> <li><a href="wisp-user-list.php">User List</a></li> <li><a href="wisp-user-add.php">Add User</a></li> - <li><a href="wisp-locations-manage.php">Manage Locations</a></li> <li><a href="wisp-multiuser-add.php">Add Many Users</a></li> + <li><a href="wisp-locations-manage.php">Manage Locations</a></li> </ul> diff --git a/webui/user-groups.php b/webui/user-groups.php index df9b06c3..3f3dd46c 100644 --- a/webui/user-groups.php +++ b/webui/user-groups.php @@ -55,7 +55,7 @@ printHeader(array( <option selected="selected">select action</option> <option disabled="disabled"> - - - - - - - - - - - </option> <option value="add">Assign Group</option> - <option value="delete">Remove Group Assignment</option> + <option value="delete">Remove Group</option> </select> </div> @@ -108,7 +108,7 @@ printHeader(array( if ($res->rowCount() == 0) { ?> <tr> - <td>User does not belong to any groups</td> + <td colspan="5">User does not belong to any groups</td> </tr> <?php } @@ -118,7 +118,7 @@ printHeader(array( } else { ?> <tr> - <td>Invocation error, no user ID selected</td> + <td colspan="5">Invocation error, no user ID selected</td> </tr> <?php } diff --git a/webui/wisp-locations-manage.php b/webui/wisp-locations-manage.php index 82e2002e..2c51129b 100644 --- a/webui/wisp-locations-manage.php +++ b/webui/wisp-locations-manage.php @@ -54,7 +54,7 @@ if (!isset($_POST['frmaction'])) { <option value="add">Add Location</option> <option value="delete">Delete Location</option> <option disabled="disabled"> - - - - - - - - - - - </option> - <option value="useratts">List Location Members</option> + <option value="useratts">Members</option> </select> </div> diff --git a/webui/wisp-user-list.php b/webui/wisp-user-list.php index 9ca75b88..1b1af475 100644 --- a/webui/wisp-user-list.php +++ b/webui/wisp-user-list.php @@ -29,7 +29,7 @@ printHeader(array( # If we have nothing to do - display search if (!isset($_POST['frmaction'])) { ?> - <p class="pageheader">User List</p> + <p class="pageheader">WiSP User List</p> <form id="main_form" action="wisp-user-list.php" method="post"> <input type="hidden" name="frmaction" value="dofilter" /> @@ -71,6 +71,8 @@ if (!isset($_POST['frmaction'])) { } elseif (isset($_POST['frmaction']) && $_POST['frmaction'] == "dofilter") { ?> + <p class="pageheader">WiSP User List</p> + <form id="main_form" action="wisp-user-list.php" method="post"> <div class="textcenter"> -- GitLab