From 04441e11cccceea92454d3fcbc54e0e103fb8bd6 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Tue, 16 Dec 2008 17:30:18 +0000 Subject: 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 --- modules/watermark/helpers/watermark_menu.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'modules/watermark/helpers/watermark_menu.php') 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"))); + } } } } -- cgit v1.2.3