forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r526993 [2/6] - in /forrest/trunk/main/webapp/skins: coat/ coat/css/ coat/xslt/fo/ coat/xslt/html/ forrest-site/xslt/fo/ forrest-site/xslt/html/ krysalis-site/ krysalis-site/css/ krysalis-site/xslt/fo/ krysalis-site/xslt/html/ leather-dev/ ...
Date Tue, 10 Apr 2007 01:49:47 GMT
Modified: forrest/trunk/main/webapp/skins/forrest-site/xslt/html/site2xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/forrest-site/xslt/html/site2xhtml.xsl?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/forrest-site/xslt/html/site2xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/forrest-site/xslt/html/site2xhtml.xsl Mon Apr  9 18:49:44 2007
@@ -33,347 +33,391 @@
 </site>
 
 -->
-
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
   <xsl:import href="../../../common/xslt/html/site-to-xhtml.xsl"/>
- 
   <xsl:variable name="header-color" select="'#294563'"/>
   <xsl:variable name="menu-border" select="'#4C6C8F'"/>
   <xsl:variable name="background-bars" select="'#CFDCED'"/>
-
   <xsl:template match="site">
     <html>
       <head>
         <xsl:call-template name="html-meta"/>
-        <title><xsl:value-of select="div[@class='content']/table/tr/td/h1"/></title>
-        <link rel="stylesheet" href="{$root}skin/page.css" type="text/css"/>
-        <xsl:if test="//skinconfig/favicon-url">
-          <link rel="shortcut icon">
-            <xsl:attribute name="href">
-              <xsl:value-of select="concat($root,//skinconfig/favicon-url)"/>
-            </xsl:attribute>
-          </link>
+        <title><xsl:value-of select="div[@class='content']/table/tr/td/h1"/></title><link rel="stylesheet" href="{$root}skin/page.css" type="text/css"/>
+        <xsl:if test="//skinconfig/favicon-url"><link rel="shortcut icon">
+          <xsl:attribute name="href">
+            <xsl:value-of select="concat($root,//skinconfig/favicon-url)"/>
+          </xsl:attribute></link>
         </xsl:if>
       </head>
       <body bgcolor="#FFFFFF" text="#000000">
-    <xsl:comment>================= start Navigation Path ==================</xsl:comment>
-    <table cellspacing="0" cellpadding="0" border="0" width="100%" summary="navigation path">
-      <tr>
-        <td height="20" bgcolor="{$background-bars}" valign="middle" nowrap="nowrap">
-          <img class="spacer" src="{$spacer}" alt="" width="5" height="1" />
-          <xsl:comment>===== breadcrumb trail (javascript-generated) ====</xsl:comment>
-          <font face="Arial, Helvetica, Sans-serif" size="2">
-             <xsl:call-template name="breadcrumbs"/>
-          </font>
-        </td>
-      </tr>
-      <tr>
-        <td height="2" bgcolor="{$menu-border}"><img class="spacer" src="{$spacer}" alt="" width="2" height="2" /></td>
-      </tr>
-    </table>
-    <xsl:comment>================= end Navigation Path ==================</xsl:comment>
-
-    <!-- ================================= top bar with logo's and search box ===================================  -->
-
-    <xsl:comment>================= start Banner ==================</xsl:comment>
-    <table cellspacing="0" cellpadding="0" border="0" width="100%" summary="header with logos">
-      <tr>
-
-        <xsl:comment>================= start Group Logo ==================</xsl:comment>
-        <td bgcolor="{$header-color}">
-          <xsl:if test="//skinconfig/group-url">
-            <xsl:call-template name="renderlogo">
-              <xsl:with-param name="name" select="//skinconfig/group-name"/>
-              <xsl:with-param name="url" select="//skinconfig/group-url"/>
-              <xsl:with-param name="logo" select="//skinconfig/group-logo"/>
-              <xsl:with-param name="root" select="$root"/>
-              <xsl:with-param name="description" select="//skinconfig/group-description"/>
-            </xsl:call-template>
-          </xsl:if>
-        </td>
-        <xsl:comment>================= end Group Logo ==================</xsl:comment>
-        <xsl:comment>================= start Project Logo ==================</xsl:comment>
-        <td bgcolor="{$header-color}" align="center" width="100%">
-          <xsl:call-template name="renderlogo">
-            <xsl:with-param name="name" select="//skinconfig/project-name"/>
-            <xsl:with-param name="url" select="//skinconfig/project-url"/>
-            <xsl:with-param name="logo" select="//skinconfig/project-logo"/>
-            <xsl:with-param name="root" select="$root"/>
-            <xsl:with-param name="description" select="//skinconfig/project-description"/>
-          </xsl:call-template>
-        </td>
-        <xsl:comment>================= end Project Logo ==================</xsl:comment>
-
-        <xsl:comment>================= start Search ==================</xsl:comment>
-        <td bgcolor="{$header-color}" rowspan="2" valign="top">
-          <xsl:if test="$config/search">
-           <xsl:choose>
-              <xsl:when test="$config/search/@provider = 'lucene'">
-                <!-- Lucene search -->
-                <form method="get" action="{$root}{$lucene-search}">
-                  <table bgcolor="{$menu-border}" cellpadding="0" cellspacing="0" border="0" summary="search">
-                    <tr>
-                      <td colspan="3"><img class="spacer" src="{$spacer}" alt="" width="1" height="10" /></td>
-                    </tr>
-                    <tr>
-                      <td><img class="spacer" src="{$spacer}" alt="" width="1" height="1" /></td>
-                      <td nowrap="nowrap">
-                        <input type="text" id="query" name="queryString" size="15"/>
-                        <img class="spacer" src="{$spacer}" alt="" width="5" height="1" />
-                        <input type="submit" value="Search" name="Search"/>
-                        <br />
-                        <font color="white" size="2" face="Arial, Helvetica, Sans-serif">
+        <xsl:comment>================= start Navigation Path ==================</xsl:comment>
+        <table cellspacing="0" cellpadding="0" border="0" width="100%" summary="navigation path">
+          <tr>
+            <td height="20" bgcolor="{$background-bars}" valign="middle" nowrap="nowrap">
+              <img class="spacer" src="{$spacer}" alt="" width="5" height="1" />
+              <xsl:comment>===== breadcrumb trail (javascript-generated) ====</xsl:comment>
+              <font face="Arial, Helvetica, Sans-serif" size="2">
+                <xsl:call-template name="breadcrumbs"/>
+              </font>
+            </td>
+          </tr>
+          <tr>
+            <td height="2" bgcolor="{$menu-border}">
+              <img class="spacer" src="{$spacer}" alt="" width="2" height="2" />
+            </td>
+          </tr>
+        </table>
+        <xsl:comment>================= end Navigation Path ==================</xsl:comment>
+<!-- ================================= top bar with logo's and search box ===================================  -->
+        <xsl:comment>================= start Banner ==================</xsl:comment>
+        <table cellspacing="0" cellpadding="0" border="0" width="100%" summary="header with logos">
+          <tr>
+            <xsl:comment>================= start Group Logo ==================</xsl:comment>
+            <td bgcolor="{$header-color}">
+              <xsl:if test="//skinconfig/group-url">
+                <xsl:call-template name="renderlogo">
+                  <xsl:with-param name="name" select="//skinconfig/group-name"/>
+                  <xsl:with-param name="url" select="//skinconfig/group-url"/>
+                  <xsl:with-param name="logo" select="//skinconfig/group-logo"/>
+                  <xsl:with-param name="root" select="$root"/>
+                  <xsl:with-param name="description" select="//skinconfig/group-description"/>
+                </xsl:call-template>
+              </xsl:if>
+            </td>
+            <xsl:comment>================= end Group Logo ==================</xsl:comment>
+            <xsl:comment>================= start Project Logo ==================</xsl:comment>
+            <td bgcolor="{$header-color}" align="center" width="100%">
+              <xsl:call-template name="renderlogo">
+                <xsl:with-param name="name" select="//skinconfig/project-name"/>
+                <xsl:with-param name="url" select="//skinconfig/project-url"/>
+                <xsl:with-param name="logo" select="//skinconfig/project-logo"/>
+                <xsl:with-param name="root" select="$root"/>
+                <xsl:with-param name="description" select="//skinconfig/project-description"/>
+              </xsl:call-template>
+            </td>
+            <xsl:comment>================= end Project Logo ==================</xsl:comment>
+            <xsl:comment>================= start Search ==================</xsl:comment>
+            <td bgcolor="{$header-color}" rowspan="2" valign="top">
+              <xsl:if test="$config/search">
+                <xsl:choose>
+                  <xsl:when test="$config/search/@provider = 'lucene'">
+<!-- Lucene search -->
+                    <form method="get" action="{$root}{$lucene-search}">
+                      <table bgcolor="{$menu-border}" cellpadding="0" cellspacing="0" border="0" summary="search">
+                        <tr>
+                          <td colspan="3">
+                            <img class="spacer" src="{$spacer}" alt="" width="1" height="10" />
+                          </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            <img class="spacer" src="{$spacer}" alt="" width="1" height="1" />
+                          </td>
+                          <td nowrap="nowrap">
+                            <input type="text" id="query" name="queryString" size="15"/>
+                            <img class="spacer" src="{$spacer}" alt="" width="5" height="1" />
+                            <input type="submit" value="Search" name="Search"/>
+                            <br />
+                            <font color="white" size="2" face="Arial, Helvetica, Sans-serif">
                           the <xsl:value-of select="$config/search/attribute::name"/> site
                         </font>
