svn commit: r966455 - in /lenya/contributions/2_0_X/modules: defaultstyle/xslt/page.xsl tagcloud/config/module.xml tagcloud/resources/javascript/TagCloud.js

Author: andreas
Date: Wed Jul 21 23:00:03 2010
New Revision: 966455

URL: http://svn.apache.org/viewvc?rev=966455&view=rev
Log:
Fix link handling in JavaScript.

Modified:
    lenya/contributions/2_0_X/modules/defaultstyle/xslt/page.xsl
    lenya/contributions/2_0_X/modules/tagcloud/config/module.xml
    lenya/contributions/2_0_X/modules/tagcloud/resources/javascript/TagCloud.js

Modified: lenya/contributions/2_0_X/modules/defaultstyle/xslt/page.xsl
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/modules/defaultstyle/xslt/page.xsl?rev=966455&r1=966454&r2=966455&view=diff
==============================================================================
--- lenya/contributions/2_0_X/modules/defaultstyle/xslt/page.xsl (original)
+++ lenya/contributions/2_0_X/modules/defaultstyle/xslt/page.xsl Wed Jul 21 23:00:03 2010
@@ -67,6 +67,7 @@
           <i:include src="cocoon://modules/atom/serviceLinks" strip-root="true"/>
           <script type="text/javascript" src="/modules/firedocs/javascript/firedocs.js"/>
         </xsl:if>
+        <i:include src="cocoon://modules/javascript/head.xml" strip-root="true"/>
         <script type="text/javascript" src="/modules/dojo/dojo/dojo.js"
           djConfig="parseOnLoad: true, bindEncoding: 'utf-8', locale: '{$language}'"/>
         <script type="text/javascript" src="/modules/tagcloud/javascript/TagCloud.js"/>

Modified: lenya/contributions/2_0_X/modules/tagcloud/config/module.xml
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/modules/tagcloud/config/module.xml?rev=966455&r1=966454&r2=966455&view=diff
==============================================================================
--- lenya/contributions/2_0_X/modules/tagcloud/config/module.xml (original)
+++ lenya/contributions/2_0_X/modules/tagcloud/config/module.xml Wed Jul 21 23:00:03 2010
@@ -20,6 +20,7 @@
   <id>org.apache.lenya.modules.tagcloud</id>
   <depends module="org.apache.lenya.modules.lucene"/>
   <depends module="org.apache.lenya.modules.dojo"/>
+  <depends module="org.apache.lenya.modules.javascript"/>
   <package>org.apache.lenya.modules</package>
   <version>0.1-dev</version>
   <name>Tag Cloud</name>

Modified: lenya/contributions/2_0_X/modules/tagcloud/resources/javascript/TagCloud.js
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/modules/tagcloud/resources/javascript/TagCloud.js?rev=966455&r1=966454&r2=966455&view=diff
==============================================================================
--- lenya/contributions/2_0_X/modules/tagcloud/resources/javascript/TagCloud.js (original)
+++ lenya/contributions/2_0_X/modules/tagcloud/resources/javascript/TagCloud.js Wed Jul 21 23:00:03 2010
@@ -18,11 +18,13 @@ dojo.require('dijit._Widget');
 dojo.require('dijit._Templated');
 dojo.provide("lenya.tagcloud.TagCloud");
 
+dojo.registerModulePath("lenya.tagcloud", Lenya.link("/../../modules/tagcloud/javascript"));
+
 dojo.declare(
   'lenya.tagcloud.TagCloud',
   [dijit._Widget, dijit._Templated],
   {
-    templatePath : new dojo._Url('', '/modules/tagcloud/javascript/templates/TagCloud.html'),
+    templatePath : dojo.moduleUrl("lenya.tagcloud", "templates/TagCloud.html"),
     
     pub: undefined,
     area: undefined,
@@ -34,7 +36,8 @@ dojo.declare(
       var that = this;
     
       dojo.xhrGet({
-        url: "/modules/tagcloud/" + this.pub + "/" + this.area + "/" + this.lang + "/tagcloud.xml",
+        url: Lenya.link("/" + this.lang + "/tagcloud.xml"),
+        content: { "lenya.module": "tagcloud" },
         handleAs: "xml",
         
         load: function(response, ioArgs) {