diff options
Diffstat (limited to 'modules/user/views')
| -rw-r--r-- | modules/user/views/admin_users.html.php | 81 | ||||
| -rw-r--r-- | modules/user/views/login.html.php | 4 |
2 files changed, 42 insertions, 43 deletions
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php index 31ce7f2a..f9dc4c74 100644 --- a/modules/user/views/admin_users.html.php +++ b/modules/user/views/admin_users.html.php @@ -5,26 +5,25 @@ <p>These are the users in your system</p> <ul class="ui-accordion-container"> <? foreach ($users as $i => $user): ?> - <li> - <?= $user->name ?> - <?= ($user->last_login == 0) ? "" : "(" . date("M j, Y", $user->last_login) . ")" ?> - <a href="#">edit</a> - <div> - <?= user::get_edit_form($user, "users/{$user->id}?_method=put&continue=/admin/users"); ?> - </div> - <? 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> + <li> + <?= $user->name ?> + <?= ($user->last_login == 0) ? "" : "(" . date("M j, Y", $user->last_login) . ")" ?> + <a href="#">edit</a> + <div> + <?= user::get_edit_form_admin($user); ?> + </div> + <? if (!(user::active()->id == $user->id || user::guest()->id == $user->id)): ?> + <a href="#">delete</a> + <div> + <?= user::get_delete_form_admin($user); ?> + </div> + <? endif ?> + </li> <? endforeach ?> <li><a href="#">Add user</a> - <div> - <?= user::get_add_form("users/add?_method=post&continue=/admin/users"); ?> - </div> + <div> + <?= user::get_add_form_admin(); ?> + </div> </li> </ul> </div> @@ -32,27 +31,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> + <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"); ?> + </div> + <? if (!$group->special): ?> + <a href="#">delete</a> + <div> + <?= group::get_delete_form($group, + "groups/{$group->id}?_method=delete"); ?> + </div> + <? endif ?> + </li> + <? endforeach ?> + <li><a href="#">Add group</a> + <div> + <?= group::get_add_form("groups/add?_method=post"); ?> + </div> + </li> + </ul> </div> diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php index a29cdbbd..8b024815 100644 --- a/modules/user/views/login.html.php +++ b/modules/user/views/login.html.php @@ -5,9 +5,9 @@ title="<?= _("Login to Gallery") ?>" id="gLoginLink"><?= _("Login") ?></a></li> <? else: ?> - <li><a href="<?= url::site("user/{$user->id}?continue=" . url::current(true))?>" + <li><a href="<?= url::site("form/edit/users/{$user->id}") ?>" title="<?= _("Edit Your Profile") ?>" - id="gUserProfileLink"><?= _("Modify Profile") ?></a></li> + id="gUserProfileLink" class="gDialogLink"><?= _("Modify Profile") ?></a></li> <li><a href="<?= url::site("logout?continue=" . url::current(true)) ?>" id="gLogoutLink"><?= _("Logout") ?></a></li> <? endif; ?> |