-                      </td>
-                      <td><img class="spacer" src="{$spacer}" alt="" width="1" height="1" /></td>
-                    </tr>
-                    <tr>
-                      <td><img src="{$skin-img-dir}/search-left.gif" width="9" height="10" border="0" alt="" /></td>
-                      <td><img class="spacer" src="{$spacer}" alt="" width="1" height="1" /></td>
-                      <td><img src="{$skin-img-dir}/search-right.gif" width="9" height="10" border="0" alt="" /></td>
-                    </tr>
-                  </table>
-                </form>
-              </xsl:when>
-              <xsl:otherwise>
-                <!-- Google search -->
-                <form method="get" action="http://www.google.com/search" target="_blank">
-                  <table bgcolor="{$menu-border}" cellpadding="0" cellspacing="0" border="0" summary="search">
-                    <tr>
-                      <td colspan="3"><img class="spacer" src="{$spacer}" alt="" width="1" height="10" /></td>
-                    </tr>
-                    <tr>
-                      <td><img class="spacer" src="{$spacer}" alt="" width="1" height="1" /></td>
-                      <td nowrap="nowrap">
-                        <input type="hidden" name="as_sitesearch" value="{$config/search/attribute::domain}"/>
-                        <input type="text" id="query" name="as_q" size="15"/>
-                        <img class="spacer" src="{$spacer}" alt="" width="5" height="1" />
-                        <input type="submit" value="Search" name="Search"/>
-                        <br />
-                        <font color="white" size="2" face="Arial, Helvetica, Sans-serif">
+                          </td>
+                          <td>
+                            <img class="spacer" src="{$spacer}" alt="" width="1" height="1" />
+                          </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            <img src="{$skin-img-dir}/search-left.gif" width="9" height="10" border="0" alt="" />
+                          </td>
+                          <td>
+                            <img class="spacer" src="{$spacer}" alt="" width="1" height="1" />
+                          </td>
+                          <td>
+                            <img src="{$skin-img-dir}/search-right.gif" width="9" height="10" border="0" alt="" />
+                          </td>
+                        </tr>
+                      </table>
+                    </form>
+                  </xsl:when>
+                  <xsl:otherwise>
+<!-- Google search -->
+                    <form method="get" action="http://www.google.com/search" target="_blank">
+                      <table bgcolor="{$menu-border}" cellpadding="0" cellspacing="0" border="0" summary="search">
+                        <tr>
+                          <td colspan="3">
+                            <img class="spacer" src="{$spacer}" alt="" width="1" height="10" />
+                          </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            <img class="spacer" src="{$spacer}" alt="" width="1" height="1" />
+                          </td>
+                          <td nowrap="nowrap">
+                            <input type="hidden" name="as_sitesearch" value="{$config/search/attribute::domain}"/>
+                            <input type="text" id="query" name="as_q" size="15"/>
+                            <img class="spacer" src="{$spacer}" alt="" width="5" height="1" />
+                            <input type="submit" value="Search" name="Search"/>
+                            <br />
+                            <font color="white" size="2" face="Arial, Helvetica, Sans-serif">
                           the <xsl:value-of select="$config/search/attribute::name"/> site
                           <!-- setting search options off for the moment -->
-                          <!--
+<!--
                           <input type="radio" name="web" value="web"/>web site&#160;&#160;<input type="radio" name="mail" value="mail"/>mail lists
                           -->
