1) Remove the load watermark from the scaffolding... use the menu option

2) The set watermark dialog is now sizing properly.  @todo is recenter in the window

2 files changed, 13 insertions, 9 deletions

diff --git a/modules/watermark/helpers/watermark.php b/modules/watermark/helpers/watermark.php
index 438fbc24..ce2d5e0b 100644
--- a/modules/watermark/helpers/watermark.php
+++ b/modules/watermark/helpers/watermark.php
@@ -19,11 +19,10 @@
  */
 class watermark_Core {
   public static function get_watermark_form() {
-    $form = new Forge("watermark/load", "", "post",
+    $form = new Forge("admin/watermark/load", "", "post",
       array("id" => "gUploadWatermarkForm", "enctype" => "multipart/form-data"));
     $group = $form->group("add_watermark")->label(_("Upload Watermark"));
     $group->upload("file")->label(_("Watermark"))->rules("allow[jpg,png,gif],size[1M]");
-    $group->submit(_("Upload"));
     return $form;
   }
 
@@ -36,9 +35,6 @@ class watermark_Core {
                       "west",       "center", "east",
                       "southwest",  "south",  "southeast"))
       ->selected("8");
-
-    $group->submit(_("Update"));
-    $group->submit(_("Reset"));
     return $form;
   }
 }
\ No newline at end of file
diff --git a/modules/watermark/helpers/watermark_menu.php b/modules/watermark/helpers/watermark_menu.php
index 384ba9c4..71927da3 100644
--- a/modules/watermark/helpers/watermark_menu.php
+++ b/modules/watermark/helpers/watermark_menu.php
@@ -23,12 +23,20 @@ class watermark_menu_Core {
   public static function site_navigation($menu, $theme) {
     $user = user::active();
     if ($user->admin) {
-       Kohana::log("debug", print_r($menu, 1));
       $menu->get("admin_menu")->append(
         Menu::Factory("dialog")
-        ->id("watermark_position")
-        ->label(_("Set Watermark Position"))
-        ->url(url::site("admin/watermark/get_form/$user->id")));
+        ->id("watermark_Load")
+        ->label(_("Load Watermark"))
+        ->url(url::site("admin/watermark/load")));
+
+      $path = module::get_var("watermark", "watermark_image_path");
+      if (!empty($path)) {
+        $menu->get("admin_menu")->append(
+          Menu::Factory("dialog")
+          ->id("watermark_position")
+          ->label(_("Set Watermark Position"))
+          ->url(url::site("admin/watermark/get_form/$user->id")));
+      }
     }
   }
 }