From 481352c382d769d9074223ae9c7b6d969f0f6e58 Mon Sep 17 00:00:00 2001
From: Felix Rabinovich <virshu@users.sourceforge.net>
Date: Thu, 25 Dec 2008 02:16:41 +0000
Subject: User administration: 1. Add users; 2. Group administration; 3.
 General cleanup

---
 modules/user/views/admin_users.html.php | 58 ++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 22 deletions(-)

(limited to 'modules/user/views')

diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 9792b740..31ce7f2a 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -1,38 +1,29 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
 <div class="gBlock">
-  <a href="" class="gClose">X</a>
   <h2>User Administration</h2>
   <div class="gBlockContent">
     <p>These are the users in your system</p>
-    <ul class="ui-accordion-container" id="gEditUserContainer">
+    <ul class="ui-accordion-container">
       <? foreach ($users as $i => $user): ?>
-        <li id="<?= 'accordion' . $user->id ?>">
-            <?= $user->name ?>
-            <?= ($user->last_login == 0) ? "" :
-            "(" . date("M j, Y", $user->last_login) . ")" ?> <br />
+        <li>
+          <?= $user->name ?>
+          <?= ($user->last_login == 0) ? "" : "(" . date("M j, Y", $user->last_login) . ")" ?> 
           <a href="#">edit</a>
           <div>
-          <?
-            $form = user::get_edit_form($user,
-              "users/{$user->id}?_method=put&continue=/admin/users");
-            $form->set_attr("id", "gEdit" . $user->id);
-            print $form;
-          ?>
+          <?= user::get_edit_form($user, "users/{$user->id}?_method=put&continue=/admin/users"); ?>
           </div>
-          <br />
-          <?= (user::active()->id == $user->id) ? "&nbsp;" :
-          "<a href=\"" . url::site("admin/users/delete/$user->id") . "\">delete</a>" ?>
-          <br /><br />
+          <? if (!(user::active()->id == $user->id || user::guest()->id == $user->id)): ?>
+            <a href="#">delete</a>
+            <div>
+              <?= user::get_delete_form($user, 
+                "users/{$user->id}?_method=delete&continue=/admin/users"); ?>
+            </div>
+          <? endif ?>
         </li>
       <? endforeach ?>
       <li><a href="#">Add user</a>
           <div>
-          <?
-            $form = user::get_add_form($user,
-              "users/add?_method=post&continue=/admin/users");
-            $form->set_attr("id", "gEdit" . $user->id);
-            print $form;
-          ?>
+          <?= user::get_add_form("users/add?_method=post&continue=/admin/users"); ?>
           </div>
       </li>
     </ul>
@@ -41,4 +32,27 @@
   <div class="gBlockContent">
     <p>These are the groups in your system</p>
   </div>
+    <ul class="ui-accordion-container">
+      <? foreach ($groups as $i => $group): ?>
+        <li>
+          <?= $group->name ?>
+          <a href="#">edit</a>
+          <div>
+          <?= group::get_edit_form($group, "groups/{$group->id}?_method=put&continue=/admin/users"); ?>
+          </div>
+          <? if (!$group->special): ?>
+            <a href="#">delete</a>
+            <div>
+              <?= group::get_delete_form($group, 
+                "groups/{$group->id}?_method=delete&continue=/admin/users"); ?>
+            </div>
+          <? endif ?>
+        </li>
+      <? endforeach ?>
+      <li><a href="#">Add group</a>
+          <div>
+            <?= group::get_add_form("groups/add?_method=post&continue=/admin/users"); ?>
+          </div>
+      </li>
+    </ul>
 </div>
-- 
cgit v1.2.3