-                        </font>
-                      </td>
-                      <td><img class="spacer" src="{$spacer}" alt="" width="1" height="1" /></td>
-                    </tr>
-                    <tr>
-                      <td><img src="{$skin-img-dir}/search-left.gif" width="9" height="10" border="0" alt="" /></td>
-                      <td><img class="spacer" src="{$spacer}" alt="" width="1" height="1" /></td>
-                      <td><img src="{$skin-img-dir}/search-right.gif" width="9" height="10" border="0" alt="" /></td>
-                    </tr>
-                  </table>
-                </form>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:if>
-
-        </td>
-        <xsl:comment>================= end Search ==================</xsl:comment>
-
-        <td bgcolor="{$header-color}"><img class="spacer" src="{$spacer}" alt="" width="10" height="10" /></td>
-      </tr>
-      <tr>
-        <td colspan="2" bgcolor="{$header-color}" valign="bottom">
-          <xsl:comment>================= start Tabs ==================</xsl:comment>
-          <xsl:apply-templates select="div[@class='tab']"/>
-          <xsl:comment>================= end Tabs ==================</xsl:comment>
-        </td>
-        <td bgcolor="{$header-color}"></td>
-      </tr>
-      <tr>
-        <td colspan="4" bgcolor="{$menu-border}" height="10" ><xsl:apply-templates select="div[@class='level2tab']"/></td>
-      </tr>
-    </table>
-    <xsl:comment>================= end Banner ==================</xsl:comment>
-
-    <xsl:comment>================= start Menu, NavBar, Content ==================</xsl:comment>
-    <table cellspacing="0" cellpadding="0" border="0" width="100%" bgcolor="#ffffff" summary="page content">
-      <tr>
-        <td valign="top">
-          <xsl:if test="div[@class='menu']/ul/li">
-            <xsl:call-template name="menu"/>
-        </xsl:if>
-        </td>
-        <td width="100%" valign="top">
-          <table cellspacing="0" cellpadding="0" border="0" width="100%" summary="content">
-
-            <xsl:comment>================= start middle NavBar ==================</xsl:comment>
-            <tr><td bgcolor="{$header-color}" colspan="4"><img class="spacer" src="{$spacer}" alt="" height="1" width="10" /></td></tr>
-            <tr>
-              <td bgcolor="{$background-bars}" width="10" align="left"><img class="spacer" src="{$spacer}" alt="" height="1" width="10" /></td>
-              <td bgcolor="{$background-bars}" width="50%" align="left">
-                <!-- ============ Page number =========== -->
-                <font face="Arial, Helvetica, Sans-serif" size="3" color="{$menu-border}">
+                            </font>
+                          </td>
+                          <td>
+                            <img class="spacer" src="{$spacer}" alt="" width="1" height="1" />
+                          </td>
+                        </tr>
+                        <tr>
+                          <td>
+                            <img src="{$skin-img-dir}/search-left.gif" width="9" height="10" border="0" alt="" />
+                          </td>
+                          <td>
+                            <img class="spacer" src="{$spacer}" alt="" width="1" height="1" />
+                          </td>
+                          <td>
+                            <img src="{$skin-img-dir}/search-right.gif" width="9" height="10" border="0" alt="" />
+                          </td>
+                        </tr>
+                      </table>
+                    </form>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </xsl:if>
+            </td>
+            <xsl:comment>================= end Search ==================</xsl:comment>
+            <td bgcolor="{$header-color}">
+              <img class="spacer" src="{$spacer}" alt="" width="10" height="10" />
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2" bgcolor="{$header-color}" valign="bottom">
+              <xsl:comment>================= start Tabs ==================</xsl:comment>
+              <xsl:apply-templates select="div[@class='tab']"/>
+              <xsl:comment>================= end Tabs ==================</xsl:comment>
+            </td>
+            <td bgcolor="{$header-color}"></td>
+          </tr>
+          <tr>
+            <td colspan="4" bgcolor="{$menu-border}" height="10" >
+              <xsl:apply-templates select="div[@class='level2tab']"/>
+            </td>
+          </tr>
+        </table>
+        <xsl:comment>================= end Banner ==================</xsl:comment>
+        <xsl:comment>================= start Menu, NavBar, Content ==================</xsl:comment>
+        <table cellspacing="0" cellpadding="0" border="0" width="100%" bgcolor="#ffffff" summary="page content">
+          <tr>
+            <td valign="top">
+              <xsl:if test="div[@class='menu']/ul/li">
+                <xsl:call-template name="menu"/>
+              </xsl:if>
+            </td>
+            <td width="100%" valign="top">
+              <table cellspacing="0" cellpadding="0" border="0" width="100%" summary="content">
+                <xsl:comment>================= start middle NavBar ==================</xsl:comment>
+                <tr>
+                  <td bgcolor="{$header-color}" colspan="4">
+                    <img class="spacer" src="{$spacer}" alt="" height="1" width="10" />
+                  </td>
+                </tr>
+                <tr>
+                  <td bgcolor="{$background-bars}" width="10" align="left">
+                    <img class="spacer" src="{$spacer}" alt="" height="1" width="10" />
+                  </td>
+                  <td bgcolor="{$background-bars}" width="50%" align="left">
+<!-- ============ Page number =========== -->
+                    <font face="Arial, Helvetica, Sans-serif" size="3" color="{$menu-border}">
                 &#160;
                 <!-- <b>Page 1 of 5</b> -->
-                </font>
-                <img class="spacer" src="{$spacer}" alt="" height="8" width="10" />
-              </td>
-              <td bgcolor="{$background-bars}" width="50%" align="right">
-                <!-- ============ Page navigation =========== -->
-                <font face="Arial, Helvetica, Sans-serif" size="3" color="{$menu-border}">
+                    </font>
+                    <img class="spacer" src="{$spacer}" alt="" height="8" width="10" />
+                  </td>
+                  <td bgcolor="{$background-bars}" width="50%" align="right">
+<!-- ============ Page navigation =========== -->
+                    <font face="Arial, Helvetica, Sans-serif" size="3" color="{$menu-border}">
                 &#160;
                 <!-- <b>&#171; prev&#160;&#160;<font size="4">[3]</font>&#160;&#160;next &#187;</b> -->
