From cb288eb50241cfc49d243a9221adbc5d5949c240 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 20 Jan 2010 18:34:13 +0000
Subject: [PATCH] Monotone-Parent: 055c6c35ac3904cb01f393842e5fef9041d23588
 Monotone-Revision: 950ea2f4a5916f47123e12564b35c975f97e4c78

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-01-20T18:34:13
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                                  | 3 +++
 UI/Templates/UIxPageFrame.wox                              | 4 ++--
 UI/WebServerResources/{scriptaculous => }/scriptaculous.js | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
 rename UI/WebServerResources/{scriptaculous => }/scriptaculous.js (97%)

diff --git a/ChangeLog b/ChangeLog
index b2ed36b5a..447e83566 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-01-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/scriptaculous.js: modified to use
+	ResourcesURL as base loading URL.
+
 	* UI/WebServerResources/UIxAclEditor.js (saveAcls): removed
 	method.
 	(nodeForUser): don't add a checkbox if "canSubscribeUsers" is
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index e9aa86877..9c59e8324 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -132,7 +132,7 @@
 	    <var:string value="productLocalizableStrings" const:escapeHTML="NO"/>
 	  </script>
 	  <script type="text/javascript" rsrc:src="prototype.js"><!-- space --></script>
-    <script type="text/javascript" rsrc:src="XMLHttpRequest.js"><!-- space --></script>
+          <script type="text/javascript" rsrc:src="XMLHttpRequest.js"><!-- space --></script>
 	  <script type="text/javascript" rsrc:src="tablekit.js"><!-- space --></script>
 	  <script type="text/javascript" rsrc:src="tablekit-trueresize.js"><!-- space --></script>
 	  <script type="text/javascript" rsrc:src="tablekit-sogo.js"><!-- space --></script>
@@ -142,7 +142,7 @@
 	  <script type="text/javascript" rsrc:src="HTMLTableElement.js"><!-- space --></script>
 	  <script type="text/javascript" rsrc:src="generic.js"><!-- space --></script>
 	  <script type="text/javascript" rsrc:src="SOGoDragHandles.js"><!-- space --></script>
-	  <script type="text/javascript" rsrc:src="scriptaculous/scriptaculous.js"><!-- space --></script>
+	  <script type="text/javascript" rsrc:src="scriptaculous.js"><!-- space --></script>
 	  <var:if condition="hasProductSpecificJavaScript"><script type="text/javascript"
 	      var:src="productJavaScriptURL"><!-- space --></script></var:if>
 	  <var:if condition="hasPageSpecificJavaScript"><script type="text/javascript"
diff --git a/UI/WebServerResources/scriptaculous/scriptaculous.js b/UI/WebServerResources/scriptaculous.js
similarity index 97%
rename from UI/WebServerResources/scriptaculous/scriptaculous.js
rename to UI/WebServerResources/scriptaculous.js
index 98edde72f..2efa1c8d4 100644
--- a/UI/WebServerResources/scriptaculous/scriptaculous.js
+++ b/UI/WebServerResources/scriptaculous.js
@@ -45,7 +45,7 @@ var Scriptaculous = {
        throw("script.aculo.us requires the Prototype JavaScript framework >= " +
         Scriptaculous.REQUIRED_PROTOTYPE);
 
-    var path = "/SOGo.woa/WebServerResources/scriptaculous/";
+    var path = ResourcesURL + "/scriptaculous/";
     var includes = ["effects", "dragdrop"];
     includes.each (function (include) { Scriptaculous.require (path+include+'.js') });