You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by je...@apache.org on 2002/11/09 14:38:01 UTC
cvs commit: xml-forrest/src/resources/skins/forrest-site/xslt/html book2menu.xsl
jefft 2002/11/09 05:38:01
Modified: . status.xml
src/resources/skins/avalon-tigris/xslt/html book2menu.xsl
src/resources/skins/forrest-site/xslt/html book2menu.xsl
Log:
Fixed selected links, which weren't being treated specially
Revision Changes Path
1.41 +3 -0 xml-forrest/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/xml-forrest/status.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- status.xml 9 Nov 2002 11:37:44 -0000 1.40
+++ status.xml 9 Nov 2002 13:38:01 -0000 1.41
@@ -98,6 +98,9 @@
<changes>
<release version="0.1" date="2002">
+ <action dev="JT" type="fix" context="skins">
+ Fixed selected menu link (meant to be inactive and yellow)
+ </action>
<action dev="JT" type="add" context="skins">
Now an id attribute on any XML element below <body> will be rendered
as an anchor which can be linked to.
1.2 +6 -5 xml-forrest/src/resources/skins/avalon-tigris/xslt/html/book2menu.xsl
Index: book2menu.xsl
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/skins/avalon-tigris/xslt/html/book2menu.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- book2menu.xsl 5 Nov 2002 07:36:49 -0000 1.1
+++ book2menu.xsl 9 Nov 2002 13:38:01 -0000 1.2
@@ -1,10 +1,11 @@
<?xml version="1.0"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:param name="path"/> <!-- filename, eg 'index.html' -->
+ <xsl:param name="path"/>
<xsl:include href="pathutils.xsl"/>
- <xsl:variable name="filename">
- <xsl:call-template name="filename">
+
+ <xsl:variable name="filename-noext">
+ <xsl:call-template name="filename-noext">
<xsl:with-param name="path" select="$path"/>
</xsl:call-template>
</xsl:variable>
@@ -25,7 +26,7 @@
<xsl:template match="menu-item">
<div class="menuItem">
<xsl:choose>
- <xsl:when test="starts-with(@href, $filename)">
+ <xsl:when test="starts-with(@href, $filename-noext)">
<span class="menuSelected"><xsl:value-of select="@label"/></span>
</xsl:when>
<xsl:otherwise>
@@ -38,7 +39,7 @@
<xsl:template match="external">
<li>
<xsl:choose>
- <xsl:when test="starts-with(@href, $filename)">
+ <xsl:when test="starts-with(@href, $filename-noext)">
<span class="externalSelected"><xsl:value-of select="@label"/></span>
</xsl:when>
<xsl:otherwise>
1.6 +15 -12 xml-forrest/src/resources/skins/forrest-site/xslt/html/book2menu.xsl
Index: book2menu.xsl
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/skins/forrest-site/xslt/html/book2menu.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- book2menu.xsl 2 Nov 2002 10:09:39 -0000 1.5
+++ book2menu.xsl 9 Nov 2002 13:38:01 -0000 1.6
@@ -13,12 +13,13 @@
<xsl:param name="path"/>
<xsl:include href="pathutils.xsl"/>
- <xsl:variable name="filename">
- <xsl:call-template name="filename">
+
+ <xsl:variable name="filename-noext">
+ <xsl:call-template name="filename-noext">
<xsl:with-param name="path" select="$path"/>
</xsl:call-template>
</xsl:variable>
-
+
<xsl:template match="book">
<div class="menu">
<ul>
@@ -26,6 +27,7 @@
</ul>
</div>
</xsl:template>
+
<xsl:template match="menu">
<li>
<font color="#CFDCED"><xsl:value-of select="@label"/></font>
@@ -34,22 +36,23 @@
</ul>
</li>
</xsl:template>
+
<xsl:template match="menu-item">
<li>
<xsl:choose>
- <xsl:when test="starts-with(@href, $filename)">
- <span class="sel"><font color="#ffcc00"><xsl:value-of select="@label"/></font></span>
- </xsl:when>
- <xsl:otherwise>
- <a href="{@href}"><xsl:value-of select="@label"/></a>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:when test="starts-with(@href, $filename-noext)">
+ <span class="sel"><font color="#ffcc00"><xsl:value-of select="@label"/></font></span>
+ </xsl:when>
+ <xsl:otherwise>
+ <a href="{@href}"><xsl:value-of select="@label"/></a>
+ </xsl:otherwise>
+ </xsl:choose>
</li>
</xsl:template>
<xsl:template match="external">
<li>
<xsl:choose>
- <xsl:when test="starts-with(@href, $filename)">
+ <xsl:when test="starts-with(@href, $filename-noext)">
<font color="#ffcc00"><xsl:value-of select="@label"/></font>
</xsl:when>
<xsl:otherwise>