-                </font>
-                <img class="spacer" src="{$spacer}" alt="" height="8" width="10" />
-              </td>
-              <td bgcolor="{$background-bars}" width="10"><img class="spacer" src="{$spacer}" alt="" height="1" width="10" /></td>
-            </tr>
-            <tr><td bgcolor="{$header-color}" colspan="4"><img class="spacer" src="{$spacer}" alt="" height="1" width="10" /></td></tr>
-            <xsl:comment>================= end middle NavBar ==================</xsl:comment>
-
-
-            <xsl:comment>================= start Content==================</xsl:comment>
-            <tr>
-              <td width="10" align="left"><img class="spacer" src="{$spacer}" alt="" height="1" width="10" /></td>
-              <td width="100%" align="left" colspan="2">
-                <xsl:apply-templates select="div[@class='content']"/>
-              </td>
-              <td width="10"><img class="spacer" src="{$spacer}" alt="" height="1" width="10" /></td>
-            </tr>
-            <xsl:comment>================= end Content==================</xsl:comment>
-
-
-          </table>
-        </td>
-      </tr>
-    </table>
-    <xsl:comment>================= end Menu, NavBar, Content ==================</xsl:comment>
-
-    <xsl:comment>================= start Footer ==================</xsl:comment>
-    <table border="0" width="100%" cellpadding="0" cellspacing="0" summary="footer">
-      <tr>
-        <td bgcolor="{$menu-border}" height="1" colspan="2">
-          <img class="spacer" src="{$spacer}" alt="" width="1" height="1" />
-          <a href="{$skin-img-dir}/label.gif"/>
-          <a href="{$skin-img-dir}/page.gif"/>
-          <a href="{$skin-img-dir}/chapter.gif"/>
-          <a href="{$skin-img-dir}/chapter_open.gif"/>
-          <a href="{$skin-img-dir}/current.gif"/>
-        </td>
-      </tr>
-      <tr>
-        <td align="center" class="copyright" bgcolor="{$background-bars}" colspan="2">
-          <font face="Arial, Helvetica, Sans-Serif" size="2">
-          <xsl:choose>
-            <xsl:when test="$config/copyright-link">
-              <a>
-                <xsl:attribute name="href">
-                  <xsl:value-of select="$config/copyright-link"/>
-                </xsl:attribute>
+                    </font>
+                    <img class="spacer" src="{$spacer}" alt="" height="8" width="10" />
+                  </td>
+                  <td bgcolor="{$background-bars}" width="10">
+                    <img class="spacer" src="{$spacer}" alt="" height="1" width="10" />
+                  </td>
+                </tr>
+                <tr>
+                  <td bgcolor="{$header-color}" colspan="4">
+                    <img class="spacer" src="{$spacer}" alt="" height="1" width="10" />
+                  </td>
+                </tr>
+                <xsl:comment>================= end middle NavBar ==================</xsl:comment>
+                <xsl:comment>================= start Content==================</xsl:comment>
+                <tr>
+                  <td width="10" align="left">
+                    <img class="spacer" src="{$spacer}" alt="" height="1" width="10" />
+                  </td>
+                  <td width="100%" align="left" colspan="2">
+                    <xsl:apply-templates select="div[@class='content']"/>
+                  </td>
+                  <td width="10">
+                    <img class="spacer" src="{$spacer}" alt="" height="1" width="10" />
+                  </td>
+                </tr>
+                <xsl:comment>================= end Content==================</xsl:comment>
+              </table>
+            </td>
+          </tr>
+        </table>
+        <xsl:comment>================= end Menu, NavBar, Content ==================</xsl:comment>
+        <xsl:comment>================= start Footer ==================</xsl:comment>
+        <table border="0" width="100%" cellpadding="0" cellspacing="0" summary="footer">
+          <tr>
+            <td bgcolor="{$menu-border}" height="1" colspan="2">
+              <img class="spacer" src="{$spacer}" alt="" width="1" height="1" /><a href="{$skin-img-dir}/label.gif"/><a href="{$skin-img-dir}/page.gif"/><a href="{$skin-img-dir}/chapter.gif"/><a href="{$skin-img-dir}/chapter_open.gif"/><a href="{$skin-img-dir}/current.gif"/>
+            </td>
+          </tr>
+          <tr>
+            <td align="center" class="copyright" bgcolor="{$background-bars}" colspan="2">
+              <font face="Arial, Helvetica, Sans-Serif" size="2">
+                <xsl:choose>
+                  <xsl:when test="$config/copyright-link"><a>
+                    <xsl:attribute name="href">
+                      <xsl:value-of select="$config/copyright-link"/>
+                    </xsl:attribute>
               Copyright &#169; <xsl:value-of select="$config/year"/>&#160;
-              <xsl:value-of select="$config/vendor"/>
-              </a>
-            </xsl:when>
-            <xsl:otherwise>
+              <xsl:value-of select="$config/vendor"/></a>
+                  </xsl:when>
+                  <xsl:otherwise>
               Copyright &#169; <xsl:value-of select="$config/year"/>&#160;
               <xsl:value-of select="$config/vendor"/>
