Return-Path: 
 <forrest-cvs-return-923-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 67696 invoked by uid 500); 21 May 2003 22:58:38 -0000
Mailing-List: contact forrest-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:forrest-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:forrest-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:forrest-cvs@xml.apache.org>
Reply-To: forrest-dev@xml.apache.org
Delivered-To: mailing list forrest-cvs@xml.apache.org
Received: (qmail 67683 invoked from network); 21 May 2003 22:58:38 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 21 May 2003 22:58:38 -0000
Received: (qmail 10946 invoked by uid 1352); 21 May 2003 22:58:34 -0000
Date: 21 May 2003 22:58:34 -0000
Message-ID: <20030521225834.10944.qmail@icarus.apache.org>
From: jefft@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest/src/resources/skins/krysalis-site/xslt/html
 site2xhtml.xsl
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

jefft       2003/05/21 15:58:33

  Modified:    src/resources/skins/krysalis-site/xslt/html site2xhtml.xsl
  Log:
  Don't render a menu if there are no menu items
  
  Revision  Changes    Path
  1.14      +81 -74    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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- site2xhtml.xsl	26 Mar 2003 15:35:07 -0000	1.13
  +++ site2xhtml.xsl	21 May 2003 22:58:33 -0000	1.14
  @@ -146,80 +146,10 @@
           <table cellspacing="0" cellpadding="0" border="0" width="100%" bgcolor="#ffffff" summary="page content">
             <tr>
               <td valign="top">
  -              <table cellpadding="0" cellspacing="0" border="0" summary="menu">
  -                <tr>
  -                  <xsl:comment>================= start left top NavBar ==================</xsl:comment>
  -                  <td valign="top" rowspan="3">
  -                    <table cellspacing="0" cellpadding="0" border="0" summary="blue line">
  -                      <tr><td bgcolor="{$header-color2}"><img src="{$spacer}" alt="" height="1" width="10" /></td></tr>
  -                      <tr><td bgcolor="{$background-bars}"><font face="Arial, Helvetica, Sans-serif" size="4" color="{$menu-border}">&#160;</font></td></tr>
  -                      <tr><td bgcolor="{$header-color}"><img src="{$spacer}" alt="" height="1" width="10" /></td></tr>
  -                    </table>
  -                  </td>
  -                  <xsl:comment>================= end left top NavBar ==================</xsl:comment>
  -
  -                  <td bgcolor="{$header-color2}"><img src="{$spacer}" alt="" height="1" width="1" /></td>
  -                  <td bgcolor="{$menu-border}" valign="bottom"><img src="{$spacer}" alt="" height="10" width="10" /></td>
  -                  <td bgcolor="{$menu-border}" valign="top" nowrap="nowrap">
  -
  -                    <xsl:comment>================= start Menu items ==================</xsl:comment>
  -                    <!-- original: <xsl:apply-templates select="div[@class='menu']"/>    -->
  -
  -                    <div class="menu">
  -                        <xsl:for-each select = "div[@class='menu']/ul/li">
  -                          <xsl:call-template name = "innermenuli" />
  -                        </xsl:for-each>
  -                    </div>
  -
  -                    <xsl:comment>================= end Menu items ==================</xsl:comment>
  -                  </td>
  -                  <td bgcolor="{$menu-border}" valign="bottom"><img src="{$spacer}" alt="" height="10" width="10" /></td>
  -                  <td bgcolor="{$header-color2}"><img src="{$spacer}" alt="" height="1" width="1" /></td>
  -                </tr>
  -
  -                <tr>
  -                  <td class="bottom-left-thick" rowspan="2" colspan="2"></td>
  -                  <td bgcolor="{$header-color2}"><img src="{$spacer}" alt="" border="0" width="10" height="10" /></td>
  -                  <td class="bottom-right-thick" rowspan="2" colspan="2"></td>
  -                </tr>
  -                <tr>
  -                  <td bgcolor="{$header-color2}" height="1"><img src="{$spacer}" alt="" height="1" width="1" /></td>
  -                </tr>
  -                <tr>
  -                  <td height="5"><img src="{$spacer}" alt="" height="5" width="1" /></td>
  -                </tr>                
  -        
  -                
  -              <xsl:if test="$filename = 'index.html' and $config/credits">
  -                <xsl:for-each select="$config/credits/credit[not(@role='pdf')]">
  -                  <xsl:variable name="name" select="name"/>
  -                  <xsl:variable name="url" select="url"/>
  -                  <xsl:variable name="image" select="image"/>
  -                  <xsl:variable name="width" select="width"/>
  -                  <xsl:variable name="height" select="height"/>
  -                  <tr>
  -                    <td height="5"><img src="{$spacer}" alt="" height="5" width="1" /></td>
  -                  </tr> 
  -                  <tr> 
  -                  <td><img src="{$spacer}" alt="" height="1" width="1" /></td>
  -                  <td colspan="4" height="5" class="logos">
  -                  <a href="{$url}">
  -                    <img alt="{$name} logo" border="0">
  -                      <xsl:attribute name="src">
  -                        <xsl:if test="not(starts-with($image, 'http://'))"><xsl:value-of select="$root"/></xsl:if>
  -                        <xsl:value-of select="$image"/>
  -                      </xsl:attribute>
  -                      <xsl:if test="$width"><xsl:attribute name="width"><xsl:value-of select="$width"/></xsl:attribute></xsl:if>
  -                      <xsl:if test="$height"><xsl:attribute name="height"><xsl:value-of select="$height"/></xsl:attribute></xsl:if>
  -                    </img>
  -                    <img src="{$spacer}" border="0" alt="" width="5" height="1" />
  -                  </a>
  -                  </td>
  -                  </tr> 
  -                </xsl:for-each>
  +              <!-- If we have any menu items, draw a menu -->
  +              <xsl:if test="div[@class='menu']/ul/li">
  +                <xsl:call-template name="menu"/>
                 </xsl:if>
  -              
  -              </table>
               </td>
   
               <td width="100%" valign="top">
  @@ -346,6 +276,83 @@
           <xsl:comment>================= end Footer ==================</xsl:comment>
         </body>
       </html>
  +  </xsl:template>
  +
  +
  +  <xsl:template name="menu">
  +    <table cellpadding="0" cellspacing="0" border="0" summary="menu">
  +      <tr>
  +        <xsl:comment>================= start left top NavBar ==================</xsl:comment>
  +        <td valign="top" rowspan="3">
  +          <table cellspacing="0" cellpadding="0" border="0" summary="blue line">
  +            <tr><td bgcolor="{$header-color2}"><img src="{$spacer}" alt="" height="1" width="10" /></td></tr>
  +            <tr><td bgcolor="{$background-bars}"><font face="Arial, Helvetica, Sans-serif" size="4" color="{$menu-border}">&#160;</font></td></tr>
  +            <tr><td bgcolor="{$header-color}"><img src="{$spacer}" alt="" height="1" width="10" /></td></tr>
  +          </table>
  +        </td>
  +        <xsl:comment>================= end left top NavBar ==================</xsl:comment>
  +
  +        <td bgcolor="{$header-color2}"><img src="{$spacer}" alt="" height="1" width="1" /></td>
  +        <td bgcolor="{$menu-border}" valign="bottom"><img src="{$spacer}" alt="" height="10" width="10" /></td>
  +        <td bgcolor="{$menu-border}" valign="top" nowrap="nowrap">
  +
  +          <xsl:comment>================= start Menu items ==================</xsl:comment>
  +
  +          <div class="menu">
  +            <xsl:for-each select = "div[@class='menu']/ul/li">
  +              <xsl:call-template name = "innermenuli" />
  +            </xsl:for-each>
  +          </div>
  +
  +          <xsl:comment>================= end Menu items ==================</xsl:comment>
  +        </td>
  +        <td bgcolor="{$menu-border}" valign="bottom"><img src="{$spacer}" alt="" height="10" width="10" /></td>
  +        <td bgcolor="{$header-color2}"><img src="{$spacer}" alt="" height="1" width="1" /></td>
  +      </tr>
  +
  +      <tr>
  +        <td class="bottom-left-thick" rowspan="2" colspan="2"></td>
  +        <td bgcolor="{$header-color2}"><img src="{$spacer}" alt="" border="0" width="10" height="10" /></td>
  +        <td class="bottom-right-thick" rowspan="2" colspan="2"></td>
  +      </tr>
  +      <tr>
  +        <td bgcolor="{$header-color2}" height="1"><img src="{$spacer}" alt="" height="1" width="1" /></td>
  +      </tr>
  +      <tr>
  +        <td height="5"><img src="{$spacer}" alt="" height="5" width="1" /></td>
  +      </tr>                
  +
  +
  +      <xsl:if test="$filename = 'index.html' and $config/credits">
  +        <xsl:for-each select="$config/credits/credit[not(@role='pdf')]">
  +          <xsl:variable name="name" select="name"/>
  +          <xsl:variable name="url" select="url"/>
  +          <xsl:variable name="image" select="image"/>
  +          <xsl:variable name="width" select="width"/>
  +          <xsl:variable name="height" select="height"/>
  +          <tr>
  +            <td height="5"><img src="{$spacer}" alt="" height="5" width="1" /></td>
  +          </tr> 
  +          <tr> 
  +            <td><img src="{$spacer}" alt="" height="1" width="1" /></td>
  +            <td colspan="4" height="5" class="logos">
  +              <a href="{$url}">
  +                <img alt="{$name} logo" border="0">
  +                  <xsl:attribute name="src">
  +                    <xsl:if test="not(starts-with($image, 'http://'))"><xsl:value-of select="$root"/></xsl:if>
  +                    <xsl:value-of select="$image"/>
  +                  </xsl:attribute>
  +                  <xsl:if test="$width"><xsl:attribute name="width"><xsl:value-of select="$width"/></xsl:attribute></xsl:if>
  +                  <xsl:if test="$height"><xsl:attribute name="height"><xsl:value-of select="$height"/></xsl:attribute></xsl:if>
  +                </img>
  +                <img src="{$spacer}" border="0" alt="" width="5" height="1" />
  +              </a>
  +            </td>
  +          </tr> 
  +        </xsl:for-each>
  +      </xsl:if>
  +
  +    </table>
     </xsl:template>