Fix up all the various little forms to have submit buttons, fieldset legends, etc etc.

5 files changed, 23 insertions, 18 deletions

diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index 897d4d13..43697165 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -80,7 +80,7 @@ class tag_Core {
     $group = $form->group("add_tag")->label(_("Add Tag"));
     $group->input("name")->label(_("Add tag"));
     $group->hidden("item_id")->value($item->id);
-    $group->submit(_("Add"));
+    $group->submit(_("Add Tag"));
     $form->add_rules_from(ORM::factory("tag"));
     return $form;
   }
@@ -90,15 +90,15 @@ class tag_Core {
     $group = $form->group("rename_tag")->label(_("Rename Tag"));
     $group->input("name")->label(_("Tag name"))->value($tag->name);
     $group->inputs["name"]->error_messages("in_use", _("There is already a tag with that name"));
-    $group->submit(_("Rename"));
+    $group->submit(_("Save"));
     $form->add_rules_from(ORM::factory("tag"));
     return $form;
   }
 
   public static function get_delete_form($tag) {
     $form = new Forge("admin/tags/delete/$tag->id", "", "post", array("id" => "gDeleteTagForm"));
-    $group = $form->group("delete_tag")->label(_("Delete Tag"));
-    $group->submit(_("Delete"));
+    $group = $form->group("delete_tag")->label(sprintf(_("Really delete tag %s?"), $tag->name));
+    $group->submit(_("Delete Tag"));
     $form->add_rules_from(ORM::factory("tag"));
     return $form;
   }
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;
   }
 
   /**
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index eef7a1e5..c31588d9 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -8,11 +8,9 @@
       <li>
         <?= $user->name ?>
         <?= ($user->last_login == 0) ? "" : "(" . date("M j, Y", $user->last_login) . ")" ?>
-        <a href="users/edit_form/<?= $user->id ?>" class="gDialogLink"
-          title="<?= _("Edit user") ?>"><?= _("edit") ?></a>
+        <a href="users/edit_form/<?= $user->id ?>" class="gDialogLink"><?= _("edit") ?></a>
         <? if (!(user::active()->id == $user->id || user::guest()->id == $user->id)): ?>
-        <a href="users/delete_form/<?= $user->id ?>" class="gDialogLink"
-          title="<?= sprintf(_("Do you really want to delete %s"), $user->name) ?>">
+        <a href="users/delete_form/<?= $user->id ?>" class="gDialogLink">
           <?= _("delete") ?></a>
         <? endif ?>
       </li>
diff --git a/modules/watermark/helpers/watermark.php b/modules/watermark/helpers/watermark.php
index 365cc793..9474d4c7 100644
--- a/modules/watermark/helpers/watermark.php
+++ b/modules/watermark/helpers/watermark.php
@@ -49,13 +49,13 @@ class watermark_Core {
     $group->dropdown("transparency")->label(_("Transparency Percent"))
       ->options($range)
       ->selected(module::get_var("watermark", "transparency"));
-    $group->submit(_("Modify"));
+    $group->submit(_("Save"));
     return $form;
   }
 
   public static function get_delete_form() {
     $form = new Forge("admin/watermarks/delete", "", "post");
-    $group = $form->group("delete_watermark")->label(_("Delete Watermark"));
+    $group = $form->group("delete_watermark")->label(_("Really delete Watermark?"));
     $group->submit(_("Delete"));
     return $form;
   }