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 2009/01/27 17:12:49 UTC

svn commit: r738125 - /lenya/trunk/src/modules/menubar/xslt/menubar2xhtml.xsl

Author: andreas
Date: Tue Jan 27 16:12:49 2009
New Revision: 738125

URL: http://svn.apache.org/viewvc?rev=738125&view=rev
Log:
Removing some validation issues in menubar.

Modified:
    lenya/trunk/src/modules/menubar/xslt/menubar2xhtml.xsl

Modified: lenya/trunk/src/modules/menubar/xslt/menubar2xhtml.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/menubar/xslt/menubar2xhtml.xsl?rev=738125&r1=738124&r2=738125&view=diff
==============================================================================
--- lenya/trunk/src/modules/menubar/xslt/menubar2xhtml.xsl (original)
+++ lenya/trunk/src/modules/menubar/xslt/menubar2xhtml.xsl Tue Jan 27 16:12:49 2009
@@ -176,19 +176,22 @@
       </xsl:choose>
     </xsl:variable>
 
-    <xsl:choose>
-      <xsl:when test="$tabName = $currentTab">
-        <!-- 
-           FIXME: why do we normalize-space here? fiddling with uris is none of our business. 
-           Looks like a workaround for a real bug that should be fixed. Sure, we don't allow spaces
-           in document URLs, but that policy decision is made elsewhere.
-        -->
-        <li id="area-{$tab-area}-active" class="area-active"><a href="/{$publicationid}/{$tab-area}{normalize-space($tab-documenturl)}{$queryString}" target="{$target}"><span><i18n:text><xsl:value-of select="$tabName"/></i18n:text></span></a></li>
-      </xsl:when>
-      <xsl:otherwise>
-        <li id="area-{$tab-area}" class="area-inactive"><a href="/{$publicationid}/{$tab-area}{normalize-space($tab-documenturl)}{$queryString}" target="{$target}"><span><i18n:text><xsl:value-of select="$tabName"/></i18n:text></span></a></li>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:variable name="prefix">
+      <xsl:if test="$tabName != $currentTab">in</xsl:if>
+    </xsl:variable>
+    <!-- 
+       FIXME: why do we normalize-space here? fiddling with uris is none of our business. 
+       Looks like a workaround for a real bug that should be fixed. Sure, we don't allow spaces
+       in document URLs, but that policy decision is made elsewhere.
+    -->
+    <li class="area-{$prefix}active">
+      <a href="/{$publicationid}/{$tab-area}{normalize-space($tab-documenturl)}{$queryString}">
+        <xsl:if test="$target = '_blank'">
+          <xsl:attribute name="onclick">window.open(this.href); return false;</xsl:attribute>
+        </xsl:if>
+        <span><i18n:text><xsl:value-of select="$tabName"/></i18n:text></span>
+      </a>
+    </li>
   </xsl:template>
   
   



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org