updates related to pending table stuff

svn path=/; revision=144

2 files changed, 18 insertions, 6 deletions

diff --git a/scire/.smarty/templates/clients.tpl b/scire/.smarty/templates/clients.tpl
index 4c6d6f1..57a1448 100755
--- a/scire/.smarty/templates/clients.tpl
+++ b/scire/.smarty/templates/clients.tpl
@@ -25,6 +25,9 @@
   {/foreach}
 
 	<th>Actions</th>
+	{if $View eq "Pending"}
+	<th>Approve/Deny</th>
+	{/if}
   </tr>
   {section name=clients loop=$clients}
   <tr>
@@ -38,18 +41,28 @@
     <td>
 	  <a href="client.php?clientid={$clients[clients].clientid}&Action=edit">Edit</a>
 	  {if $View eq "Pending"}
-	  <a href="client.php?clientid={$clients[clients].clientid}&Action=assign">Assign</a>
-	  <a href="client.php?clientid={$clients[clients].clientid}&Action=approve">Approve</a>
-	  <a href="client.php?clientid={$clients[clients].clientid}&Action=reject">Reject</a>
+	    <a href="client.php?clientid={$clients[clients].clientid}&Action=assign">Assign</a>
 	  {else}
-	  <a href="client.php?clientid={$clients[clients].clientid}&Action=delete">Delete</a>
+	    <a href="client.php?clientid={$clients[clients].clientid}&Action=delete">Delete</a>
 	  {/if}
 	</td>
+	{if $View eq "Pending"}
+	<td>
+	  <input type="checkbox" name="pending_id[]" value="{$clients[clients].clientid}">
+	</td>
+	{/if}
   </tr>
   {/section}
-  
+
   </td></tr>
+  
   </table>
+  {if $View eq "Pending"}
+  <tr>
+    <td align="right"><input type="submit" name="pend_approve" value="Approve">
+	<input type="submit" name="pend_reject" value="Reject"></td>
+  </tr>
+  {/if}
 {/if}
 </form>
 {include file="footer.tpl"}
diff --git a/scire/clients.php b/scire/clients.php
index 6bc198d..1ce82fe 100755
--- a/scire/clients.php
+++ b/scire/clients.php
@@ -136,7 +136,6 @@ switch($_GET['View']) {
 	default:  #Show clients.
 		add_leftbar($leftbar_menu, "View Groups", "clients.php?View=groups");
 		add_leftbar($leftbar_menu, "View Permissions", "clients.php?View=permissions");
-		add_leftbar($leftbar_menu, "View Pending Clients", "clients.php?View=pending");
 		$smarty->assign('leftbar_submenu_title', "Actions");
 		add_leftbar($leftbar_submenu, "Create Client", "client.php?Action=create");