-            </xsl:otherwise>
-          </xsl:choose>
+                  </xsl:otherwise>
+                </xsl:choose>
           All rights reserved.
           <script language="JavaScript" type="text/javascript"><![CDATA[<!--
               document.write(" - "+"Last Published: " + document.lastModified);
             //  -->]]></script>
-        </font>
-        </td>
-      </tr>
-      <tr>
-        <td class="logos" bgcolor="{$background-bars}" align="left" colspan="2">
-          <xsl:if test="$filename = 'index.html'">
-            <div>
-              <!-- W3C logos -->
-              <xsl:call-template name="compliancy-logos"/>
-
-              <xsl:if test="//skinconfig/credits">
-                <img src="{$root}skin/images/spacer.gif" width="10" height="1" alt=""/>
-                <xsl:for-each select="//skinconfig/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"/>
-                  <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 class="spacer" src="{$spacer}" alt="" width="5" height="1" />
-                  </a>
-                </xsl:for-each>
+              </font>
+            </td>
+          </tr>
+          <tr>
+            <td class="logos" bgcolor="{$background-bars}" align="left" colspan="2">
+              <xsl:if test="$filename = 'index.html'">
+                <div>
+<!-- W3C logos -->
+                  <xsl:call-template name="compliancy-logos"/>
+                  <xsl:if test="//skinconfig/credits">
+                    <img src="{$root}skin/images/spacer.gif" width="10" height="1" alt=""/>
+                    <xsl:for-each select="//skinconfig/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"/><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 class="spacer" src="{$spacer}" alt="" width="5" height="1" /></a>
+                    </xsl:for-each>
+                  </xsl:if>
+                </div>
               </xsl:if>
-            </div>
-          </xsl:if>
-        <xsl:if test="//skinconfig/host-logo and not(//skinconfig/host-logo = '')">
-          <div class="host">
-            <img src="{$root}skin/images/spacer.gif" width="10" height="1" alt=""/>
-            <xsl:call-template name="renderlogo">
-              <xsl:with-param name="name" select="//skinconfig/host-name"/>
-              <xsl:with-param name="url" select="//skinconfig/host-url"/>
-              <xsl:with-param name="logo" select="//skinconfig/host-logo"/>
-              <xsl:with-param name="root" select="$root"/>
-            </xsl:call-template>
-          </div>
-        </xsl:if>
-
-        </td>
-      </tr>
-    </table>
-    <xsl:comment>================= end Footer ==================</xsl:comment>
+              <xsl:if test="//skinconfig/host-logo and not(//skinconfig/host-logo = '')">
+                <div class="host">
+                  <img src="{$root}skin/images/spacer.gif" width="10" height="1" alt=""/>
+                  <xsl:call-template name="renderlogo">
+                    <xsl:with-param name="name" select="//skinconfig/host-name"/>
+                    <xsl:with-param name="url" select="//skinconfig/host-url"/>
+                    <xsl:with-param name="logo" select="//skinconfig/host-logo"/>
+                    <xsl:with-param name="root" select="$root"/>
+                  </xsl:call-template>
+                </div>
+              </xsl:if>
+            </td>
+          </tr>
+        </table>
+        <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-color}"><img class="spacer" 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 class="spacer" src="{$spacer}" alt="" height="1" width="10" /></td></tr>
+            <tr>
+              <td bgcolor="{$header-color}">
+                <img class="spacer" 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 class="spacer" src="{$spacer}" alt="" height="1" width="10" />
+              </td>
+            </tr>
           </table>
         </td>
         <xsl:comment>================= end left top NavBar ==================</xsl:comment>
-
-        <td bgcolor="{$header-color}"><img class="spacer" src="{$spacer}" alt="" height="1" width="1" /></td>
-        <td bgcolor="{$menu-border}" valign="bottom"><img class="spacer" src="{$spacer}" alt="" height="10" width="10" /></td>
+        <td bgcolor="{$header-color}">
+          <img class="spacer" src="{$spacer}" alt="" height="1" width="1" />
+        </td>
+        <td bgcolor="{$menu-border}" valign="bottom">
+          <img class="spacer" src="{$spacer}" alt="" height="10" width="10" />
+        </td>
         <td bgcolor="{$menu-border}" valign="top" nowrap="nowrap">
           <xsl:comment>================= start Menu items ==================</xsl:comment>
           <xsl:apply-templates select="div[@class='menu']"/>
           <xsl:comment>================= end Menu items ==================</xsl:comment>
         </td>
-        <td bgcolor="{$menu-border}" valign="bottom"><img class="spacer" src="{$spacer}" alt="" height="10" width="10" /></td>
-        <td bgcolor="{$header-color}"><img class="spacer" src="{$spacer}" alt="" height="1" width="1" /></td>
+        <td bgcolor="{$menu-border}" valign="bottom">
+          <img class="spacer" src="{$spacer}" alt="" height="10" width="10" />
+        </td>
+        <td bgcolor="{$header-color}">
+          <img class="spacer" src="{$spacer}" alt="" height="1" width="1" />
+        </td>
       </tr>
       <tr>
-        <!-- Menu: bottom left -->
+<!-- Menu: bottom left -->
         <td bgcolor="{$menu-border}" rowspan="2" colspan="2" align="left" valign="bottom">
           <img src="{$skin-img-dir}/menu-left.gif" alt="" border="0" width="10" height="10" />
         </td>
-        <!-- Menu: bottom -->
+<!-- Menu: bottom -->
         <td bgcolor="{$menu-border}">
           <img class="spacer" src="{$spacer}" alt="" width="10" height="10" />
         </td>
-        <!-- Menu: bottom right -->
+<!-- Menu: bottom right -->
         <td bgcolor="{$menu-border}" rowspan="2" colspan="2" align="right" valign="bottom">
           <img src="{$skin-img-dir}/menu-right.gif" alt="" border="0" width="10" height="10" />
         </td>
       </tr>
       <tr>
-        <td bgcolor="{$header-color}" height="1"><img class="spacer" src="{$spacer}" alt="" height="1" width="1" /></td>
+        <td bgcolor="{$header-color}" height="1">
+          <img class="spacer" src="{$spacer}" alt="" height="1" width="1" />
+        </td>
       </tr>
     </table>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/skins/forrest-site/xslt/html/tab2menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/forrest-site/xslt/html/tab2menu.xsl?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/forrest-site/xslt/html/tab2menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/forrest-site/xslt/html/tab2menu.xsl Mon Apr  9 18:49:44 2007
@@ -19,11 +19,8 @@
 This stylesheet generates 'tabs' at the top left of the screen.
 See the imported tab2menu.xsl for details.
 -->
-
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
   <xsl:import href="../../../common/xslt/html/tab-to-menu.xsl"/>
-
   <xsl:template match="tabs">
     <div class="tab">
       <table cellspacing="0" cellpadding="0" border="0" summary="tab bar">
@@ -34,28 +31,22 @@
     </div>
     <xsl:if test="tab[@dir=$longest-dir]/tab">
       <div class="level2tab">
-         <xsl:call-template name="level2tabs"/>
+        <xsl:call-template name="level2tabs"/>
       </div>
     </xsl:if>
   </xsl:template>
-
   <xsl:template name="pre-separator">
     <xsl:call-template name="separator"/>
   </xsl:template>
-
-  <xsl:template name="post-separator">
-  </xsl:template>
-
+  <xsl:template name="post-separator"></xsl:template>
   <xsl:template name="separator">
     <td width="6">
       <img src="{$root}skin/images/spacer.gif" width="6" height="8" alt=""/>
     </td>
   </xsl:template>
-
   <xsl:template name="level2-pre-separator"></xsl:template>
   <xsl:template name="level2-post-separator"></xsl:template>
   <xsl:template name="level2-separator">&#160;|&#160;</xsl:template>
-
   <xsl:template name="selected">
     <td valign="bottom">
       <table cellspacing="0" cellpadding="0" border="0"  style="height: 1.8em" summary="selected tab">
@@ -77,7 +68,6 @@
       </table>
     </td>
   </xsl:template>
-
   <xsl:template name="not-selected">
     <td valign="bottom">
       <table cellspacing="0" cellpadding="0" border="0" style="height: 1.6em" summary="non selected tab">
@@ -93,19 +83,15 @@
           </td>
         </tr>
         <tr>
-          <td height="1" colspan="3">
-          </td>
+          <td height="1" colspan="3"></td>
         </tr>
       </table>
     </td>
   </xsl:template>
-
   <xsl:template name="level2-not-selected">
     <xsl:call-template name="base-not-selected"/>
   </xsl:template>
-
   <xsl:template name="level2-selected">
-     <xsl:call-template name="base-selected"/>
+    <xsl:call-template name="base-selected"/>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/skins/krysalis-site/css/forrest.css.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/krysalis-site/css/forrest.css.xslt?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/krysalis-site/css/forrest.css.xslt (original)
+++ forrest/trunk/main/webapp/skins/krysalis-site/css/forrest.css.xslt Mon Apr  9 18:49:44 2007
@@ -16,83 +16,68 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
   <xsl:import href="../../common/css/forrest.css.xslt"/>
-
-  <!-- This is not used by Forrest but makes it possible to debug the 
+<!-- This is not used by Forrest but makes it possible to debug the 
        stylesheet in standalone editors -->
   <xsl:output method = "text"  omit-xml-declaration="yes"  />
-  
 <!-- ==================== main block colors ============================ -->
-
-<xsl:template match="color[@name='header']">
+  <xsl:template match="color[@name='header']">
 .header         { background-color: <xsl:value-of select="@value"/>;}  
 </xsl:template>
-
-<xsl:template match="color[@name='tab-selected']"> 
+  <xsl:template match="color[@name='tab-selected']"> 
 .tab.selected      { background-color: <xsl:value-of select="@value"/>;} 
 .tab.selected a:link {  color: <xsl:value-of select="@link"/>;  }
 .tab.selected a:visited { color: <xsl:value-of select="@vlink"/>; }
 .tab.selected a:hover { color: <xsl:value-of select="@hlink"/>; }
 .border         { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
-
-<xsl:template match="color[@name='tab-unselected']"> 
+</xsl:template>
+  <xsl:template match="color[@name='tab-unselected']"> 
 .tab.unselected      { background-color: <xsl:value-of select="@value"/>;} 
 .tab.unselected a:link {  color: <xsl:value-of select="@link"/>;  }
 .tab.unselected a:visited { color: <xsl:value-of select="@vlink"/>; }
 .tab.unselected a:hover { color: <xsl:value-of select="@hlink"/>; }
-</xsl:template> 
-
-<xsl:template match="color[@name='subtab-selected']">
+</xsl:template>
+  <xsl:template match="color[@name='subtab-selected']">
 .level2tabstrip a:link {  color: <xsl:value-of select="@link"/>;  }
 .level2tabstrip a:visited { color: <xsl:value-of select="@vlink"/>; }
 .level2tabstrip a:hover { color: <xsl:value-of select="@hlink"/>; }
-</xsl:template> 
-
-<xsl:template match="color[@name='subtab-unselected']">
+</xsl:template>
+  <xsl:template match="color[@name='subtab-unselected']">
 .level2tabstrip { background-color: <xsl:value-of select="@value"/>;}
 .datenote { background-color: <xsl:value-of select="@value"/>;} 
 .level2tabstrip.unselected a:link {  color: <xsl:value-of select="@link"/>;  }
 .level2tabstrip.unselected a:visited { color: <xsl:value-of select="@vlink"/>; }
 .level2tabstrip.unselected a:hover { color: <xsl:value-of select="@hlink"/>; }
-</xsl:template> 
-
-<xsl:template match="color[@name='heading']">
+</xsl:template>
+  <xsl:template match="color[@name='heading']">
 .heading { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
-
-<xsl:template match="color[@name='subheading']">
+</xsl:template>
+  <xsl:template match="color[@name='subheading']">
 .subheading { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
-
-<xsl:template match="color[@name='published']">
+</xsl:template>
+  <xsl:template match="color[@name='published']">
 .published { color: <xsl:value-of select="@value"/>;}
-</xsl:template> 
-
-<xsl:template match="color[@name='navstrip']">
+</xsl:template>
+  <xsl:template match="color[@name='navstrip']">
 .subborder      { color: <xsl:value-of select="@font"/>;
                   background-color: <xsl:value-of select="@value"/>;}
 .subborder a:link {  color: <xsl:value-of select="@link"/>;  }
 .subborder a:visited { color: <xsl:value-of select="@vlink"/>; }
 .subborder a:hover { color: <xsl:value-of select="@hlink"/>; }
 .menu .menupagetitle  { background-color: <xsl:value-of select="@value"/>;}
-</xsl:template> 
-
-<xsl:template match="color[@name='toolbox']">
+</xsl:template>
+  <xsl:template match="color[@name='toolbox']">
 .menu .menupagetitle  { background-color: <xsl:value-of select="@value"/>}
-</xsl:template> 
-
-<xsl:template match="color[@name='border']">
+</xsl:template>
+  <xsl:template match="color[@name='border']">
 .subborder.trail {border-bottom: 1px solid <xsl:value-of select="@value"/>;
                   border-top: 1px solid <xsl:value-of select="@value"/>; } 
 .footer          {border-top: 1px solid <xsl:value-of select="@value"/>; }
 .menu           { border-color: <xsl:value-of select="@value"/>;}
 .menu .menupagetitle  { border-color: <xsl:value-of select="@value"/>;}
 .menu .menupageitemgroup  { border-color: <xsl:value-of select="@value"/>;}
-</xsl:template> 
-
-<xsl:template match="color[@name='menu']">
+</xsl:template>
+  <xsl:template match="color[@name='menu']">
 .menu      { background-color: <xsl:value-of select="@value"/>;} 
 .menu  {  color: <xsl:value-of select="@font"/>;} 
 .menu a:link {  color: <xsl:value-of select="@link"/>;} 
@@ -100,13 +85,11 @@
 .menu a:hover {  background-color: <xsl:value-of select="@value"/>;
                  color: <xsl:value-of select="@hlink"/>;} 
 .menu .menupagetitle  { color: <xsl:value-of select="@hlink"/>;}     
-</xsl:template> 
-
-<xsl:template match="color[@name='dialog']"> 
+</xsl:template>
+  <xsl:template match="color[@name='dialog']"> 
 .dialog      { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
-
-<xsl:template match="color[@name='body']">
+</xsl:template>
+  <xsl:template match="color[@name='body']">
 body         { background-color: <xsl:value-of select="@value"/>;
                color: <xsl:value-of select="@font"/>;} 
 a:link { color:<xsl:value-of select="@link"/>} 
@@ -119,40 +102,29 @@
 .menupage a:hover { background-color: <xsl:value-of select="@value"/>;
                                 color:<xsl:value-of select="@hlink"/>} 
 </xsl:template>
-
-<xsl:template match="color[@name='footer']"> 
+  <xsl:template match="color[@name='footer']"> 
 .footer      { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
-
-
+</xsl:template>
 <!-- ==================== other colors ============================ -->
-<xsl:template match="color[@name='highlight']"> 
+  <xsl:template match="color[@name='highlight']"> 
 .highlight        { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
-
-<xsl:template match="color[@name='fixme']"> 
+</xsl:template>
+  <xsl:template match="color[@name='fixme']"> 
 .fixme        { border-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
-
-<xsl:template match="color[@name='note']"> 
+</xsl:template>
+  <xsl:template match="color[@name='note']"> 
 .note         { border-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
-
-<xsl:template match="color[@name='warning']"> 
+</xsl:template>
+  <xsl:template match="color[@name='warning']"> 
 .warning         { border-color: <xsl:value-of select="@value"/>;} 
 </xsl:template>
-
-<xsl:template match="color[@name='code']"> 
+  <xsl:template match="color[@name='code']"> 
 .code         { border-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
-
-<xsl:template match="color[@name='table']"> 
+</xsl:template>
+  <xsl:template match="color[@name='table']"> 
 .content .ForrestTable      { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
-
-<xsl:template match="color[@name='table-cell']"> 
+</xsl:template>
+  <xsl:template match="color[@name='table-cell']"> 
 .content .ForrestTable td   { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
-
-
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:template>
+</xsl:stylesheet>

Modified: forrest/trunk/main/webapp/skins/krysalis-site/skinconf.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/krysalis-site/skinconf.xsl?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/krysalis-site/skinconf.xsl (original)
+++ forrest/trunk/main/webapp/skins/krysalis-site/skinconf.xsl Mon Apr  9 18:49:44 2007
@@ -16,126 +16,110 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-        
-    <xsl:template match="skinconfig">
-
-  <xsl:if test="not(colors)">
-  <colors>
-  <!-- Krysalis -->
-    <color name="header"    value="#FFFFFF"/>
-
-    <color name="tab-selected" value="#a5b6c6" link="#000000" vlink="#000000" hlink="#000000"/>
-    <color name="tab-unselected" value="#F7F7F7"  link="#000000" vlink="#000000" hlink="#000000"/>
-    <color name="subtab-selected" value="#a5b6c6"  link="#000000" vlink="#000000" hlink="#000000"/>
-    <color name="subtab-unselected" value="#a5b6c6"  link="#000000" vlink="#000000" hlink="#000000"/>
-
-    <color name="heading" value="#a5b6c6"/>
-    <color name="subheading" value="#CFDCED"/>
-    <color name="published" value="#000000"/>
-        
-    <color name="navstrip" value="#CFDCED" font="#000000" link="#000000" vlink="#000000" hlink="#000000"/>
-    <color name="toolbox" value="#a5b6c6"/>
-    <color name="border" value="#a5b6c6"/>
-        
-    <color name="menu" value="#F7F7F7" link="#000000" vlink="#000000" hlink="#000000"/>    
-    <color name="dialog" value="#F7F7F7"/>
-            
-    <color name="body"    value="#ffffff" link="#0F3660" vlink="#009999" hlink="#000066"/>
-    
-    <color name="table" value="#a5b6c6"/>    
-    <color name="table-cell" value="#ffffff"/>    
-    <color name="highlight" value="#ffff00"/>
-    <color name="fixme" value="#cc6600"/>
-    <color name="note" value="#006699"/>
-    <color name="warning" value="#990000"/>
-    <color name="code" value="#a5b6c6"/>
-        
-    <color name="footer" value="#a5b6c6"/>
-  </colors>
-  </xsl:if>
-
-     <xsl:copy>
+  <xsl:template match="skinconfig">
+    <xsl:if test="not(colors)">
+      <colors>
+<!-- Krysalis -->
+        <color name="header"    value="#FFFFFF"/>
+        <color name="tab-selected" value="#a5b6c6" link="#000000" vlink="#000000" hlink="#000000"/>
+        <color name="tab-unselected" value="#F7F7F7"  link="#000000" vlink="#000000" hlink="#000000"/>
+        <color name="subtab-selected" value="#a5b6c6"  link="#000000" vlink="#000000" hlink="#000000"/>
+        <color name="subtab-unselected" value="#a5b6c6"  link="#000000" vlink="#000000" hlink="#000000"/>
+        <color name="heading" value="#a5b6c6"/>
+        <color name="subheading" value="#CFDCED"/>
+        <color name="published" value="#000000"/>
+        <color name="navstrip" value="#CFDCED" font="#000000" link="#000000" vlink="#000000" hlink="#000000"/>
+        <color name="toolbox" value="#a5b6c6"/>
+        <color name="border" value="#a5b6c6"/>
+        <color name="menu" value="#F7F7F7" link="#000000" vlink="#000000" hlink="#000000"/>
+        <color name="dialog" value="#F7F7F7"/>
+        <color name="body"    value="#ffffff" link="#0F3660" vlink="#009999" hlink="#000066"/>
+        <color name="table" value="#a5b6c6"/>
+        <color name="table-cell" value="#ffffff"/>
+        <color name="highlight" value="#ffff00"/>
+        <color name="fixme" value="#cc6600"/>
+        <color name="note" value="#006699"/>
+        <color name="warning" value="#990000"/>
+        <color name="code" value="#a5b6c6"/>
+        <color name="footer" value="#a5b6c6"/>
+      </colors>
+    </xsl:if>
+    <xsl:copy>
       <xsl:copy-of select="@*"/>
-      <xsl:copy-of select="node()[not(name(.)='colors')]"/>     
+      <xsl:copy-of select="node()[not(name(.)='colors')]"/>
       <xsl:apply-templates select="colors"/>
-     </xsl:copy> 
-
-    </xsl:template>
-
-    <xsl:template match="colors">
-     <xsl:copy>
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="colors">
+    <xsl:copy>
       <xsl:copy-of select="@*"/>
-      <xsl:copy-of select="node()[name(.)='color']"/> 
-      
-     <xsl:if test="not(color[@name='header'])">
-       <color name="header" value="#FFFFFF"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='tab-selected'])">
-      <color name="tab-selected" value="#a5b6c6" link="#000000" vlink="#000000" hlink="#000000"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='tab-unselected'])">
-      <color name="tab-unselected" value="#F7F7F7"  link="#000000" vlink="#000000" hlink="#000000"/>
-     </xsl:if>
-     <xsl:if test="not(color[@name='subtab-selected'])">
-      <color name="subtab-selected" value="#a5b6c6"  link="#000000" vlink="#000000" hlink="#000000"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='subtab-unselected'])">
-      <color name="subtab-unselected" value="#a5b6c6"  link="#000000" vlink="#000000" hlink="#000000"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='heading'])">
-      <color name="heading" value="#a5b6c6"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='subheading'])">
-      <color name="subheading" value="#CFDCED"/>
-     </xsl:if>
-     <xsl:if test="not(color[@name='published'])">
+      <xsl:copy-of select="node()[name(.)='color']"/>
+      <xsl:if test="not(color[@name='header'])">
+        <color name="header" value="#FFFFFF"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='tab-selected'])">
+        <color name="tab-selected" value="#a5b6c6" link="#000000" vlink="#000000" hlink="#000000"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='tab-unselected'])">
+        <color name="tab-unselected" value="#F7F7F7"  link="#000000" vlink="#000000" hlink="#000000"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='subtab-selected'])">
+        <color name="subtab-selected" value="#a5b6c6"  link="#000000" vlink="#000000" hlink="#000000"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='subtab-unselected'])">
+        <color name="subtab-unselected" value="#a5b6c6"  link="#000000" vlink="#000000" hlink="#000000"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='heading'])">
+        <color name="heading" value="#a5b6c6"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='subheading'])">
+        <color name="subheading" value="#CFDCED"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='published'])">
         <color name="published" value="#ffffff"/>
