Add edit/delete links (they're just stubs now, but they open a dialog).

Add active/position to Watermark_Model

3 files changed, 13 insertions, 2 deletions

diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php
index 353f81c3..d1c9026d 100644
--- a/modules/watermark/controllers/admin_watermarks.php
+++ b/modules/watermark/controllers/admin_watermarks.php
@@ -56,6 +56,12 @@ class Admin_Watermarks_Controller extends Admin_Controller {
     print $view;
   }
 
+  public function edit($watermark_id) {
+  }
+
+  public function delete($watermark_id) {
+  }
+
   public function get_form($user_id) {
     try {
       $path = module::get_var("watermark", "watermark_image_path");
diff --git a/modules/watermark/helpers/watermark_installer.php b/modules/watermark/helpers/watermark_installer.php
index 387f84e3..ef4f2c2f 100644
--- a/modules/watermark/helpers/watermark_installer.php
+++ b/modules/watermark/helpers/watermark_installer.php
@@ -27,12 +27,13 @@ class watermark_installer {
           `name` varchar(32) NOT NULL,
           `width` int(9) NOT NULL,
           `height` int(9) NOT NULL,
+          `active` boolean default 0,
+          `position` boolean default 0,
           `mime_type` varchar(64) default NULL,
           PRIMARY KEY (`id`),
           UNIQUE KEY(`name`))
         ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
-      module::set_var("watermark", "watermark_position", "southeast");
       @mkdir(VARPATH . "modules/watermark");
       module::set_version("watermark", 1);
     }
diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php
index 3596b73d..06cb086f 100644
--- a/modules/watermark/views/admin_watermarks.html.php
+++ b/modules/watermark/views/admin_watermarks.html.php
@@ -2,7 +2,11 @@
 <ul class="gWatermarks">
   <? foreach ($watermarks as $watermark): ?>
   <li>
-    <img <?= photo::img_dimensions($watermark->width, $watermark->height, 72) ?> src="<?= url::file("var/modules/watermark/$watermark->name") ?>">
+    <img <?= photo::img_dimensions($watermark->width, $watermark->height, 72) ?>
+         src="<?= url::file("var/modules/watermark/$watermark->name") ?>">
+
+   <a href="<?= url::site("admin/watermarks/edit/$watermark->id") ?>" class="gDialogLink"><?= _("edit") ?></a>
+   <a href="<?= url::site("admin/watermarks/delete/$watermark->id") ?>"><?= _("delete") ?></a>
   </li>
   <? endforeach ?>
 </ul>