summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/user/helpers/group.php8
-rw-r--r--modules/user/helpers/user.php10
-rw-r--r--modules/user/views/admin_groups.html.php10
-rw-r--r--modules/user/views/admin_users.html.php10
4 files changed, 21 insertions, 17 deletions
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index ffd344f8..a45f6337 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -63,7 +63,7 @@ class group_Core {
public static function get_edit_form_admin($group) {
$form = new Forge("admin/groups/edit/$group->id");
- $form_group = $form->group("edit_group")->label(_("Edit Group"));
+ $form_group = $form->group("edit_group");
$form_group->input("name")->label(_("Name"))->id("gName")->value($group->name);
$form->add_rules_from($group);
return $form;
@@ -71,7 +71,7 @@ class group_Core {
public static function get_add_form_admin() {
$form = new Forge("admin/groups/add");
- $form_group = $form->group("add_group")->label(_("Add Group"));
+ $form_group = $form->group("add_group");
$form_group->input("name")->label(_("Name"))->id("gName");
$group = ORM::factory("group");
$form->add_rules_from($group);
@@ -79,8 +79,6 @@ class group_Core {
}
public static function get_delete_form_admin($group) {
- $form = new Forge("admin/groups/delete/$group->id",
- sprintf(_("Are you sure you want to delete %s"), $group->name));
- print $form;
+ return new Forge("admin/groups/delete/$group->id");
}
}
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 1da0b8cd..6d933d90 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -26,7 +26,7 @@
class user_Core {
public static function get_edit_form($user, $action = NULL) {
$form = new Forge("users/$user->id?_method=put", "", "post", array("id" => "gUserForm"));
- $group = $form->group("edit_user")->label(_("Edit User"));
+ $group = $form->group("edit_user");
$group->input("name")->label(_("Name"))->id("gName")->value($user->name);
$group->input("full_name")->label(_("Full Name"))->id("gFullName")->value($user->full_name);
$group->password("password")->label(_("Password"))->id("gPassword");
@@ -38,7 +38,7 @@ class user_Core {
public static function get_edit_form_admin($user) {
$form = new Forge("admin/users/edit/$user->id");
- $group = $form->group("edit_user")->label(_("Edit User"));
+ $group = $form->group("edit_user");
$group->input("name")->label(_("Name"))->id("gName")->value($user->name);
$group->input("full_name")->label(_("Full Name"))->id("gFullName")->value($user->full_name);
$group->password("password")->label(_("Password"))->id("gPassword");
@@ -49,7 +49,7 @@ class user_Core {
public static function get_add_form_admin() {
$form = new Forge("admin/users/add");
- $group = $form->group("add_user")->label(_("Add User"));
+ $group = $form->group("add_user");
$group->input("name")->label(_("Name"))->id("gName");
$group->input("full_name")->label(_("Full Name"))->id("gFullName");
$group->password("password")->label(_("Password"))->id("gPassword");
@@ -61,9 +61,7 @@ class user_Core {
}
public static function get_delete_form_admin($user) {
- $form = new Forge("admin/users/delete/$user->id",
- sprintf(_("Are you sure you want to delete %s"), $user->name));
- print $form;
+ return new Forge("admin/users/delete/$user->id");
}
/**
diff --git a/modules/user/views/admin_groups.html.php b/modules/user/views/admin_groups.html.php
index bb7c231c..1d1e37e6 100644
--- a/modules/user/views/admin_groups.html.php
+++ b/modules/user/views/admin_groups.html.php
@@ -8,13 +8,17 @@
<? foreach ($groups as $i => $group): ?>
<li>
<?= $group->name ?>
- <a href="groups/edit_form/<?= $group->id ?>" class="gDialogLink"><?= _("edit") ?></a>
+ <a href="groups/edit_form/<?= $group->id ?>" class="gDialogLink"
+ title="<?= _("Edit group") ?>"><?= _("edit") ?></a>
<? if (!$group->special): ?>
- <a href="groups/delete_form/<?= $group->id ?>" class="gDialogLink"><?= _("delete") ?></a>
+ <a href="groups/delete_form/<?= $group->id ?>" class="gDialogLink"
+ title="<?= sprintf(_("Do you really want to delete %s"), $group->name) ?>">
+ <?= _("delete") ?></a>
<? endif ?>
</li>
<? endforeach ?>
- <li><a href="groups/add_form" class="gDialogLink"><?= _("Add group") ?></a></li>
+ <li><a href="groups/add_form" class="gDialogLink"
+ title="<?= _("Add group") ?>"><?= _("Add group") ?></a></li>
</ul>
</div>
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index f3e6e139..2c6f694a 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -8,13 +8,17 @@
<li>
<?= $user->name ?>
<?= ($user->last_login == 0) ? "" : "(" . date("M j, Y", $user->last_login) . ")" ?>
- <a href="users/edit_form/<?= $user->id ?>" class="gDialogLink"><?= _("edit") ?></a>
+ <a href="users/edit_form/<?= $user->id ?>" class="gDialogLink"
+ title="<?= _("Edit user") ?>"><?= _("edit") ?></a>
<? if (!(user::active()->id == $user->id || user::guest()->id == $user->id)): ?>
- <a href="users/delete_form/<?= $user->id ?>" class="gDialogLink"><?= _("delete") ?></a>
+ <a href="users/delete_form/<?= $user->id ?>" class="gDialogLink"
+ title="<?= sprintf(_("Do you really want to delete %s"), $user->name) ?>">
+ <?= _("delete") ?></a>
<? endif ?>
</li>
<? endforeach ?>
- <li><a href="users/add_form" class="gDialogLink"><?= _("Add user") ?></a></li>
+ <li><a href="users/add_form" class="gDialogLink" title="<?= _("Add user") ?>">
+ <?= _("Add user") ?></a></li>
</ul>
</div>
</div>