From 09cf227ce8916f1e92596f46927c31cc91709afe Mon Sep 17 00:00:00 2001
From: reinhard <reinhard@fsfe.org>
Date: Thu, 2 Apr 2009 16:27:40 +0000
Subject: [PATCH] Slightly more elegant solution to empty submenus.

svn path=/trunk/; revision=12433
---
 fsfeurope.xsl | 52 ++++++++++++++++++++++-----------------------------
 1 file changed, 22 insertions(+), 30 deletions(-)

diff --git a/fsfeurope.xsl b/fsfeurope.xsl
index ef63d037d6..e09254bb9c 100644
--- a/fsfeurope.xsl
+++ b/fsfeurope.xsl
@@ -104,36 +104,28 @@
                     </xsl:otherwise>
                   </xsl:choose>
                   <!-- Submenu -->
-                  <xsl:choose>
-                    <xsl:when test="/buildinfo/menuset/menu[@parent=$id]">
-                      <!--<xsl:element name="ul">-->
-                      <xsl:text disable-output-escaping="yes">&lt;ul&gt;</xsl:text>
-                    </xsl:when>
-                  </xsl:choose>
-                  <xsl:for-each select="/buildinfo/menuset/menu[@parent=$id]">
-                    <xsl:sort select="@id" />
-                    <xsl:variable name="mid"><xsl:value-of select="@id" /></xsl:variable>
-                    <xsl:element name="li">
-                      <xsl:attribute name="class">submenu</xsl:attribute>
-                      <xsl:choose>
-                        <xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
-                          <xsl:value-of select="/buildinfo/textset/text[@id=$mid]"/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                          <xsl:element name="a">
-                            <xsl:attribute name="href"><xsl:value-of select="."/></xsl:attribute>
-                            <xsl:value-of select="/buildinfo/textset/text[@id=$mid]"/>
-                          </xsl:element>
-                        </xsl:otherwise>
-                       </xsl:choose>
-                    </xsl:element>
-                  </xsl:for-each>
-                  <xsl:choose>
-                    <xsl:when test="/buildinfo/menuset/menu[@parent=$id]">
-                      <!--</xsl:element>--> <!-- /submenu ul -->
-                      <xsl:text disable-output-escaping="yes">&lt;/ul&gt;</xsl:text>
-                    </xsl:when>
-                  </xsl:choose>
+                  <xsl:if test="/buildinfo/menuset/menu[@parent=$id]">
+                    <xsl:element name="ul">-->
+                      <xsl:for-each select="/buildinfo/menuset/menu[@parent=$id]">
+                        <xsl:sort select="@id" />
+                        <xsl:variable name="mid"><xsl:value-of select="@id" /></xsl:variable>
+                        <xsl:element name="li">
+                          <xsl:attribute name="class">submenu</xsl:attribute>
+                          <xsl:choose>
+                            <xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
+                              <xsl:value-of select="/buildinfo/textset/text[@id=$mid]"/>
+                            </xsl:when>
+                            <xsl:otherwise>
+                              <xsl:element name="a">
+                                <xsl:attribute name="href"><xsl:value-of select="."/></xsl:attribute>
+                                <xsl:value-of select="/buildinfo/textset/text[@id=$mid]"/>
+                              </xsl:element>
+                            </xsl:otherwise>
+                           </xsl:choose>
+                        </xsl:element>
+                      </xsl:for-each>
+                    </xsl:element>--> <!-- /submenu ul -->
+                  </xsl:if>
                 </xsl:element> <!-- /li -->
               </xsl:for-each>
             </xsl:element> <!-- /ul -->