diff options
| -rw-r--r-- | modules/watermark/controllers/admin_watermarks.php | 13 | ||||
| -rw-r--r-- | modules/watermark/helpers/watermark.php | 16 | ||||
| -rw-r--r-- | modules/watermark/views/admin_watermarks.html.php | 3 |
3 files changed, 24 insertions, 8 deletions
diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php index af4d57f5..6c6c72bd 100644 --- a/modules/watermark/controllers/admin_watermarks.php +++ b/modules/watermark/controllers/admin_watermarks.php @@ -38,11 +38,10 @@ class Admin_Watermarks_Controller extends Admin_Controller { } public function edit() { - rest::http_content_type(rest::JSON); $form = watermark::get_edit_form(); if ($form->validate()) { - $position = $form->edit_watermark->position->value; - module::set_var("watermark", "position", $position); + module::set_var("watermark", "position", $form->edit_watermark->position->value); + module::set_var("watermark", "transparency", $form->edit_watermark->transparency->value); $this->_update_graphics_rules(); log::success("watermark", _("Watermark changed")); @@ -109,12 +108,12 @@ class Admin_Watermarks_Controller extends Admin_Controller { } rename($file, VARPATH . "modules/watermark/$name"); - $position = $form->add_watermark->position->value; module::set_var("watermark", "name", $name); module::set_var("watermark", "width", $image_info[0]); module::set_var("watermark", "height", $image_info[1]); module::set_var("watermark", "mime_type", $image_info["mime"]); - module::set_var("watermark", "position", $position); + module::set_var("watermark", "position", $form->add_watermark->position->value); + module::set_var("watermark", "transparency", $form->add_watermark->transparency->value); $this->_update_graphics_rules(); @unlink($file); @@ -139,8 +138,8 @@ class Admin_Watermarks_Controller extends Admin_Controller { array("file" => VARPATH . "modules/watermark/$name", "width" => module::get_var("watermark", "width"), "height" => module::get_var("watermark", "height"), - "mime_type" => module::get_var("watermark", "mime_type"), - "position" => module::get_var("watermark", "position")), + "position" => module::get_var("watermark", "position"), + "transparency" => module::get_var("watermark", "transparency")), 1000); } } diff --git a/modules/watermark/helpers/watermark.php b/modules/watermark/helpers/watermark.php index 9fae277f..365cc793 100644 --- a/modules/watermark/helpers/watermark.php +++ b/modules/watermark/helpers/watermark.php @@ -19,22 +19,36 @@ */ class watermark_Core { public static function get_add_form() { + for ($i = 1; $i <= 100; $i++) { + $range[$i] = $i; + } + $form = new Forge("admin/watermarks/add", "", "post"); $group = $form->group("add_watermark")->label(_("Upload Watermark")); $group->upload("file")->label(_("Watermark"))->rules("allow[jpg,png,gif]|size[1MB]|required"); $group->dropdown("position")->label(_("Watermark Position")) ->options(self::positions()) ->selected("southeast"); + $group->dropdown("transparency")->label(_("Transparency Percent")) + ->options($range) + ->selected(100); $group->submit(_("Upload")); return $form; } public static function get_edit_form() { + for ($i = 1; $i <= 100; $i++) { + $range[$i] = $i; + } + $form = new Forge("admin/watermarks/edit", "", "post"); $group = $form->group("edit_watermark")->label(_("Edit Watermark")); $group->dropdown("position")->label(_("Watermark Position")) ->options(self::positions()) - ->selected("southeast"); + ->selected(module::get_var("watermark", "position")); + $group->dropdown("transparency")->label(_("Transparency Percent")) + ->options($range) + ->selected(module::get_var("watermark", "transparency")); $group->submit(_("Modify")); return $form; } diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php index 7ba8a844..8473f620 100644 --- a/modules/watermark/views/admin_watermarks.html.php +++ b/modules/watermark/views/admin_watermarks.html.php @@ -20,6 +20,9 @@ <p> <?= sprintf(_("Position: %s"), watermark::position($position)) ?> </p> + <p> + <?= sprintf(_("Transparency: %s%%"), module::get_var("watermark", "transparency")) ?> + </p> </div> <div class="controls"> <a href="<?= url::site("admin/watermarks/form_edit") ?>" |