-     </xsl:if> 
-     <xsl:if test="not(color[@name='navstrip'])">
-      <color name="navstrip" value="#CFDCED" font="#000000" link="#000000" vlink="#000000" hlink="#000000"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='toolbox'])">
-       <color name="toolbox" value="#a5b6c6"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='border'])">
-       <color name="border" value="#a5b6c6"/>
-     </xsl:if>       
-     <xsl:if test="not(color[@name='menu'])">
-      <color name="menu" value="#F7F7F7" link="#000000" vlink="#000000" hlink="#000000"/>    
-     </xsl:if>  
-     <xsl:if test="not(color[@name='dialog'])">
-      <color name="dialog" value="#F7F7F7"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='body'])">
-      <color name="body" value="#ffffff" link="#0F3660" vlink="#009999" hlink="#000066"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='table'])">
-      <color name="table" value="#a5b6c6"/>    
-     </xsl:if>  
-     <xsl:if test="not(color[@name='table-cell'])">
-      <color name="table-cell" value="#ffffff"/>    
-     </xsl:if>  
-     <xsl:if test="not(color[@name='highlight'])">
-       <color name="highlight" value="#ffff00"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='fixme'])">
-       <color name="fixme" value="#c60"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='note'])">
-       <color name="note" value="#069"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='warning'])">
-       <color name="warning" value="#900"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='code'])">
-       <color name="code" value="#a5b6c6"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='footer'])">
-       <color name="footer" value="#a5b6c6"/>
-     </xsl:if>  
-    
-     </xsl:copy> 
-
-    </xsl:template>
-    
+      </xsl:if>
+      <xsl:if test="not(color[@name='navstrip'])">
+        <color name="navstrip" value="#CFDCED" font="#000000" link="#000000" vlink="#000000" hlink="#000000"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='toolbox'])">
+        <color name="toolbox" value="#a5b6c6"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='border'])">
+        <color name="border" value="#a5b6c6"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='menu'])">
+        <color name="menu" value="#F7F7F7" link="#000000" vlink="#000000" hlink="#000000"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='dialog'])">
+        <color name="dialog" value="#F7F7F7"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='body'])">
+        <color name="body" value="#ffffff" link="#0F3660" vlink="#009999" hlink="#000066"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='table'])">
+        <color name="table" value="#a5b6c6"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='table-cell'])">
+        <color name="table-cell" value="#ffffff"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='highlight'])">
+        <color name="highlight" value="#ffff00"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='fixme'])">
+        <color name="fixme" value="#c60"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='note'])">
+        <color name="note" value="#069"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='warning'])">
+        <color name="warning" value="#900"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='code'])">
+        <color name="code" value="#a5b6c6"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='footer'])">
+        <color name="footer" value="#a5b6c6"/>
+      </xsl:if>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/skins/krysalis-site/xslt/fo/document2fo.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/krysalis-site/xslt/fo/document2fo.xsl?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/krysalis-site/xslt/fo/document2fo.xsl (original)
+++ forrest/trunk/main/webapp/skins/krysalis-site/xslt/fo/document2fo.xsl Mon Apr  9 18:49:44 2007
@@ -15,13 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
                 version="1.0">
