From 20d5f45218073c1c4c60a32d6f939b5ae4bb6b58 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 15 Dec 2008 06:37:56 +0000
Subject: Fix the reference to jquery-ui.packed.js

---
 modules/rearrange/helpers/rearrange_block.php       | 1 -
 modules/watermark/views/watermark_position.html.php | 8 +++++++-
 themes/default/views/page.html.php                  | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/rearrange/helpers/rearrange_block.php b/modules/rearrange/helpers/rearrange_block.php
index fad891c8..579c9362 100644
--- a/modules/rearrange/helpers/rearrange_block.php
+++ b/modules/rearrange/helpers/rearrange_block.php
@@ -19,7 +19,6 @@
  */
 class rearrange_block_Core {
   public static function head($theme) {
-    $head[] = html::script("lib/jquery-ui.packed.js");
     $head[] = html::script("modules/rearrange/js/jquery.gallery.rearrange.tree.js");
 
     $url = url::file("modules/rearrange/css/rearrange.css");
diff --git a/modules/watermark/views/watermark_position.html.php b/modules/watermark/views/watermark_position.html.php
index a8175fc4..566ee57b 100644
--- a/modules/watermark/views/watermark_position.html.php
+++ b/modules/watermark/views/watermark_position.html.php
@@ -1 +1,7 @@
-<? defined("SYSPATH") or die("No direct script access."); ?>
\ No newline at end of file
+<? defined("SYSPATH") or die("No direct script access."); ?>
+<div id="gWatermarkAdmin">
+  <div id="gTargetImage" class="droppable">
+  </div>
+  <div id="gWaterMark" class="draggable">
+  </div>
+</div>
\ No newline at end of file
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 01cb2c6e..f71cfb09 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -22,7 +22,7 @@
     <script src="<?= $theme->url("js/jquery.listen-min.js") ?>" type="text/javascript"></script>
     <script src="<?= $theme->url("js/superfish.js") ?>" type="text/javascript"></script>
     <?= $theme->head() ?>
-    <script src="<?= $theme->url("lib/jquery-ui.packed.js") ?>" type="text/javascript"></script>
+    <?= html::script("lib/jquery-ui.packed.js") ?>
     <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
   </head>
 
-- 
cgit v1.2.3