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

1 files changed, 19 insertions, 9 deletions

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 @@
-<? defined("SYSPATH") or die("No direct script access."); ?>
+<script>
+$("#gWatermarkAdmin").ready(function() {
+
+  var container = $("#gDialog").parent().parent();
+  var container_height = $(container).attr("offsetHeight");
+  var container_width = $(container).attr("offsetWidth");
+
+  var new_height = $("#gDialog").attr("offsetHeight") +
+    container.find("div.ui-dialog-titlebar").attr("offsetHeight") +
+    container.find("div.ui-dialog-buttonpane").attr("offsetHeight");
+  container.css("height", Math.max(new_height, container_height) + "px");
+  container.css("width", Math.max($("#gDialog").attr("offsetWidth"), container_width) + "px");
+});
+</script>
 <div id="gWatermarkAdmin">
-  <div id="gTargetImage" class="droppable">
-    <img src="<?= $sample_image ?>"></img>
-  </div>
-  <div id="gWaterMark">
-    <!--  This style and div is only temporary -->
-    <div style="background-color: #cccccc;">
-    <img src="<?= $watermark_image ?>" class="draggable"
-        width="<?= $watermark_width ?>"  height="<?= $watermark_height ?>" />
+  <div id="gTarget" class="droppable">
+    <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 ?>" class="draggable"
+          width="<?= $watermark_width ?>"  height="<?= $watermark_height ?>" />
     </div>
   </div>
   <div id="gWatermarkPostionForm" >