-
-<xsl:import href="../../../common/xslt/fo/document-to-fo.xsl"/>
-
+  <xsl:import href="../../../common/xslt/fo/document-to-fo.xsl"/>
 </xsl:stylesheet>
-
-

Modified: forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/book2menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/book2menu.xsl?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/book2menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/book2menu.xsl Mon Apr  9 18:49:44 2007
@@ -20,11 +20,8 @@
 details.
 
 -->
-
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
   <xsl:import href="../../../common/xslt/html/book-to-menu.xsl"/>
-  
   <xsl:template match="book">
     <div class="menu">
       <ul>
@@ -32,32 +29,24 @@
       </ul>
     </div>
   </xsl:template>
-
   <xsl:template match="menu">
-    <li>
-      <span class="menutitle"><xsl:value-of select="@label"/></span>
+    <li><span class="menutitle">
+        <xsl:value-of select="@label"/>
+      </span>
       <ul>
         <xsl:apply-templates/>
-      </ul>
-    </li>
+      </ul></li>
   </xsl:template>
-
   <xsl:template match="menu-item[@type='hidden']"/>
-
   <xsl:template match="menu-item">
-    <li>
-      <xsl:apply-imports/>
-    </li>
+    <li><xsl:apply-imports/></li>
   </xsl:template>
