Edit user - first draft

2 files changed, 22 insertions, 10 deletions

diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index b287f685..46fd52dd 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -46,11 +46,12 @@ class Users_Controller extends REST_Controller {
    *  @see Rest_Controller::_update($resource)
    */
   public function _update($user) {
-    if ($user->guest || $user->id != user::active()->id) {
+    if ($user->guest || (!user::active()->admin && $user->id != user::active()->id)) {
       access::forbidden();
     }
 
-    $form = user::get_edit_form($user);
+    $form = user::get_edit_form($user, "");
+    $form->edit_user->password->rules("-required");
     if ($form->validate()) {
       $user->full_name = $form->edit_user->full_name->value;
       $user->password = $form->edit_user->password->value;
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index fc6c98bf..6e544c41 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -4,16 +4,27 @@
   <h2>User Administration</h2>
   <div class="gBlockContent">
     <p>These are the users in your system</p>
-    <table>
+    <ul class="ui-accordion-container" id="gEditUserContainer">
       <? foreach ($users as $i => $user): ?>
-      <tr>
-        <td>
-          <a href="<?= url::site("admin/users/edit/$user->id") ?>">
+        <li id="<?= 'accordion' . $user->id ?>">
             <?= $user->name ?>
-          </a>
-        </td>
-      </tr>
+            <?= ($user->last_login == 0) ? "" :
+            "(" . date("M j, Y", $user->last_login) . ")" ?> <br />
+          <a href="#">edit</a>    <!-- url::site("admin/users/edit/$user->id") -->
+          <div>
+          <?
+            $form = user::get_edit_form($user,
+              "users/{$user->id}?_method=put&continue=/admin/users");
+            $form->set_attr("id", "gEdit" . $user->id);
+            print $form;
+          ?>
+          </div>
+          <br />
+          <?= (user::active()->id == $user->id) ? "&nbsp;" :
+          "<a href=\"" . url::site("admin/users/delete/$user->id") . "\">delete</a>" ?>
+          <br /><br />
+        </li>
       <? endforeach ?>
-    </table>
+    </ul>
   </div>
 </div>