Author: thorsten
Date: Fri Jul 28 18:55:29 2006
New Revision: 426740
URL: http://svn.apache.org/viewvc?rev=426740&view=rev
Log:
FOR-203 - 2nd level tabs are not selected appropriately
Testing whether on child has the same id like the matching-id
Modified:
forrest/trunk/main/webapp/skins/common/xslt/html/tab-to-menu.xsl
forrest/trunk/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl
Modified: forrest/trunk/main/webapp/skins/common/xslt/html/tab-to-menu.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/common/xslt/html/tab-to-menu.xsl?rev=426740&r1=426739&r2=426740&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/common/xslt/html/tab-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/common/xslt/html/tab-to-menu.xsl Fri Jul 28
18:55:29 2006
@@ -163,7 +163,7 @@
any other HTML -->
<xsl:template name="level2tabs">
<xsl:call-template name="level2-pre-separator"/>
- <xsl:for-each select="[EMAIL PROTECTED]/tab|[EMAIL PROTECTED]/tab">
+ <xsl:for-each select="[EMAIL PROTECTED]/tab|[EMAIL
PROTECTED]/tab|tab[tab/@id=$matching-id]/tab">
<xsl:if test="position()!=1"><xsl:call-template
name="level2-separator"/></xsl:if>
<xsl:apply-templates select="." mode="level2"/>
</xsl:for-each>
Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl?rev=426740&r1=426739&r2=426740&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl Fri Jul 28
18:55:29 2006
@@ -47,11 +47,9 @@
<ul id="tabs">
<xsl:call-template name="base-tabs"/>
</ul>
- <xsl:if test="[EMAIL PROTECTED]/tab">
- <span id="level2tabs">
- <xsl:call-template name="level2tabs"/>
- </span>
- </xsl:if>
+ <span id="level2tabs">
+ <xsl:call-template name="level2tabs"/>
+ </span>
</xsl:template>
<xsl:template name="pre-separator">
