Author: sjur
Date: Fri Feb 6 07:31:32 2015
New Revision: 1657751
URL: http://svn.apache.org/r1657751
Log:
Fixed a bug in level2 tabs where multiple tabs where highlighted at the same time when using @id for tab association/identification. Now only the relevant tab is highlighted. The new code is parallel to the level1 code a few lines above. Tested locally, and it seems to work as intended. I could not find any bug reports on this issue, although FOR-127 and FOR-128 might be related. Those are very old bug reports though, and likely outdated by now.
Modified:
forrest/trunk/main/webapp/skins/common/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=1657751&r1=1657750&r2=1657751&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 Feb 6 07:31:32 2015
@@ -164,7 +164,7 @@ which is then merged by site-to-xhtml.xs
<xsl:when test="@id and @id = $matching-id">
<xsl:call-template name="level2-selected"/>
</xsl:when>
- <xsl:when test="@dir = $level2-longest-dir">
+ <xsl:when test="not(@id) and @dir=$level2-longest-dir or @href=$level2-longest-dir">
<xsl:call-template name="level2-selected"/>
</xsl:when>
<xsl:otherwise>
Date: Fri Feb 6 07:31:32 2015
New Revision: 1657751
URL: http://svn.apache.org/r1657751
Log:
Fixed a bug in level2 tabs where multiple tabs where highlighted at the same time when using @id for tab association/identification. Now only the relevant tab is highlighted. The new code is parallel to the level1 code a few lines above. Tested locally, and it seems to work as intended. I could not find any bug reports on this issue, although FOR-127 and FOR-128 might be related. Those are very old bug reports though, and likely outdated by now.
Modified:
forrest/trunk/main/webapp/skins/common/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=1657751&r1=1657750&r2=1657751&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 Feb 6 07:31:32 2015
@@ -164,7 +164,7 @@ which is then merged by site-to-xhtml.xs
<xsl:when test="@id and @id = $matching-id">
<xsl:call-template name="level2-selected"/>
</xsl:when>
- <xsl:when test="@dir = $level2-longest-dir">
+ <xsl:when test="not(@id) and @dir=$level2-longest-dir or @href=$level2-longest-dir">
<xsl:call-template name="level2-selected"/>
</xsl:when>
<xsl:otherwise>