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/10/17 17:16:09 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/xslt/navigation sitetree2nav.xsl tabs.xsl menu.xsl breadcrumb.xsl
andreas 2003/10/17 08:16:09
Modified: src/webapp/lenya/xslt/navigation sitetree2nav.xsl tabs.xsl
menu.xsl breadcrumb.xsl
Log:
moved choice of existing language label to sitetree2nav.xsl
Revision Changes Path
1.16 +5 -1 cocoon-lenya/src/webapp/lenya/xslt/navigation/sitetree2nav.xsl
Index: sitetree2nav.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/navigation/sitetree2nav.xsl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sitetree2nav.xsl 13 Oct 2003 18:24:31 -0000 1.15
+++ sitetree2nav.xsl 17 Oct 2003 15:16:09 -0000 1.16
@@ -142,7 +142,11 @@
<xsl:attribute name="href"><xsl:value-of select="concat($path-to-context, $canonical-url)"/></xsl:attribute>
- <xsl:apply-templates>
+ <xsl:apply-templates select="tree:label[lang($existinglanguage)]">
+ <xsl:with-param name="previous-url" select="concat($basic-url, '/')"/>
+ </xsl:apply-templates>
+
+ <xsl:apply-templates select="tree:node">
<xsl:with-param name="previous-url" select="concat($basic-url, '/')"/>
</xsl:apply-templates>
1.11 +1 -11 cocoon-lenya/src/webapp/lenya/xslt/navigation/tabs.xsl
Index: tabs.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/navigation/tabs.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tabs.xsl 16 Sep 2003 18:24:30 -0000 1.10
+++ tabs.xsl 17 Oct 2003 15:16:09 -0000 1.11
@@ -15,9 +15,6 @@
exclude-result-prefixes="nav"
>
-<xsl:param name="url"/>
-<xsl:param name="chosenlanguage"/>
-<xsl:param name="defaultlanguage"/>
<xsl:template match="nav:site">
@@ -60,14 +57,7 @@
<xsl:template match="nav:label">
- <xsl:choose>
- <xsl:when test="parent::nav:node/child::nav:label[@xml:lang = $chosenlanguage]">
- <xsl:value-of select="self::*[lang($chosenlanguage)]"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="self::*[lang($defaultlanguage)]"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:value-of select="."/>
</xsl:template>
1.14 +1 -11 cocoon-lenya/src/webapp/lenya/xslt/navigation/menu.xsl
Index: menu.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/navigation/menu.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- menu.xsl 17 Sep 2003 10:35:04 -0000 1.13
+++ menu.xsl 17 Oct 2003 15:16:09 -0000 1.14
@@ -15,9 +15,6 @@
exclude-result-prefixes="nav"
>
-<xsl:param name="url"/>
-<xsl:param name="chosenlanguage"/>
-<xsl:param name="defaultlanguage"/>
<xsl:template match="nav:site">
<div id="menu">
@@ -71,14 +68,7 @@
<xsl:template match="nav:label">
- <xsl:choose>
- <xsl:when test="parent::nav:node/child::nav:label[@xml:lang = $chosenlanguage]">
- <xsl:value-of select="self::*[lang($chosenlanguage)]"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="self::*[lang($defaultlanguage)]"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:value-of select="."/>
</xsl:template>
1.12 +2 -13 cocoon-lenya/src/webapp/lenya/xslt/navigation/breadcrumb.xsl
Index: breadcrumb.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/navigation/breadcrumb.xsl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- breadcrumb.xsl 25 Sep 2003 10:27:31 -0000 1.11
+++ breadcrumb.xsl 17 Oct 2003 15:16:09 -0000 1.12
@@ -15,14 +15,10 @@
exclude-result-prefixes="nav"
>
-<xsl:param name="url"/>
-<xsl:param name="chosenlanguage"/>
-<xsl:param name="defaultlanguage"/>
-<!--<xsl:param name="breadcrumbprefix"/>-->
<xsl:template match="nav:site">
<div id="breadcrumb">
- <!--<xsl:value-of select="$breadcrumbprefix"/>--><xsl:apply-templates select="nav:node"/>
+ <xsl:apply-templates select="nav:node"/>
</div>
</xsl:template>
@@ -51,14 +47,7 @@
<xsl:template match="nav:label">
- <xsl:choose>
- <xsl:when test="parent::nav:node/child::nav:label[@xml:lang = $chosenlanguage]">
- <xsl:value-of select="self::*[lang($chosenlanguage)]"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="self::*[lang($defaultlanguage)]"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:value-of select="."/>
</xsl:template>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org