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 2003/09/12 19:43:20 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/xslt/menu menu2xhtml.xsl
andreas 2003/09/12 10:43:20
Modified: src/webapp/lenya/xslt/menu menu2xhtml.xsl
Log:
fixed links from admin to other areas
Revision Changes Path
1.4 +8 -10 cocoon-lenya/src/webapp/lenya/xslt/menu/menu2xhtml.xsl
Index: menu2xhtml.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/menu/menu2xhtml.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- menu2xhtml.xsl 12 Sep 2003 13:40:16 -0000 1.3
+++ menu2xhtml.xsl 12 Sep 2003 17:43:20 -0000 1.4
@@ -45,13 +45,6 @@
<xsl:with-param name="tab-documenturl">/index.html</xsl:with-param>
</xsl:call-template>
- <xsl:variable name="tab-documenturl">
- <xsl:choose>
- <xsl:when test="$completearea = 'admin'">/index.html</xsl:when>
- <xsl:otherwise><xsl:value-of select="$documenturl"/></xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
<xsl:variable name="info-area">
<xsl:text>info-</xsl:text>
<xsl:choose>
@@ -63,7 +56,6 @@
<xsl:call-template name="area-tab">
<xsl:with-param name="tab-area" select="$info-area"/>
<xsl:with-param name="tab-area-prefix">info</xsl:with-param>
- <xsl:with-param name="tab-documenturl" select="$tab-documenturl"/>
</xsl:call-template>
<xsl:call-template name="area-tab">
@@ -120,9 +112,15 @@
<xsl:template name="area-tab">
<xsl:param name="tab-area"/>
<xsl:param name="tab-area-prefix" select="$tab-area"/>
- <xsl:param name="tab-documenturl" select="$documenturl"/>
- <a id="{$tab-area-prefix}-tab" href="{$contextprefix}/{$publicationid}/{$tab-area}{$documenturl}">
+ <xsl:variable name="tab-documenturl">
+ <xsl:choose>
+ <xsl:when test="$documentarea = 'admin'">/index.html</xsl:when>
+ <xsl:otherwise><xsl:value-of select="$documenturl"/></xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <a id="{$tab-area-prefix}-tab" href="{$contextprefix}/{$publicationid}/{$tab-area}{normalize-space($tab-documenturl)}">
<xsl:choose>
<xsl:when test="starts-with($completearea, $tab-area-prefix)">
<img border="0" src="{$image-prefix}/{$tab-area-prefix}_active.gif" />
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org