You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by cm...@apache.org on 2003/05/03 18:39:47 UTC

cvs commit: jakarta-cactus/documentation/docs/skins/jakarta.apache.org/css apache.css

cmlenz      2003/05/03 09:39:46

  Modified:    documentation/docs/skins/jakarta.apache.org/stylesheets
                        common.xsl document2html.xsl
               documentation/docs/skins/jakarta.apache.org/css apache.css
  Log:
  New style for the website
  
  Revision  Changes    Path
  1.11      +31 -8     jakarta-cactus/documentation/docs/skins/jakarta.apache.org/stylesheets/common.xsl
  
  Index: common.xsl
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/skins/jakarta.apache.org/stylesheets/common.xsl,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- common.xsl	30 Apr 2003 12:27:52 -0000	1.10
  +++ common.xsl	3 May 2003 16:39:46 -0000	1.11
  @@ -44,10 +44,10 @@
     <xsl:variable name="document" select="/document"/>
   
     <!-- ==================================================================== -->
  -  <!-- Get current processed file source path -->
  +  <!-- Get the path to a sitemap resource -->
     <!-- ==================================================================== -->
   
  -  <xsl:template name="get-source-from-id">
  +  <xsl:template name="check-resource-id">
       <xsl:param name="id"/>
       <!-- Issue a warning if the id is invalid -->
       <xsl:if test="not($sitemap/resource[@id=$id])">
  @@ -57,15 +57,38 @@
           <xsl:text>] has no reference in sitemap.xml</xsl:text>
         </xsl:message>
       </xsl:if>
  +  </xsl:template>
  +
  +  <xsl:template name="get-target-from-id">
  +    <xsl:param name="id"/>
  +    <xsl:call-template name="check-resource-id">
  +      <xsl:with-param name="id" select="$id"/>
  +    </xsl:call-template>
       <xsl:value-of select="$sitemap//resource[@id=$id]/@target"/>
     </xsl:template>
   
  -  <xsl:template name="get-source">
  -    <xsl:call-template name="get-source-from-id">
  +  <xsl:template name="get-target">
  +    <xsl:call-template name="get-target-from-id">
         <xsl:with-param name="id" select="$document/@id"/>
       </xsl:call-template>
     </xsl:template>
   
  +  <xsl:template name="get-resource-name">
  +    <xsl:param name="id"/>
  +    <xsl:call-template name="check-resource-id">
  +      <xsl:with-param name="id" select="$id"/>
  +    </xsl:call-template>
  +    <xsl:value-of select="$sitemap//resource[@id=$id]/@name"/>
  +  </xsl:template>
  +
  +  <xsl:template name="get-resource-description">
  +    <xsl:param name="id"/>
  +    <xsl:call-template name="check-resource-id">
  +      <xsl:with-param name="id" select="$id"/>
  +    </xsl:call-template>
  +    <xsl:value-of select="$sitemap//resource[@id=$id]/text()"/>
  +  </xsl:template>
  +
     <!-- ==================================================================== -->
     <!-- Extract directory -->
     <!-- ==================================================================== -->
  @@ -94,7 +117,7 @@
     <xsl:template name="get-base-directory">
       <xsl:call-template name="get-base-directory-internal">
         <xsl:with-param name="file">
  -        <xsl:call-template name="get-source"/>
  +        <xsl:call-template name="get-target"/>
         </xsl:with-param>
       </xsl:call-template>
     </xsl:template>
  @@ -121,13 +144,13 @@
   
     <xsl:template name="get-target-file">
       <xsl:param name="id"/>
  -    <xsl:variable name="source">
  -      <xsl:call-template name="get-source-from-id">
  +    <xsl:variable name="target">
  +      <xsl:call-template name="get-target-from-id">
           <xsl:with-param name="id" select="$id"/>
         </xsl:call-template>
       </xsl:variable>
       <xsl:call-template name="get-base-directory"/>
  -    <xsl:value-of select="$source"/>
  +    <xsl:value-of select="$target"/>
     </xsl:template>
   
   </xsl:stylesheet>
  
  
  
  1.36      +334 -497  jakarta-cactus/documentation/docs/skins/jakarta.apache.org/stylesheets/document2html.xsl
  
  Index: document2html.xsl
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/skins/jakarta.apache.org/stylesheets/document2html.xsl,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- document2html.xsl	1 Mar 2003 16:58:00 -0000	1.35
  +++ document2html.xsl	3 May 2003 16:39:46 -0000	1.36
  @@ -6,8 +6,6 @@
   <!-- ====================================================================== -->
   
   <!-- TODOS:
  -     - finish removing all style references and put them in the CSS. Only use
  -       CSS features that are standard across browsers (it is possible?).
        - modify <figure> to support site: and ext: notations
        - add warnings for external <link> not using ext:
   -->
  @@ -18,7 +16,9 @@
     <!-- Import common templates and parameters -->
     <xsl:import href="common.xsl"/>
   
  -  <xsl:output method="html" indent="no"/>
  +  <xsl:output method="html"
  +      doctype-public="-//W3C//DTD HTML 4.0 Transitional//EN"
  +      doctype-system="http://www.w3.org/TR/html4/loose.dtd"/>
   
     <!-- ==================================================================== -->
     <!-- Parameters -->
  @@ -39,16 +39,6 @@
     <xsl:param name="project.version.previous"/>
   
     <!-- ==================================================================== -->
  -  <!-- Global variables -->
  -  <!-- ==================================================================== -->
  -
  -  <!-- Defined variables -->
  -  <xsl:variable name="body-fg"    select="'#000000'"/>
  -  <xsl:variable name="body-link"  select="'#023264'"/>
  -  <xsl:variable name="banner-bg"  select="'#023264'"/>
  -  <xsl:variable name="banner-fg"  select="'#ffffff'"/>
  -
  -  <!-- ==================================================================== -->
     <!-- Document section -->
     <!-- ==================================================================== -->
   
  @@ -64,20 +54,6 @@
   
         <head>
   
  -        <!-- CSS imports -->
  -        <link rel="stylesheet" type="text/css">
  -          <xsl:attribute name="href">
  -            <xsl:value-of select="$basedir"/>
  -            <xsl:text>css/apache.css</xsl:text>
  -          </xsl:attribute>
  -        </link>
  -        <link rel="stylesheet" type="text/css" media="print">
  -          <xsl:attribute name="href">
  -            <xsl:value-of select="$basedir"/>
  -            <xsl:text>css/print.css</xsl:text>
  -          </xsl:attribute>
  -        </link>
  -
           <!-- Add the authors as a meta tag -->
           <meta name="author">
             <xsl:attribute name="content">
  @@ -88,132 +64,140 @@
             </xsl:attribute>
           </meta>
   
  +        <!-- CSS stylesheet -->
  +        <link rel="stylesheet" type="text/css">
  +          <xsl:attribute name="href">
  +            <xsl:value-of select="$basedir"/>
  +            <xsl:text>css/apache.css</xsl:text>
  +          </xsl:attribute>
  +        </link>
  +
           <!-- Add the document title -->
           <title><xsl:call-template name="get-title"/></title>
   
         </head>
   
  -      <body text="{$body-fg}" link="#525D76" vlink="{$body-link}" 
  -        alink="{$body-link}" topmargin="4" leftmargin="4" 
  -        marginwidth="4" marginheight="4" bgcolor="{$banner-fg}">
  +      <body text="#000000" link="#525D76" vlink="#023264" alink="#023264">
   
           <!-- ============================================================== -->
  -        <!-- Top level header -->
  +        <!-- Header -->
           <!-- ============================================================== -->
   
  -        <table width="100%" cellspacing="0" cellpadding="0" border="0">
  -          <tr>
  +        <div id="header">
  +          <table border="0" width="100%">
  +            <tr>
  +              <td width="50%">
  +                <div id="projectLogo">
  +                  <a href="http://jakarta.apache.org/">
  +                    <img border="0">
  +                      <xsl:attribute name="alt">
  +                        <xsl:text>The Apache Jakarta Project</xsl:text>
  +                      </xsl:attribute>
  +                      <xsl:attribute name="src">
  +                        <xsl:value-of select="$basedir"/>
  +                        <xsl:text>images/jakarta-logo.gif</xsl:text>
  +                      </xsl:attribute>
  +                    </img>
  +                  </a>
  +                </div>
  +              </td>
  +              <td width="50%">
  +                <div id="subprojectLogo">
  +                  <a href="http://jakarta.apache.org/cactus/">
  +                    <img>
  +                      <xsl:attribute name="alt">
  +                        <xsl:call-template name="get-title"/>
  +                      </xsl:attribute>
  +                      <xsl:attribute name="src">
  +                        <xsl:value-of select="$basedir"/>
  +                        <xsl:text>images/logocactus.gif</xsl:text>
  +                      </xsl:attribute>
  +                    </img>
  +                  </a>
  +                </div>
  +              </td>
  +            </tr>
  +          </table>
  +          <div id="contextBar">
  +            <table width="100%">
  +              <tr>
  +                <td id="breadCrumbs" width="50%">
  +                  <script language="JavaScript" type="text/javascript">
  +                    <xsl:attribute name="src">
  +                      <xsl:value-of select="$basedir"/>
  +                      <xsl:text>js/breadcrumbs.js</xsl:text>
  +                    </xsl:attribute>
  +                  </script>
  +                </td>
  +                <td id="status" width="50%">
  +                  Docs for:
  +                  <strong>v<xsl:value-of select="$project.version"/></strong>
  +                  <xsl:text> | </xsl:text>
  +                  <a>
  +                    <xsl:attribute name="href">
  +                      <xsl:value-of select="$basedir"/>
  +                      <xsl:choose>
  +                        <xsl:when test="contains($project.version,'dev')">
  +                          <xsl:value-of select="$project.version.previous"/>
  +                        </xsl:when>
  +                        <xsl:otherwise>
  +                          <xsl:text>..</xsl:text>
  +                        </xsl:otherwise>
  +                      </xsl:choose>
  +                    </xsl:attribute>
  +                    <xsl:text>v</xsl:text>
  +                    <xsl:value-of select="$project.version.previous"/>
  +                  </a>
  +                  &#160;&#160;
  +                  Last update: <xsl:value-of select="$last.updated.date"/>
  +                </td>
  +              </tr>
  +            </table>
  +          </div>
  +        </div>
   
  -            <!-- Display left logo (the Jakarta logo) -->
  -            <td valign="top" align="left">
  -              <a href="http://jakarta.apache.org/">
  -                <img hspace="0" vspace="0" border="0">
  -                  <xsl:attribute name="src">
  -                    <xsl:value-of select="$basedir"/>
  -                    <xsl:text>images/jakarta-logo.gif</xsl:text>
  -                  </xsl:attribute>
  -                </img>
  -              </a>
  -            </td>
  -
  -            <td width="100%" valign="middle" align="left" bgcolor="#ffffff">
  -              <a href="http://jakarta.apache.org/cactus/">
  -                <img hspace="0" vspace="0" border="0" align="right">
  -                  <xsl:attribute name="alt">
  -                    <xsl:call-template name="get-title"/>
  -                  </xsl:attribute>
  -                  <xsl:attribute name="src">
  -                    <xsl:value-of select="$basedir"/>
  -                    <xsl:text>images/logocactus.gif</xsl:text>
  -                  </xsl:attribute>
  -                </img>
  -              </a>
  -            </td>
  -          </tr>
  -          
  -          <tr>
  -            <td width="100%" height="2" colspan="2"><hr noshade="" size="1"/></td>
  -          </tr>
  -        </table>
  +        <div id="main">
   
  -        <!-- ============================================================== -->
  -        <!-- Main panel (sidebar and content) -->
  -        <!-- ============================================================== -->
  +          <table width="100%" border="0" cellpadding="0" cellspacing="0">
  +            <tr>
   
  -        <table width="100%" cellspacing="0" cellpadding="0" border="0">
  -          <tr>
  +              <!-- ======================================================== -->
  +              <!-- Sidebar -->
  +              <!-- ======================================================== -->
   
  -            <!-- ========================================================== -->
  -            <!-- Side bar -->
  -            <!-- ========================================================== -->
  -
  -            <td width="1%" valign="top">
  -            </td>
  -            <td id="sidebar" width="14%" valign="top" nowrap="1">
  -              <font size="-2">
  -                Last update: <xsl:value-of select="$last.updated.date"/>
  -              </font>
  -              <br/>
  -              <font size="-2">
  -                Docs for: <b>v<xsl:value-of select="$project.version"/></b>
  -                <xsl:text> | </xsl:text>
  -                <a>
  -                  <xsl:attribute name="href">
  -                    <xsl:value-of select="$basedir"/>
  -                    <xsl:choose>
  -                      <xsl:when test="contains($project.version,'dev')">
  -                        <xsl:value-of select="$project.version.previous"/>
  -                      </xsl:when>
  -                      <xsl:otherwise>
  -                        <xsl:text>..</xsl:text>
  -                      </xsl:otherwise>
  -                    </xsl:choose>
  -                  </xsl:attribute>
  -                  <xsl:text>v</xsl:text>
  -                  <xsl:value-of select="$project.version.previous"/>
  -                </a>
  -              </font>
  +              <td valign="top">
  +                <div id="sidebar">
  +                  <div id="navigation">
  +                    <xsl:call-template name="apply-navigation"/>
  +                  </div>
  +                </div>
  +              </td>
   
                 <!-- ======================================================== -->
  -              <!-- Menu -->
  +              <!-- Content -->
                 <!-- ======================================================== -->
  -              <br/>
  -              <font face="arial,helvetica,sanserif">
  -                <xsl:call-template name="apply-navigation"/>
  -              </font>
  -
  -            </td>
  -
  -            <!-- ========================================================== -->
  -            <!-- Content Panel -->
  -            <!-- ========================================================== -->
  -
  -            <td width="*" valign="top" align="left">
  -              <xsl:apply-templates/>
  -            </td>
   
  -          </tr>
  -        </table>
  +              <td valign="top">
  +                <div id="content">
  +                  <xsl:apply-templates/>
  +                </div>
  +              </td>
  +
  +            </tr>
  +          </table>
  +
  +        </div>
   
  -        <br/>
  -        
           <!-- ============================================================== -->
           <!-- Footer -->
           <!-- ============================================================== -->
   
  -        <table width="100%" border="0" cellspacing="0" cellpadding="0">
  -          <tr><td><hr noshade="" size="1"/></td></tr>
  -          <tr>
  -            <td align="center">
  -             <font face="arial,helvetica,sanserif" size="-1" color="{$body-link}">
  -               <i>
  -                Copyright &#169; <xsl:value-of select="$copyright"/>.
  -                All Rights Reserved.
  -               </i>
  -             </font>
  -            </td>
  -          </tr>
  -        </table>
  +        <div id="footer">
  +          <p>
  +            Copyright &#169; <xsl:value-of select="$copyright"/>.
  +            All Rights Reserved.
  +          </p>
  +        </div>
   
         </body>
   
  @@ -242,105 +226,65 @@
   
       <xsl:choose>
         <xsl:when test="name($cursite) = 'external'">
  -        <div id="menu">
  +        <li class="menuItem">
             <a href="{$cursite/@url}" target="{@id}">
  -            <font size="-{$level}">
  -              <!-- Use the label from the sitemap if none has been defined
  -                   in the navigation file -->
  -              <xsl:choose>
  -                <xsl:when test="@label">
  -                  <xsl:value-of select="@label"/>
  -                </xsl:when>
  -                <xsl:otherwise>
  -                  <xsl:value-of select="$cursite/@name"/>
  -                </xsl:otherwise>
  -              </xsl:choose>
  -            </font>
  +            <!-- Use the label from the sitemap if none has been defined
  +                 in the navigation file -->
  +            <xsl:choose>
  +              <xsl:when test="@label">
  +                <xsl:value-of select="@label"/>
  +              </xsl:when>
  +              <xsl:otherwise>
  +                <xsl:value-of select="$cursite/@name"/>
  +              </xsl:otherwise>
  +            </xsl:choose>
               <xsl:apply-templates/>
             </a>
  -        </div>
  +        </li>
         </xsl:when>
         <xsl:when test="name($cursite) = 'resource'">
  -        <div id="menu">
  +        <li class="menuItem">
             <a>
               <xsl:attribute name="href">
                 <xsl:call-template name="get-base-directory"/>
                 <xsl:value-of select="$cursite/@target"/>
               </xsl:attribute>
  -            <font size="-{$level}">
  -              <!-- Use the label from the sitemap if none has been defined
  -                   in the navigation file -->
  -              <xsl:choose>
  -                <xsl:when test="@label">
  -                  <xsl:value-of select="@label"/>
  -                </xsl:when>
  -                <xsl:otherwise>
  -                  <xsl:value-of select="$cursite/@name"/>
  -                </xsl:otherwise>
  -              </xsl:choose>
  -            </font>
  +            <xsl:attribute name="title">
  +              <xsl:variable name="description">
  +                <xsl:call-template name="get-resource-description">
  +                  <xsl:with-param name="id" select="$curid"/>
  +                </xsl:call-template>
  +              </xsl:variable>
  +              <xsl:value-of select="normalize-space($description)"/>
  +            </xsl:attribute>
  +            <!-- Use the label from the sitemap if none has been defined
  +                 in the navigation file -->
  +            <xsl:choose>
  +              <xsl:when test="@label">
  +                <xsl:value-of select="@label"/>
  +              </xsl:when>
  +              <xsl:otherwise>
  +                <xsl:value-of select="$cursite/@name"/>
  +              </xsl:otherwise>
  +            </xsl:choose>
               <xsl:apply-templates/>
             </a>
  -        </div>
  +        </li>
         </xsl:when>
         <xsl:otherwise><!-- hidden --></xsl:otherwise>
       </xsl:choose>
       
     </xsl:template>
   
  -  <xsl:template match="separator">
  -    <br/>
  -  </xsl:template>
  +  <xsl:template match="separator"></xsl:template>
   
     <xsl:template match="menu">
  -    <br/>
  -    <!-- alternate color #F3510C -->
  -    <font size="+1" color="#000000">
  +    <li class="menu">
         <xsl:value-of select="@label"/>
  -    </font>
  -    <br/>
  -    <font size="-1">
  -      <xsl:apply-templates/>
  -    </font>
  -  </xsl:template>
  -
  -  <!-- ==================================================================== -->
  -  <!-- Sitemap elements: "sitemap/resource" elements -->
  -  <!-- ==================================================================== -->
  -  <xsl:template match="sitemap">
  -
  -    <!-- s1 -->
  -    <xsl:call-template name="section">
  -      <xsl:with-param name="width">100%</xsl:with-param>
  -      <xsl:with-param name="font-size">+1</xsl:with-param>
  -      <xsl:with-param name="name"><xsl:text>Site Map</xsl:text></xsl:with-param>
  -    </xsl:call-template>
  -    
  -  </xsl:template>
  -
  -  <xsl:template match="sitemap/resource">
  -    <xsl:if test="@target">
  -      <li id="sitemap">
  -        <!-- link -->
  -        <a>
  -          <xsl:attribute name="href">
  -            <xsl:value-of select="@target"/>
  -          </xsl:attribute>
  -          <xsl:choose>
  -            <xsl:when test="@name">
  -              <xsl:value-of select="@name"/>        
  -            </xsl:when>
  -            <xsl:otherwise>
  -              <xsl:value-of select="@id"/>        
  -            </xsl:otherwise>
  -          </xsl:choose>
  -        </a>
  -        <xsl:if test="text()">
  -          <xsl:text>:</xsl:text>
  -          <xsl:apply-templates/>
  -        </xsl:if>
  -      </li>
  -    </xsl:if>
  +      <ul>
  +        <xsl:apply-templates/>
  +      </ul>
  +    </li>
     </xsl:template>
   
     <!-- ==================================================================== -->
  @@ -348,101 +292,60 @@
     <!-- ==================================================================== -->
   
     <xsl:template match="section">
  -  
       <xsl:variable name="level" select="count(ancestor::section)+1"/>
  -
  -    <xsl:choose>
  -      <xsl:when test="$level=1">
  -        <xsl:call-template name="section">
  -          <xsl:with-param name="width">100%</xsl:with-param>
  -          <xsl:with-param name="font-size">+1</xsl:with-param>
  -          <xsl:with-param name="name"><xsl:value-of select="@title"/></xsl:with-param>
  -        </xsl:call-template>
  -      </xsl:when>
  -      <xsl:when test="$level=2">
  -        <xsl:call-template name="section">
  -          <xsl:with-param name="width">98%</xsl:with-param>
  -          <xsl:with-param name="font-size">+0</xsl:with-param>
  -          <xsl:with-param name="name"><xsl:value-of select="@title"/></xsl:with-param>
  -        </xsl:call-template>
  -      </xsl:when>
  -      <xsl:when test="$level=3">
  -        <xsl:call-template name="section">
  -          <xsl:with-param name="width">96%</xsl:with-param>
  -          <xsl:with-param name="font-size">-1</xsl:with-param>
  -          <xsl:with-param name="name"><xsl:value-of select="@title"/></xsl:with-param>
  -        </xsl:call-template>
  -      </xsl:when>
  -      <xsl:otherwise>
  -        <xsl:call-template name="section">
  -          <xsl:with-param name="width">94%</xsl:with-param>
  -          <xsl:with-param name="font-size">-2</xsl:with-param>
  -          <xsl:with-param name="name"><xsl:value-of select="@title"/></xsl:with-param>
  -        </xsl:call-template>
  -      </xsl:otherwise>
  -    </xsl:choose>
  -
  +    <xsl:call-template name="section">
  +      <xsl:with-param name="level"><xsl:value-of select="$level"/></xsl:with-param>
  +    </xsl:call-template>
     </xsl:template>
   
     <xsl:template match="s1">
       <xsl:call-template name="section">
  -      <xsl:with-param name="width">100%</xsl:with-param>
  -      <xsl:with-param name="font-size">+1</xsl:with-param>
  -      <xsl:with-param name="name"><xsl:value-of select="@title"/></xsl:with-param>
  +      <xsl:with-param name="level">1</xsl:with-param>
       </xsl:call-template>
     </xsl:template>
   
     <xsl:template match="s2">
       <xsl:call-template name="section">
  -      <xsl:with-param name="width">98%</xsl:with-param>
  -      <xsl:with-param name="font-size">+0</xsl:with-param>
  -      <xsl:with-param name="name"><xsl:value-of select="@title"/></xsl:with-param>
  +      <xsl:with-param name="level">2</xsl:with-param>
       </xsl:call-template>
     </xsl:template>
   
     <xsl:template match="s3">
       <xsl:call-template name="section">
  -      <xsl:with-param name="width">96%</xsl:with-param>
  -      <xsl:with-param name="font-size">-1</xsl:with-param>
  -      <xsl:with-param name="name"><xsl:value-of select="@title"/></xsl:with-param>
  +      <xsl:with-param name="level">3</xsl:with-param>
       </xsl:call-template>
     </xsl:template>
   
     <xsl:template match="s4">
       <xsl:call-template name="section">
  -      <xsl:with-param name="width">94%</xsl:with-param>
  -      <xsl:with-param name="font-size">-2</xsl:with-param>
  -      <xsl:with-param name="name"><xsl:value-of select="@title"/></xsl:with-param>
  +      <xsl:with-param name="level">4</xsl:with-param>
       </xsl:call-template>
     </xsl:template>
   
     <xsl:template name="section">
  -   <xsl:param name="width" />
  -   <xsl:param name="font-size" />
  -   <xsl:param name="name" />
  -
  -   <div align="right">
  -    <table border="0" cellspacing="0" cellpadding="2">
  -     <xsl:attribute name="width"><xsl:value-of select="$width"/></xsl:attribute>
  -     <tr>
  -      <td bgcolor="{$body-link}">
  -       <font face="arial,helvetica,sanserif" color="#ffffff">
  -        <xsl:attribute name="size"><xsl:value-of select="$font-size"/></xsl:attribute>
  -        <b><xsl:value-of select="$name"/></b>
  -       </font>
  -      </td>
  -     </tr>
  -     <tr>
  -      <td>
  -       <font face="arial,helvetica,sanserif" color="{$body-fg}">
  -         <br/>
  -         <xsl:apply-templates/>
  -       </font>
  -      </td>
  -     </tr>
  -    </table>
  -   </div>
  -   <br/>
  +    <xsl:param name="level"/>
  +    <div class="section">
  +      <xsl:choose>
  +        <xsl:when test="$level=1">
  +          <h1><xsl:value-of select="@title"/></h1>
  +        </xsl:when>
  +        <xsl:when test="$level=2">
  +          <h2><xsl:value-of select="@title"/></h2>
  +        </xsl:when>
  +        <xsl:when test="$level=3">
  +          <h3><xsl:value-of select="@title"/></h3>
  +        </xsl:when>
  +        <xsl:when test="$level=4">
  +          <h4><xsl:value-of select="@title"/></h4>
  +        </xsl:when>
  +        <xsl:otherwise>
  +          <h5><xsl:value-of select="@title"/></h5>
  +        </xsl:otherwise>
  +      </xsl:choose>
  +      <blockquote>
  +        <xsl:apply-templates/>
  +      </blockquote>
  +    </div>
     </xsl:template>
   
     <!-- ==================================================================== -->
  @@ -450,7 +353,7 @@
     <!-- ==================================================================== -->
   
     <xsl:template match="p">
  -    <p align="justify">
  +    <p>
         <xsl:apply-templates/>
       </p>
     </xsl:template>
  @@ -460,7 +363,7 @@
     <!-- ==================================================================== -->
   
     <xsl:template match="source">
  -    <div id="source">
  +    <div class="source">
         <pre>
           <xsl:apply-templates/>
         </pre>
  @@ -472,11 +375,9 @@
     <!-- ==================================================================== -->
   
     <xsl:template match="ul|ol|dl">
  -    <blockquote>
  -      <xsl:copy>
  -        <xsl:apply-templates/>
  -      </xsl:copy>
  -    </blockquote>
  +    <xsl:copy>
  +      <xsl:apply-templates/>
  +    </xsl:copy>
     </xsl:template>
    
     <xsl:template match="li">
  @@ -491,7 +392,7 @@
       <li>
         <strong><xsl:value-of select="."/></strong>
         <xsl:text> - </xsl:text>
  -      <xsl:value-of select="following::dd"/>   
  +      <xsl:value-of select="following::dd"/>
       </li>
     </xsl:template>
    
  @@ -504,28 +405,9 @@
     <!-- ==================================================================== -->
   
     <xsl:template match="note">
  -    <p>
  -      <table width="100%" cellspacing="3" cellpadding="0" border="0">
  -        <tr>
  -          <td width="28" valign="top">
  -            <img width="28" height="29" vspace="0" 
  -              hspace="0" border="0" alt="Note">
  -              <xsl:attribute name="src">
  -                <xsl:call-template name="get-base-directory"/>
  -                <xsl:text>images/note.gif</xsl:text>
  -              </xsl:attribute>
  -            </img>
  -          </td>
  -          <td valign="top">
  -            <font size="-1" face="arial,helvetica,sanserif" color="{$body-fg}">
  -              <i>
  -                <xsl:apply-templates/>
  -              </i>
  -            </font>
  -          </td>
  -        </tr>  
  -      </table>
  -    </p>
  +    <div class="note">
  +      <xsl:apply-templates/>
  +    </div>
     </xsl:template>
   
     <!-- ==================================================================== -->
  @@ -533,10 +415,12 @@
     <!-- ==================================================================== -->
   
     <xsl:template match="table">
  -    <table width="100%" border="0" cellspacing="2" cellpadding="2">
  -      <caption><xsl:value-of select="caption"/></caption>
  -      <xsl:apply-templates/>
  -    </table>
  +    <div class="tabular">
  +      <table border="1" cellspacing="2" cellpadding="2">
  +        <caption><xsl:apply-templates select="caption"/></caption>
  +        <xsl:apply-templates/>
  +      </table>
  +    </div>
     </xsl:template>
   
     <xsl:template match="tr">
  @@ -544,40 +428,40 @@
     </xsl:template>
   
     <xsl:template match="th">
  -    <td bgcolor="#039acc" colspan="{@colspan}" rowspan="{@rowspan}" 
  -      valign="center" align="center">
  -      <font color="#ffffff" size="-1" face="arial,helvetica,sanserif">
  -        <b><xsl:apply-templates/></b>&#160;
  -      </font>
  -    </td>
  +    <th>
  +      <xsl:if test="@colspan">
  +        <xsl:attribute name="colspan">
  +          <xsl:value-of select="@colspan"/>
  +        </xsl:attribute>
  +      </xsl:if>
  +      <xsl:if test="@rowspan">
  +        <xsl:attribute name="rowspan">
  +          <xsl:value-of select="@rowspan"/>
  +        </xsl:attribute>
  +      </xsl:if>
  +      <xsl:apply-templates/>
  +    </th>
     </xsl:template>
   
     <xsl:template match="td">
  -    <xsl:choose>
  -      <xsl:when test="@nowrap">
  -        <td bgcolor="#a0ddf0" colspan="{@colspan}" rowspan="{@rowspan}" 
  -          nowrap="true" valign="top" align="left">
  -          <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -            <xsl:apply-templates/>&#160;
  -          </font>
  -        </td>
  -      </xsl:when>
  -      <xsl:otherwise>
  -        <td bgcolor="#a0ddf0" colspan="{@colspan}" rowspan="{@rowspan}" valign="top" align="left">
  -          <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -            <xsl:apply-templates/>&#160;
  -          </font>
  -        </td>
  -      </xsl:otherwise>
  -    </xsl:choose>
  -  </xsl:template>
  -
  -  <xsl:template match="tn">
  -    <td bgcolor="#ffffff" colspan="{@colspan}" rowspan="{@rowspan}">
  -      &#160;
  +    <td>
  +      <xsl:if test="@colspan">
  +        <xsl:attribute name="colspan">
  +          <xsl:value-of select="@colspan"/>
  +        </xsl:attribute>
  +      </xsl:if>
  +      <xsl:if test="@rowspan">
  +        <xsl:attribute name="rowspan">
  +          <xsl:value-of select="@rowspan"/>
  +        </xsl:attribute>
  +      </xsl:if>
  +      <xsl:if test="@nowrap">
  +        <xsl:attribute name="nowrap">true</xsl:attribute>
  +      </xsl:if>
  +      <xsl:apply-templates/>
       </td>
     </xsl:template>
  -  
  +
     <xsl:template match="caption">
       <!-- ignore since already used -->
     </xsl:template>
  @@ -599,7 +483,7 @@
     </xsl:template>
   
     <xsl:template match="code">
  -    <code><font face="courier, monospaced"><xsl:apply-templates/></font></code>
  +    <code><xsl:apply-templates/></code>
     </xsl:template>
   
     <!-- ==================================================================== -->
  @@ -607,11 +491,10 @@
     <!-- ==================================================================== -->
   
     <xsl:template match="figure">
  -    <p align="center">  
  +    <div class="figure">
         <xsl:choose>
           <xsl:when test="@width">
  -          <img alt="{@alt}" width="{@width}" height="{@height}" 
  -            border="0" vspace="4" hspace="4">
  +          <img alt="{@alt}" border="0" width="{@width}" height="{@height}">
               <xsl:attribute name="src">
                 <xsl:call-template name="get-base-directory"/>
                 <xsl:value-of select="@src"/>
  @@ -625,7 +508,7 @@
             </img>
           </xsl:when>
           <xsl:otherwise>
  -          <img alt="{@alt}" border="0" vspace="4" hspace="4">
  +          <img alt="{@alt}" border="0">
               <xsl:attribute name="src">
                 <xsl:call-template name="get-base-directory"/>
                 <xsl:value-of select="@src"/>
  @@ -639,7 +522,7 @@
             </img>
           </xsl:otherwise>
         </xsl:choose>
  -    </p>
  +    </div>
     </xsl:template>
    
     <xsl:template match="figure/map">
  @@ -651,7 +534,7 @@
     <xsl:template match="figure/map/area">
       <area shape="{@shape}" coords="{@coords}">
         <xsl:attribute name="href">
  -        <xsl:call-template name="compute-link-href">
  +        <xsl:call-template name="get-link-href">
             <xsl:with-param name="href" select="@href"/>
           </xsl:call-template>
         </xsl:attribute>
  @@ -683,10 +566,18 @@
     <xsl:template match="link">
       <a>
         <xsl:attribute name="href">
  -        <xsl:call-template name="compute-link-href">
  +        <xsl:call-template name="get-link-href">
             <xsl:with-param name="href" select="@href"/>
           </xsl:call-template>
         </xsl:attribute>
  +      <xsl:attribute name="title">
  +      	<xsl:variable name="title">
  +          <xsl:call-template name="get-link-title">
  +            <xsl:with-param name="href" select="@href"/>
  +          </xsl:call-template>
  +        </xsl:variable>
  +        <xsl:value-of select="normalize-space($title)"/>
  +      </xsl:attribute>
         <xsl:apply-templates/>
       </a>
     </xsl:template>
  @@ -695,7 +586,7 @@
       <a>
         <xsl:attribute name="href">
           <xsl:if test="@href">
  -          <xsl:call-template name="compute-link-href">
  +          <xsl:call-template name="get-link-href">
               <xsl:with-param name="href" select="@href"/>
             </xsl:call-template>
           </xsl:if>
  @@ -709,7 +600,7 @@
     <xsl:template match="fork">
       <a target="_blank">
         <xsl:attribute name="href">
  -        <xsl:call-template name="compute-link-href">
  +        <xsl:call-template name="get-link-href">
             <xsl:with-param name="href" select="@href"/>
           </xsl:call-template>
         </xsl:attribute>
  @@ -721,7 +612,7 @@
       <a name="{@id}"><xsl:comment>anchor</xsl:comment></a>
     </xsl:template>  
   
  -  <xsl:template name="compute-link-href">
  +  <xsl:template name="get-link-href">
       <xsl:param name="href"/>
       <xsl:choose>
         <xsl:when test="starts-with(@href,'site:')">
  @@ -752,6 +643,15 @@
       </xsl:choose>
     </xsl:template>
   
  +  <xsl:template name="get-link-title">
  +    <xsl:param name="href"/>
  +    <xsl:if test="starts-with(@href,'site:')">
  +      <xsl:call-template name="get-resource-description">
  +        <xsl:with-param name="id" select="substring-after(@href, 'site:')"/>
  +      </xsl:call-template>
  +    </xsl:if>
  +  </xsl:template>
  +
     <!-- ==================================================================== -->
     <!-- "br" elements -->
     <!-- ==================================================================== -->
  @@ -777,23 +677,15 @@
     <!-- ==================================================================== -->
   
     <xsl:template match="releases">
  -
  -    <!-- s1 -->
  -    <xsl:call-template name="section">
  -      <xsl:with-param name="width">100%</xsl:with-param>
  -      <xsl:with-param name="font-size">+1</xsl:with-param>
  -      <xsl:with-param name="name"><xsl:value-of select="@title"/></xsl:with-param>
  -    </xsl:call-template>
  -
  +    <div class="section">
  +      <h1><xsl:value-of select="@title"/></h1>
  +      <xsl:apply-templates select="release"/>
  +    </div>
     </xsl:template>
   
     <xsl:template match="release">
  -
  -    <!-- s2 -->
  -    <xsl:call-template name="section">
  -      <xsl:with-param name="width">98%</xsl:with-param>
  -      <xsl:with-param name="font-size">+0</xsl:with-param>
  -      <xsl:with-param name="name">
  +    <div class="section">
  +      <h2>
           <xsl:value-of select="$software"/><xsl:text> </xsl:text>
           <xsl:value-of select="@version"/>
           <xsl:if test="@date">
  @@ -801,12 +693,14 @@
             <xsl:value-of select="@date"/>
             <xsl:text>)</xsl:text>
           </xsl:if>
  -      </xsl:with-param>
  -    </xsl:call-template>
  -
  +      </h2>
  +      <ul class="changes">
  +        <xsl:apply-templates select="action"/>
  +      </ul>
  +    </div>
     </xsl:template>
   
  -  <xsl:template match="release/action">
  +  <xsl:template match="action">
       <li>
         <!-- icon -->
         <img alt="{@type}" border="0" align="absmiddle">
  @@ -817,17 +711,14 @@
             <xsl:text>.jpg</xsl:text>
           </xsl:attribute>
         </img>
  -
         <xsl:apply-templates/>
         <xsl:text>(</xsl:text><xsl:value-of select="@dev"/><xsl:text>)</xsl:text>
  -
         <xsl:if test="@due-to">
           <xsl:text> Thanks to </xsl:text>
            <!-- link -->
            <a href="mailto:{@due-to-email}"><xsl:value-of select="@due-to"/></a>
           <xsl:text>.</xsl:text>
         </xsl:if>
  -
         <xsl:if test="@fixes-bug">
           <xsl:text> Fixes </xsl:text>
            <!-- link -->
  @@ -848,67 +739,47 @@
     <!-- ==================================================================== -->
   
     <xsl:template match="cvslogs">
  -
  -    <!-- s1 -->
  -    <xsl:call-template name="section">
  -      <xsl:with-param name="width">100%</xsl:with-param>
  -      <xsl:with-param name="font-size">+1</xsl:with-param>
  -      <xsl:with-param name="name"><xsl:value-of select="@title"/></xsl:with-param>
  -    </xsl:call-template>
  -
  -    <xsl:variable name="cvslog" 
  -      select="document(concat($xdocdir,'/',$cvslogfile))/changelog"/>
  -
  -    <xsl:choose>
  -      <xsl:when test="$cvslog/entry">
  -        <!-- table -->
  -        <table width="100%" border="0" cellspacing="2" cellpadding="2">
  -          <caption><xsl:value-of select="caption"/></caption>
  -          <xsl:apply-templates select="$cvslog/entry">
  -            <xsl:sort select="concat(date,time)" order="descending"/>
  -          </xsl:apply-templates>
  -        </table>
  -      </xsl:when>
  -      <xsl:otherwise>
  -        <xsl:text>&lt;no changes&gt;</xsl:text><br/>
  -      </xsl:otherwise>
  -    </xsl:choose>
  -
  -    <br/>
  -        
  +    <div class="section">
  +      <h1><xsl:value-of select="@title"/></h1>
  +      <xsl:variable name="cvslog" 
  +        select="document(concat($xdocdir,'/',$cvslogfile))/changelog"/>
  +      <xsl:choose>
  +        <xsl:when test="$cvslog/entry">
  +          <table width="100%" border="1" cellspacing="2" cellpadding="2">
  +            <caption><xsl:value-of select="caption"/></caption>
  +            <xsl:apply-templates select="$cvslog/entry">
  +              <xsl:sort select="concat(date,time)" order="descending"/>
  +            </xsl:apply-templates>
  +          </table>
  +        </xsl:when>
  +        <xsl:otherwise>
  +          <xsl:text>&lt;no changes&gt;</xsl:text><br/>
  +        </xsl:otherwise>
  +      </xsl:choose>
  +    </div>
     </xsl:template>
   
     <xsl:template match="entry">
       <tr>
  -      <!-- td (nowrap=true) -->
  -      <td bgcolor="#a0ddf0" colspan="{@colspan}" rowspan="{@rowspan}" 
  -        nowrap="true" valign="top" align="left">
  -        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -          <xsl:value-of select="date"/>&#160;
  -        </font>
  +      <td nowrap="true">
  +        <xsl:value-of select="date"/>
         </td>
  -      <!-- td -->
  -      <td bgcolor="#a0ddf0" colspan="{@colspan}" rowspan="{@rowspan}" valign="top" align="left">
  -        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -          <xsl:for-each select="file">
  -            <a>
  -              <xsl:attribute name="href">
  -                <xsl:call-template name="get-base-directory"/>
  -                <xsl:value-of select="concat(substring-before(name, '.'),'.html')"/>
  -              </xsl:attribute>
  -              <xsl:value-of select="substring-before(name, '.')"/>
  -            </a>
  -            <xsl:if test="position()!=last()">
  -              <xsl:text>, </xsl:text>
  -            </xsl:if>
  -          </xsl:for-each>&#160;
  -        </font>
  +      <td>
  +        <xsl:for-each select="file">
  +          <a>
  +            <xsl:attribute name="href">
  +              <xsl:call-template name="get-base-directory"/>
  +              <xsl:value-of select="concat(substring-before(name, '.'),'.html')"/>
  +            </xsl:attribute>
  +            <xsl:value-of select="substring-before(name, '.')"/>
  +          </a>
  +          <xsl:if test="position()!=last()">
  +            <xsl:text>, </xsl:text>
  +          </xsl:if>
  +        </xsl:for-each>
         </td>
  -      <!-- td -->
  -      <td bgcolor="#a0ddf0" colspan="{@colspan}" rowspan="{@rowspan}" valign="top" align="left">
  -        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -          <xsl:value-of select="msg"/>&#160;
  -        </font>
  +      <td>
  +        <xsl:value-of select="msg"/>
         </td>
       </tr>
     </xsl:template>
  @@ -918,73 +789,37 @@
     <!-- ==================================================================== -->
   
     <xsl:template match="version">
  -    <!-- s1 -->
       <xsl:call-template name="section">
  -      <xsl:with-param name="width">100%</xsl:with-param>
  -      <xsl:with-param name="font-size">+1</xsl:with-param>
  -      <xsl:with-param name="name"><xsl:value-of select="@title"/></xsl:with-param>
  +      <xsl:with-param name="level">1</xsl:with-param>
       </xsl:call-template>
     </xsl:template>
   
     <xsl:template match="category">
       <!-- s2 section -->
  -    <div align="right">
  -      <table border="0" cellspacing="0" cellpadding="2" width="98%">
  -        <tr>
  -          <td bgcolor="{$body-link}">
  -            <font face="arial,helvetica,sanserif" color="#ffffff" size="+0">
  -              <b><xsl:value-of select="@title"/></b>
  -            </font>
  -          </td>
  -        </tr>
  -        <tr>
  -          <td>
  -            <font face="arial,helvetica,sanserif" color="{$body-fg}">
  -              <br/>
  -                <!-- table -->
  -                <table width="100%" border="0" cellspacing="2" cellpadding="2">
  -                  <caption><xsl:value-of select="caption"/></caption>
  -                  <tr>
  -                    <!-- th -->
  -                    <td bgcolor="#039acc" colspan="{@colspan}" rowspan="{@rowspan}" 
  -                      valign="center" align="center" width="85%">
  -                      <font color="#ffffff" size="-1" face="arial,helvetica,sanserif">
  -                        <b>Description</b>&#160;
  -                      </font>
  -                    </td>
  -                    <!-- th -->
  -                    <td bgcolor="#039acc" colspan="{@colspan}" rowspan="{@rowspan}" 
  -                      valign="center" align="center" width="15%">
  -                      <font color="#ffffff" size="-1" face="arial,helvetica,sanserif">
  -                        <b>Volunteers</b>&#160;
  -                      </font>
  -                    </td>
  -                  </tr>
  -                  <xsl:apply-templates/>
  -                </table>
  -            </font>
  -          </td>
  -        </tr>
  -      </table>
  +    <div class="section">
  +      <h2><xsl:value-of select="@title"/></h2>
  +      <div class="tabular">
  +        <table width="100%" border="1" cellspacing="2" cellpadding="2">
  +          <caption><xsl:value-of select="caption"/></caption>
  +          <tr>
  +            <th width="85%">Description</th>
  +            <th width="15%">Volunteers</th>
  +          </tr>
  +          <xsl:apply-templates/>
  +        </table>
  +      </div>
       </div>
  -    <br/>
  -  </xsl:template>  
  +  </xsl:template>
   
     <xsl:template match="category/action">
       <tr>
  -      <!-- td -->
  -      <td bgcolor="#a0ddf0" colspan="{@colspan}" rowspan="{@rowspan}" valign="top" align="left">
  -        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -          <xsl:apply-templates/>&#160;
  -        </font>
  +      <td>
  +        <xsl:apply-templates/>
         </td>
  -      <!-- td -->
  -      <td bgcolor="#a0ddf0" colspan="{@colspan}" rowspan="{@rowspan}" valign="top" align="left">
  -        <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -          <xsl:if test="@assigned-to">
  -            <xsl:value-of select="@assigned-to"/>
  -          </xsl:if>&#160;
  -        </font>
  +      <td>
  +        <xsl:if test="@assigned-to">
  +          <xsl:value-of select="@assigned-to"/>
  +        </xsl:if>
         </td>
       </tr>
    </xsl:template>
  @@ -1001,7 +836,7 @@
       <xsl:variable name="dir">
         <xsl:call-template name="get-directory">
           <xsl:with-param name="file">
  -          <xsl:call-template name="get-source"/>
  +          <xsl:call-template name="get-target"/>
           </xsl:with-param>
         </xsl:call-template>
       </xsl:variable>
  @@ -1009,15 +844,17 @@
       <xsl:variable name="perdirnav"
         select="document(concat($xdocdir,'/',$dir,'/navigation.xml'))/navigation"/>
   
  -    <xsl:choose>
  -      <xsl:when test="$perdirnav/menu">
  -        <xsl:apply-templates select="$perdirnav"/>
  -      </xsl:when>
  -      <xsl:otherwise>
  -        <xsl:apply-templates 
  -          select="document(concat($xdocdir,'/navigation.xml'))/navigation"/>
  -      </xsl:otherwise>
  -    </xsl:choose>
  +    <ul>
  +      <xsl:choose>
  +        <xsl:when test="$perdirnav/menu">
  +          <xsl:apply-templates select="$perdirnav"/>
  +        </xsl:when>
  +        <xsl:otherwise>
  +          <xsl:apply-templates 
  +            select="document(concat($xdocdir,'/navigation.xml'))/navigation"/>
  +        </xsl:otherwise>
  +      </xsl:choose>
  +    </ul>
   
     </xsl:template>
   
  
  
  
  1.5       +342 -30   jakarta-cactus/documentation/docs/skins/jakarta.apache.org/css/apache.css
  
  Index: apache.css
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/skins/jakarta.apache.org/css/apache.css,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apache.css	17 Mar 2003 22:59:54 -0000	1.4
  +++ apache.css	3 May 2003 16:39:46 -0000	1.5
  @@ -1,45 +1,357 @@
  +/* Global styles */
   body {
  - background: #fffff;
  - color: #00000;
  +  background: white;
  +  color: black;
  +  margin: 0;
   }
  -
   a:link, a:visited {
  - color: #023264;
  +  color: #023264;
   }
  - 
   code {
  - color: #023264;
  - font: 120% monospace;
  +  color: #023264;
  +  font-size: 90%;
  +}
  +img {
  +  border: 0;
  +}
  +@media screen {
  +  /* Disable table borders that have been enabled in the HTML code for NS4 */
  +  table, th, td {
  +    border: none;
  +  }
  +}
  +@media print {
  +  @page {
  +    size: auto;
  +    margin: 1.5in;
  +  }
   }
   
  -div#source {
  - background-color: #fff;
  - color: #000;
  - border-right: 1px solid #888; 
  - border-left: 1px solid #888; 
  - border-top: 1px solid #888; 
  - border-bottom: 1px solid #888; 
  - margin-right: 7px;
  - margin-left: 7px;
  - margin-top: 1em;
  +/* Styles for the page header */
  +#header {
  +  background-color: white;
  +  border-bottom: 1px solid gray;
  +  margin-bottom: 10px;
  +}
  +@media screen {
  +  body > #header {
  +    /* Hide fixed positioning from IE */
  +    position: fixed;
  +    top: 0;
  +    left: 0;
  +    right: 0;
  +    z-index: 1;
  +  }
  +}
  +@media print {
  +  #header {
  +    border-bottom: none;
  +    padding-bottom: 1em;
  +    position: static;
  +  }
  +}
  +#projectLogo {
  +  text-align: left;
  +}
  +@media print {
  +  #projectLogo {
  +    display: none;
  +  }
  +}
  +#subprojectLogo {
  +  text-align: right;
  +}
  +#contextBar {
  +  background-color: whitesmoke;
  +  border-top: solid 1px silver;
  +  border-bottom: solid 1px silver;
  +  margin-top: 4px;
  +  padding: 1px 10px;
  +}
  +@media print {
  +  #contextBar {
  +    display: none;
  +  }
  +}
  +#contextBar a:link, #contextBar a:visited {
  +  color: #023264;
  +  text-decoration: none;
  +}
  +#contextBar a:hover {
  +  color: #828DA6;
  +}
  +#breadCrumbs {
  +  font: normal x-small Arial,Helvetica,sans-serif;
  +  text-align: left;
  +  width: 50%;
  +}
  +#status {
  +  font: normal x-small Arial,Helvetica,sans-serif;
  +  text-align: right;
  +  width: 50%;
   }
   
  -div#source pre {
  - margin-right: 7px;
  - margin-left: 7px;
  +/* The area between the header and the footer */
  +@media screen {
  +  #main {
  +    padding-left: 0;
  +    padding-right: 0;
  +  }
  +  body > #main {
  +    /* Hide fixed positioning from IE */
  +    margin-top: 100px;
  +    padding-bottom: 2em;
  +  }
  +}
  +@media print {
  +  #main {
  +    margin-bottom: 25px;
  +  }
   }
   
  -div#menu {
  - margin-left: 7px;
  - margin-top: 3px;
  - margin-bottom: 3px;
  +/* Styles for the left sidebar */
  +#sidebar {
  +  vertical-align: top;
  +  margin-left: 6px;
  +  overflow: hidden;
  +  width: 160px;
  +}
  +@media screen {
  +  #navigation {
  +    font: normal small Arial,Helvetica,sans-serif;
  +    margin-left: 0;
  +  }
  +  #navigation ul {
  +    list-style: none;
  +    margin-left: 0.5em;
  +    margin-bottom: 1em;
  +    padding: 0;
  +  }
  +  #navigation > ul {
  +    margin-left: 0em;
  +  }
  +  #navigation li {
  +    margin-bottom: 0.25em;
  +  }
  +  #navigation li.menu {
  +    font-size: larger;
  +    font-weight: bolder;
  +    white-space: nowrap;
  +  }
  +  #navigation li.menuItem {
  +    font-size: smaller;
  +    font-weight: lighter;
  +    white-space: nowrap;
  +  }
  +}
  +@media print {
  +  #sidebar {
  +    display: none;
  +  }
   }
   
  -td#sidebar {
  - padding-right: 2em;
  +/* Styles for the main content area */
  +#content {
  +  margin-right: 6px;
  +  padding-left: 6px;
  +  vertical-align: top;
  +}
  +@media screen, print {
  +  #content {
  +    padding-left: 0;
  +  }
  +  #content .figure {
  +    text-align: center;
  +  }
  +  #content .note {
  +    font-style: italic;
  +    margin-left: 0.25in;
  +    margin-right: 0.25in;
  +  }
  +  #content .source {
  +    font-size: 9pt;
  +  }
  +  #content .source pre {
  +    margin-right: 7px;
  +    margin-left: 7px;
  +  }
  +  #content .tabular th {
  +    font: bolder 90% Arial,Helvetica,sans-serif;
  +  }
  +  #content .tabular td {
  +    font: normal 90% Arial,Helvetica,sans-serif;
  +  }
  +}
  +@media screen {
  +  #content h1, #content h2, #content h3, #content h4, #content h5 {
  +    color: white;
  +    font: bold 100% Arial,Helvetica,sans-serif;
  +    padding: 1px 2px;
  +  }
  +  #content h1 {
  +    background: #023264 url("../images/corner.gif") top left no-repeat;
  +    padding-left: 4px;
  +    padding-top: 2px;
  +  }
  +  #content h2, #content h3 {
  +    background: #828DA6 url("../images/corner.gif") top left no-repeat;
  +    padding-left: 4px;
  +    padding-top: 2px;
  +  }
  +  #content h3 {
  +    font-style: italic;
  +  }
  +  #content h4 {
  +    background: white none;
  +    color: #023264;
  +    border-bottom: solid thin #023264;
  +  }
  +  #content h5 {
  +    background: white none;
  +    color: #023264;
  +  }
  +  #content .note {
  +    background: url("../images/note.gif") center left no-repeat;
  +    min-height: 32px;
  +    padding-bottom: 0.5em;
  +    padding-top: 0.5em;
  +    padding-left: 40px;
  +    vertical-align: middle;
  +  }
  +  #content .section {
  +    font: normal 100% Times,serif;
  +    margin-bottom: 2em;
  +    margin-left: 1.5em;
  +  }
  +  #content .source {
  +    background-color: whitesmoke;
  +    border: 1px solid #888888;
  +    margin-right: 7px;
  +    margin-left: 7px;
  +    margin-top: 1em;
  +  }
  +  #content .tabular {
  +    margin: 0.1in;
  +  }
  +  #content .tabular th {
  +    background: #039acc url("../images/corner.gif") top left no-repeat;
  +    color: white;
  +    text-align: center;
  +    vertical-align: top;
  +  }
  +  #content .tabular td {
  +    background-color: #a0ddf0;
  +    color: black;
  +    text-align: left;
  +    vertical-align: top;
  +  }
  +}
  +@media print {
  +  #content {
  +    font: normal 12pt Times,serif;
  +    max-width: 18cm;
  +  }
  +  #content a {
  +    text-decoration: none;
  +  }
  +  #content a:after {
  +    content: " (" attr(href) ") "
  +    display: inline;
  +  }
  +  #content h1, #content h2, #content h3, #content h4, #content h5, #content h6 {
  +    font-style: italic;
  +  }
  +  #content h1 {
  +    font-size: 144%
  +  }
  +  #content h2 {
  +    font-size: 133%
  +  }
  +  #content h3 {
  +    font-size: 122%
  +  }
  +  #content h4 {
  +    font-size: 111%;
  +  }
  +  #content h5 {
  +    font-size: 100%;
  +  }
  +  #content p {
  +    text-align: justify;
  +  }
  +  #content ul {
  +    list-style-type: disc;
  +  }
  +  #content .section {
  +    margin-top: 1em;
  +  }
  +  #content .tabular {
  +    text-align: center;
  +  }
  +  #content table {
  +    border-collapse: separate;
  +    border-spacing: 0;
  +    border-style: solid;
  +  }
  +  #content th {
  +    background-color: black;
  +    color: white;
  +    empty-cells: show;
  +    font: bolder 100% Arial,Helvetica,sans-serif;
  +  }
  +  #content td {
  +    empty-cells: show;
  +    font: normal 100% Arial,Helvetica,sans-serif;
  +  }
  +  #content td:first-child {
  +    border-left: none;
  +  }
  +  #content .figure {
  +    max-width: 16cm;
  +    overflow: hidden;
  +  }
  +  #content .note {
  +    margin-bottom: 1em;
  +  }
  +  #content .note:before {
  +    border-bottom: dashed 1pt gray;
  +    display: block;
  +    font-weight: bold;
  +    content: "Note";
  +  }
  +  #content .source {
  +    margin-left: 1em;
  +  }
   }
   
  -li#sitemap {
  - margin-top: 5px;
  - margin-bottom: 5px;
  -}
  \ No newline at end of file
  +/* Styles for the page footer */
  +#footer {
  +  border-top: solid 1px gray;
  +  margin-left: 0;
  +  margin-right: 0;
  +  margin-top: 0;
  +  z-index: 1;
  +}
  +@media screen {
  +  body > #footer {
  +    /* Hide fixed positioning from IE */
  +    margin-bottom: 0;
  +    position: fixed;
  +    left: 0;
  +    right: 0;
  +    bottom: 0;
  +  }
  +}
  +#footer p {
  +  border-top: solid 1px silver;
  +  color: #023264;
  +  font: italic small Arial,Helvetica,sans-serif;
  +  margin: 0;
  +  padding: .5em;
  +  text-align: center;
  +}
  +@media screen {
  +  #footer p {
  +    background-color: whitesmoke;
  +  }
  +}
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org