-  
   <xsl:template name="selected">
     <span class="sel">
-        <xsl:value-of select="@label"/>
+      <xsl:value-of select="@label"/>
     </span>
   </xsl:template>
-
   <xsl:template name="print-external">
-      <xsl:apply-imports/>
+    <xsl:apply-imports/>
   </xsl:template>
-  
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/document2html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/document2html.xsl?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/document2html.xsl (original)
+++ forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/document2html.xsl Mon Apr  9 18:49:44 2007
@@ -28,16 +28,13 @@
 
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
   <xsl:import href="../../../common/xslt/html/document-to-html.xsl"/>
-  
   <xsl:template match="document">
-
     <div class="content">
       <xsl:if test="normalize-space(header/title)!=''">
         <table class="title">
-          <tr> 
-            <td valign="middle"> 
+          <tr>
+            <td valign="middle">
               <h1>
                 <xsl:value-of select="header/title"/>
               </h1>
@@ -60,9 +57,7 @@
           <xsl:value-of select="header/abstract"/>
         </div>
       </xsl:if>
-
       <xsl:apply-templates select="body"/>
-
       <xsl:if test="header/authors">
         <p align="right">
           <font size="-2">
@@ -76,106 +71,96 @@
           </font>
         </p>
       </xsl:if>
-
     </div>
   </xsl:template>
-
   <xsl:template match="body">
     <div id="skinconf-toc-page"/>
     <xsl:apply-templates/>
   </xsl:template>
-
   <xsl:template match="@id">
     <xsl:apply-imports/>
   </xsl:template>
-
-  <xsl:template match="section">
-    <a name="{generate-id()}"/>
+  <xsl:template match="section"><a name="{generate-id()}"/>
     <xsl:apply-templates select="@id"/>
-
     <xsl:variable name = "level" select = "count(ancestor::section)+1" />
-
     <xsl:choose>
       <xsl:when test="$level=1">
         <div class="skinconf-heading-{$level}">
-          <h1><xsl:value-of select="title"/></h1>
+          <h1>
+            <xsl:value-of select="title"/>
+          </h1>
+        </div>
+        <div class="section">
+          <xsl:apply-templates/>
         </div>
-        <div class="section"><xsl:apply-templates/></div>  
       </xsl:when>
       <xsl:when test="$level=2">
         <div class="skinconf-heading-{$level}">
-          <h1><xsl:value-of select="title"/></h1>
+          <h1>
+            <xsl:value-of select="title"/>
+          </h1>
         </div>
         <xsl:apply-templates select="*[not(self::title)]"/>
       </xsl:when>
-      <!-- If a faq, answer sections will be level 3 (1=Q/A, 2=part) -->
+<!-- If a faq, answer sections will be level 3 (1=Q/A, 2=part) -->
       <xsl:when test="$level=3 and $notoc='true'">
-        <h4 class="faq"><xsl:value-of select="title"/></h4>
-        <div align="right"><a href="#{@id}-menu">^</a></div>
+        <h4 class="faq">
+          <xsl:value-of select="title"/>
+        </h4>
+        <div align="right"><a href="#{@id}-menu">^</a>
+        </div>
         <div style="margin-left: 15px">
           <xsl:apply-templates select="*[not(self::title)]"/>
         </div>
       </xsl:when>
       <xsl:when test="$level=3">
-        <h4><xsl:value-of select="title"/></h4>
+        <h4>
+          <xsl:value-of select="title"/>
+        </h4>
         <xsl:apply-templates select="*[not(self::title)]"/>
-
       </xsl:when>
-
       <xsl:otherwise>
-        <h5><xsl:value-of select="title"/></h5>
+        <h5>
+          <xsl:value-of select="title"/>
+        </h5>
         <xsl:apply-templates select="*[not(self::title)]"/>
       </xsl:otherwise>
     </xsl:choose>
-
-  </xsl:template>  
-
+  </xsl:template>
   <xsl:template match="fixme | note | warning">
     <xsl:apply-imports/>
   </xsl:template>
-
   <xsl:template match="link">
     <xsl:apply-imports/>
   </xsl:template>
-
   <xsl:template match="jump">
     <xsl:apply-imports/>
   </xsl:template>
-
   <xsl:template match="fork">
     <xsl:apply-imports/>
   </xsl:template>
-
   <xsl:template match="p[@xml:space='preserve']">
     <xsl:apply-imports/>
   </xsl:template>
-
   <xsl:template match="source">
     <xsl:apply-imports/>
   </xsl:template>
-
   <xsl:template match="anchor">
     <xsl:apply-imports/>
   </xsl:template>
-
   <xsl:template match="icon">
     <xsl:apply-imports/>
   </xsl:template>
-
   <xsl:template match="code">
     <xsl:apply-imports/>
   </xsl:template>
-
   <xsl:template match="figure">
     <xsl:apply-imports/>
   </xsl:template>
-
   <xsl:template match="table">
     <xsl:apply-imports/>
   </xsl:template>
-
   <xsl:template match="title">
-    <!-- do not show title elements, they are already in other places-->
+<!-- do not show title elements, they are already in other places-->
   </xsl:template>
-
 </xsl:stylesheet>



Mime
View raw message