3 files changed, 15 insertions, 17 deletions

diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index a1aea90f..9ffa9929 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -61,8 +61,8 @@ class group_Core {
     return model_cache::get("group", 2);
   }
 
-  public static function get_edit_form($group, $action = NULL) {
-    $form = new Forge($action);
+  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->input("name")->label(_("Name"))->id("gName")->value($group->name);
     $form_group->submit(_("Modify"));
@@ -70,8 +70,8 @@ class group_Core {
     return $form;
   }
 
-  public static function get_add_form($action = NULL) {
-    $form = new Forge($action);
+  public static function get_add_form_admin() {
+    $form = new Forge("admin/groups/create");
     $form_group = $form->group("add_group")->label(_("Add Group"));
     $form_group->input("name")->label(_("Name"))->id("gName");
     $form_group->submit(_("Create"));
@@ -80,11 +80,9 @@ class group_Core {
     return $form;
   }
 
-  public static function get_delete_form($group, $action = NULL) {
-    $form = new Forge($action);
-    $form_group = $form->group("delete_group")->label(_("Delete Group"));
-    $form_group->label(sprintf(_("Are you sure you want to delete %s?"), $group->name));
-    $form_group->submit(_("Delete"));
-    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;
   }
 }
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 35a7e24e..f2912a0f 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -63,7 +63,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));
-    return $form->render("admin_users_delete.html");
+    print $form;
   }
 
   /**
diff --git a/modules/user/helpers/user_menu.php b/modules/user/helpers/user_menu.php
index 88f30f29..713e47bb 100644
--- a/modules/user/helpers/user_menu.php
+++ b/modules/user/helpers/user_menu.php
@@ -22,15 +22,15 @@ class user_menu_Core {
     $menu->get("users_groups_menu")
       ->append(Menu::factory("link")
                ->id("list_users")
-               ->label(_("List Users"))
+               ->label(_("Users"))
                ->url(url::site("admin/users")))
       ->append(Menu::factory("link")
-               ->id("create_user")
-               ->label(_("Create new user"))
-               ->url("#"))
+               ->id("list_groups")
+               ->label(_("Groups"))
+               ->url(url::site("admin/groups")))
       ->append(Menu::factory("link")
-               ->id("edit_user")
-               ->label(_("Edit user"))
+               ->id("users_groups")
+               ->label(_("Users <-> Groups"))
                ->url("#"));
   }
 }