2 files changed, 29 insertions, 28 deletions
diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php
index 06cb086f..adeba0ef 100644
--- a/modules/watermark/views/admin_watermarks.html.php
+++ b/modules/watermark/views/admin_watermarks.html.php
@@ -1,14 +1,31 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
-<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") ?>">
+<div id="#gWatermarks">
+  <h1> <?= _("Watermarks") ?> </h1>
+  <p>
+    <?= _("You can have one watermark for your Gallery.  This watermark will be applied to all thumbnails and resized images, but it will not be applied to your full size images.  To make sure that your guests can only see watermarked images, you should restrict access to your full size images.") ?>
+  </p>
 
-   <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>
-
-<?= $form ?>
+  <? if (empty($name)): ?>
+  <a href="<?= url::site("admin/watermarks/form_add") ?>"
+     title="<?= _("Add Watermark") ?>"
+     class="gDialogLink"><?= _("Upload a watermark") ?></a>
+  <? else: ?>
+  <h2> <?= _("Active Watermark") ?> </h2>
+  <p>
+    <?= _("Note that changing this watermark will rebuild all of your thumbnails and resized images.") ?>
+  </p>
+  <p>
+    <div class="image">
+      <img width="<?= $width ?>" height="<? $height ?>" src="<?= $url ?>"/>
+    </div>
+    <div class="controls">
+      <a href="<?= url::site("admin/watermarks/form_edit") ?>"
+         title="<?= _("Edit Watermark") ?>"
+         class="gDialogLink"><?= _("edit") ?></a>
+      <a href="<?= url::site("admin/watermarks/form_delete") ?>"
+         title="<?= _("Delete Watermark") ?>"
+         class="gDialogLink"><?= _("delete") ?></a>
+    </div>
+  </p>
+  <? endif ?>
+</div>
diff --git a/modules/watermark/views/watermark_position.html.php b/modules/watermark/views/watermark_position.html.php
deleted file mode 100644
index 6a8b1d71..00000000
--- a/modules/watermark/views/watermark_position.html.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<? defined("SYSPATH") or die("No direct script access."); ?>
-<script type="text/javascript">
-  $("#gDialog").ready(watermark_dialog_initialize);
-</script>
-<div id="gWatermarkAdmin">
-  <div id="gTarget">
-    <img id="gTargetImage" src="<?= $sample_image ?>"></img>
-    <div id="gWaterMark" style="float:none;z-index:1005;position:absolute;top:100px">
-      <img id ="gWaterMarkImage" src="<?= $watermark_image ?>"
-          width="<?= $watermark_width ?>"  height="<?= $watermark_height ?>" />
-    </div>
-  </div>
-  <div id="gWatermarkPostionForm" >
-  <?= $watermark_position_form ?>
-  </div>
-</div>