diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php index 5afe094e..7235e2c0 100644 --- a/core/controllers/welcome.php +++ b/core/controllers/welcome.php @@ -35,18 +35,12 @@ class Welcome_Controller extends Template_Controller { ->where("type", "photo")->orderby("level", "desc")->find(); $this->template->album_tree = $this->_load_album_tree(); $this->template->add_photo_html = $this->_get_add_photo_html(); - if (module::is_installed("watermark")) { - $this->template->add_watermark_html = $this->_get_add_watermark_html(); - } else { - $this->template->add_watermark_html = ""; - } } catch (Exception $e) { $this->template->album_count = 0; $this->template->photo_count = 0; $this->template->deepest_photo = null; $this->template->album_tree = array(); $this->template->add_photo_html = ""; - $this->template->add_watermark_html = ""; } $this->_load_user_info(); @@ -518,8 +512,4 @@ class Welcome_Controller extends Template_Controller { $parent = ORM::factory("item", $parent_id); return photo::get_add_form($parent); } - - public function _get_add_watermark_html() { - return watermark::get_watermark_form(); - } } diff --git a/core/views/welcome.html.php b/core/views/welcome.html.php index d41b81c2..7f3d27a9 100644 --- a/core/views/welcome.html.php +++ b/core/views/welcome.html.php @@ -160,9 +160,6 @@ - - -
@@ -287,9 +284,6 @@ - - -
diff --git a/modules/watermark/controllers/watermark.php b/modules/watermark/controllers/watermark.php deleted file mode 100644 index a23cce64..00000000 --- a/modules/watermark/controllers/watermark.php +++ /dev/null @@ -1,39 +0,0 @@ -validate()) { - $file = $_POST["file"]; - - $pathinfo = pathinfo($file); - $watermark_target = $pathinfo["basename"]; - if (copy($file, VARPATH . $watermark_target)) { - module::set_var("watermark", "watermark_image_path", $watermark_target); - unlink($file); - $form->success = _("Watermark saved"); - } else { - // @todo set and error message - } - } - - print $form; - } -} \ No newline at end of file diff --git a/modules/watermark/controllers/watermark_admin.php b/modules/watermark/controllers/watermark_admin.php index c6d53999..9557e27f 100644 --- a/modules/watermark/controllers/watermark_admin.php +++ b/modules/watermark/controllers/watermark_admin.php @@ -18,6 +18,27 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class Watermark_admin_Controller extends Controller { + public function load() { + $form = watermark::get_watermark_form(); + Kohana::log("debug", print_r($form, 1)); + if ($form->validate()) { + $file = $_POST["file"]; + Kohana::log("debug", $file); + + $pathinfo = pathinfo($file); + $watermark_target = $pathinfo["basename"]; + if (copy($file, VARPATH . $watermark_target)) { + module::set_var("watermark", "watermark_image_path", $watermark_target); + unlink($file); + $form->success = _("Watermark saved"); + } else { + // @todo set and error message + } + } + + print $form; + } + public function get_form($user_id) { try { // @todo check for admin user 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"))); + } } } } diff --git a/modules/watermark/js/watermark.js b/modules/watermark/js/watermark.js index 9117971e..1770abd9 100644 --- a/modules/watermark/js/watermark.js +++ b/modules/watermark/js/watermark.js @@ -1,4 +1,4 @@ -$("document").ready(function() { +$("gUploadWatermarkForm").ready(function() { ajaxify_watermark_add_form(); }); diff --git a/modules/watermark/views/watermark_position.html.php b/modules/watermark/views/watermark_position.html.php index af824ed1..663be90f 100644 --- a/modules/watermark/views/watermark_position.html.php +++ b/modules/watermark/views/watermark_position.html.php @@ -1,13 +1,23 @@ - +
-
- -
-
- -
- +
+ +
+