2 files changed, 15 insertions, 8 deletions
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index ffd344f8..262ec0e1 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -65,6 +65,7 @@ class group_Core {
     $form = new Forge("admin/groups/edit/$group->id");
     $form_group = $form->group("edit_group")->label(_("Edit Group"));
     $form_group->input("name")->label(_("Name"))->id("gName")->value($group->name);
+    $form_group->submit(_("Save"));
     $form->add_rules_from($group);
     return $form;
   }
@@ -73,14 +74,17 @@ class group_Core {
     $form = new Forge("admin/groups/add");
     $form_group = $form->group("add_group")->label(_("Add Group"));
     $form_group->input("name")->label(_("Name"))->id("gName");
+    $form_group->submit(_("Add Group"));
     $group = ORM::factory("group");
     $form->add_rules_from($group);
     return $form;
   }
 
   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;
+    $form = new Forge("admin/groups/delete/$group->id", "", "post");
+    $form_group = $form->group("delete_group")->label(
+      sprintf(_("Are you sure you want to delete group %s?"), $group->name));
+    $form_group->submit(_("Delete"));
+    return $form;
   }
 }
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 1da0b8cd..136b3d68 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -31,7 +31,7 @@ class user_Core {
     $group->input("full_name")->label(_("Full Name"))->id("gFullName")->value($user->full_name);
     $group->password("password")->label(_("Password"))->id("gPassword");
     $group->input("email")->label(_("Email"))->id("gEmail")->value($user->email);
-    $group->submit(_("Modify"));
+    $group->submit(_("Save"));
     $form->add_rules_from($user);
     return $form;
   }
@@ -43,6 +43,7 @@ class user_Core {
     $group->input("full_name")->label(_("Full Name"))->id("gFullName")->value($user->full_name);
     $group->password("password")->label(_("Password"))->id("gPassword");
     $group->input("email")->label(_("Email"))->id("gEmail")->value($user->email);
+    $group->submit(_("Modify User"));
     $form->add_rules_from($user);
     return $form;
   }
@@ -54,16 +55,18 @@ class user_Core {
     $group->input("full_name")->label(_("Full Name"))->id("gFullName");
     $group->password("password")->label(_("Password"))->id("gPassword");
     $group->input("email")->label(_("Email"))->id("gEmail");
-    $group->submit(_("Add"));
+    $group->submit(_("Add User"));
     $user = ORM::factory("user");
     $form->add_rules_from($user);
     return $form;
   }
 
   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;
+    $form = new Forge("admin/users/delete/$user->id", "", "post");
+    $group = $form->group("delete_user")->label(
+      sprintf(_("Are you sure you want to delete user %s?"), $user->name));
+    $group->submit(sprintf(_("Delete user %s"), $user->name));
+    return $form;
   }
 
   /**