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 2003/10/02 14:25:36 UTC
cvs commit: xml-forrest/src/resources/skins/krysalis-site/xslt/html site2xhtml.xsl
jefft 2003/10/02 05:25:36
Modified: src/resources/skins/krysalis-site/scripts Tag:
FORREST_05_BRANCH menu.js
src/resources/skins/krysalis-site/xslt/html Tag:
FORREST_05_BRANCH site2xhtml.xsl
Log:
Multiple directories with the same name caused clash with collapse/expand.
Similarly with same file referenced in multiple places from site.xml
Submitted by: Dave Brondsema
Fixes Bug: FOR-70
Revision Changes Path
No revision
No revision
1.2.2.1 +1 -1 xml-forrest/src/resources/skins/krysalis-site/scripts/menu.js
Index: menu.js
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/skins/krysalis-site/scripts/menu.js,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- menu.js 23 Jul 2003 13:12:41 -0000 1.2
+++ menu.js 2 Oct 2003 12:25:36 -0000 1.2.2.1
@@ -69,7 +69,7 @@
var el = document.getElementById(obj);
var title = document.getElementById(obj+'Title');
- if(obj=="selected"&&el.style.display == ""){
+ if(obj.indexOf("_selected_")==0&&el.style.display == ""){
//nicolaken: doesn't work :-(
//title.style.backgroundImage = "url('images/chapter_open.gif')";
el.style.display = "block";
No revision
No revision
1.18.2.1 +10 -5 xml-forrest/src/resources/skins/krysalis-site/xslt/html/site2xhtml.xsl
Index: site2xhtml.xsl
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/skins/krysalis-site/xslt/html/site2xhtml.xsl,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- site2xhtml.xsl 23 Jul 2003 13:12:42 -0000 1.18
+++ site2xhtml.xsl 2 Oct 2003 12:25:36 -0000 1.18.2.1
@@ -301,7 +301,9 @@
<div class="menu">
<xsl:for-each select = "div[@class='menu']/ul/li">
- <xsl:call-template name = "innermenuli" />
+ <xsl:call-template name = "innermenuli" >
+ <xsl:with-param name="id" select="concat(position(),'B')"/>
+ </xsl:call-template>
</xsl:for-each>
</div>
@@ -358,10 +360,11 @@
<xsl:template name="innermenuli">
+ <xsl:param name="id"/>
<xsl:variable name="tagid">
<xsl:choose>
- <xsl:when test="descendant-or-self::node()/li/span/@class='sel'">selected</xsl:when>
- <xsl:otherwise><xsl:value-of select="font"/></xsl:otherwise>
+ <xsl:when test="descendant-or-self::node()/li/span/@class='sel'"><xsl:value-of select="concat('_selected_',$id)"/></xsl:when>
+ <xsl:otherwise><xsl:value-of select="concat(font,$id)"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:variable name="whichGroup">
@@ -422,7 +425,9 @@
</div>
</xsl:when>
<xsl:otherwise>
- <xsl:call-template name = "innermenuli" />
+ <xsl:call-template name = "innermenuli">
+ <xsl:with-param name="id" select="concat(position(),'A')"/>
+ </xsl:call-template>
</xsl:otherwise>
</xsl:choose>