You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/07/16 12:47:30 UTC
svn commit: r556577 - in /lenya/trunk/src/modules/sitetree:
java/src/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java
resources/javascript/navtree.js xslt/navigation/sitetree2nav.xsl
Author: andreas
Date: Mon Jul 16 03:47:28 2007
New Revision: 556577
URL: http://svn.apache.org/viewvc?view=rev&rev=556577
Log:
Fixed links to area nodes in sitetree. This fixes bug 42901.
Modified:
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java
lenya/trunk/src/modules/sitetree/resources/javascript/navtree.js
lenya/trunk/src/modules/sitetree/xslt/navigation/sitetree2nav.xsl
Modified: lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java?view=diff&rev=556577&r1=556576&r2=556577
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java (original)
+++ lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java Mon Jul 16 03:47:28 2007
@@ -98,6 +98,7 @@
protected static final String ATTR_ID = "id";
protected static final String ATTR_FOLDER = "folder";
protected static final String ATTR_AREA = "area";
+ protected static final String ATTR_PUBLICATION = "publication";
protected static final String ATTR_LABEL = "label";
protected static final String ATTR_VISIBLEINNAV = "visibleinnav";
protected static final String ATTR_LINK = "link";
@@ -176,6 +177,9 @@
this.contentHandler.startPrefixMapping(PREFIX, URI);
this.attributes.clear();
+ this.attributes.addAttribute("", ATTR_PUBLICATION, ATTR_PUBLICATION, "CDATA",
+ this.publication.getId());
+
if (!this.initialTree) {
this.attributes.addAttribute("", ATTR_AREA, ATTR_AREA, "CDATA", this.area);
this.attributes.addAttribute("", ATTR_BASE, ATTR_BASE, "CDATA", this.path);
Modified: lenya/trunk/src/modules/sitetree/resources/javascript/navtree.js
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/resources/javascript/navtree.js?view=diff&rev=556577&r1=556576&r2=556577
==============================================================================
--- lenya/trunk/src/modules/sitetree/resources/javascript/navtree.js (original)
+++ lenya/trunk/src/modules/sitetree/resources/javascript/navtree.js Mon Jul 16 03:47:28 2007
@@ -198,7 +198,7 @@
newSite.area = siteArea;
newSite.path = '/';
newSite.isprotected = isNodeProtected(site);
- newSite.href = AREA_BASE_PATH + "/" + langSuffix;
+ newSite.href = site.getAttribute('href') + "/" + langSuffix;
newSite.langSuffix = langSuffix;
newSite.label = site.getAttribute('label');
Modified: lenya/trunk/src/modules/sitetree/xslt/navigation/sitetree2nav.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/xslt/navigation/sitetree2nav.xsl?view=diff&rev=556577&r1=556576&r2=556577
==============================================================================
--- lenya/trunk/src/modules/sitetree/xslt/navigation/sitetree2nav.xsl (original)
+++ lenya/trunk/src/modules/sitetree/xslt/navigation/sitetree2nav.xsl Mon Jul 16 03:47:28 2007
@@ -51,7 +51,7 @@
<xsl:template match="tree:site">
- <nav:site>
+ <nav:site href="/{/tree:fragment/@publication}/{@area}">
<xsl:copy-of select="@*"/>
<xsl:apply-templates/>
</nav:site>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org