forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r526993 [3/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/krysalis-site/xslt/html/site2xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/site2xhtml.xsl?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/site2xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/site2xhtml.xsl Mon Apr  9 18:49:44 2007
@@ -33,32 +33,24 @@
 </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: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"/>
-        <link rel="stylesheet" href="{$root}skin/forrest.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"/><link rel="stylesheet" href="{$root}skin/forrest.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>
-        <script type="text/javascript" language="javascript" src="{$root}skin/fontsize.js"></script>
-        <script type="text/javascript" language="javascript" src="{$root}skin/menu.js"></script>
+<script type="text/javascript" language="javascript" src="{$root}skin/fontsize.js"></script>
+<script type="text/javascript" language="javascript" src="{$root}skin/menu.js"></script>
       </head>
       <body onload="init()" >
-
-        <script type="text/javascript">ndeSetTextSize();</script>
-        <!--
+<script type="text/javascript">ndeSetTextSize();</script>
+<!--
           +=========================+
           |       topstrip          |
           +=========================+
@@ -70,19 +62,14 @@
           |       bottomstrip       |
           +=========================+
         -->
-        
         <xsl:call-template name="topstrip" />
-
         <xsl:call-template name="centerstrip"/>
-
         <xsl:call-template name="bottomstrip"/>
-        
       </body>
     </html>
   </xsl:template>
-
   <xsl:template name="topstrip">
-    <!--   
+<!--   
         +======================================================+
         |+============+    +==============+    | search box |  |
         || group logo |    | project logo |    +============+  |
@@ -95,134 +82,129 @@
     -->
     <table class="header" cellspacing="0" cellpadding="0" border="0" width="100%">
       <tr>
-        <!-- ( ================= Group Logo ================== ) -->
+<!-- ( ================= Group Logo ================== ) -->
         <td >
-            <div class="headerlogo">
+          <div class="headerlogo">
             <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:call-template>
-            </div>
-        </td>
-        <!-- ( ================= Project Logo ================== ) -->
-	<xsl:choose>
-      <xsl:when test="$config/search and not($config/search/@box-location = 'alt')">
-        <td align="center" >   
-         <div class="headerlogo">
-          <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:call-template>
-          </div>
-        </td>
-      </xsl:when>
-      <xsl:otherwise>
-      	<td align="right" colspan="3" valign="bottom"> 
-      	<div class="headerlogo right">
-          <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:call-template>
           </div>
         </td>
-     </xsl:otherwise>
-      </xsl:choose>
-      <xsl:choose>
-	      <xsl:when test="$config/search and not($config/search/@box-location = 'alt')">
-	      	        <!-- ( =================  Search ================== ) -->
-        <td class="search" align="right" rowspan="2" valign="top">
-         
-	    <xsl:choose>
-              <xsl:when test="$config/search/@provider = 'lucene'">
-                <!-- Lucene search -->
-                <form method="get" action="{$root}{$lucene-search}">
-		  <table class="dialog" cellspacing="0" cellpadding="0" border="0">
-		    <tr>
-		      <td colspan="3" class="border" height="10"></td>
-		    </tr>
-		    <tr>
-		      <td colspan="3" height="8"></td>
-		    </tr>
-		    <tr>
-		      <td></td>
-		      <td nowrap="nowrap">
-			<input type="text" id="query" name="queryString" size="15"/>
+<!-- ( ================= Project Logo ================== ) -->
+        <xsl:choose>
+          <xsl:when test="$config/search and not($config/search/@box-location = 'alt')">
+            <td align="center" >
+              <div class="headerlogo">
+                <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:call-template>
+              </div>
+            </td>
+          </xsl:when>
+          <xsl:otherwise>
+            <td align="right" colspan="3" valign="bottom">
+              <div class="headerlogo right">
+                <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:call-template>
+              </div>
+            </td>
+          </xsl:otherwise>
+        </xsl:choose>
+        <xsl:choose>
+          <xsl:when test="$config/search and not($config/search/@box-location = 'alt')">
+<!-- ( =================  Search ================== ) -->
+            <td class="search" align="right" rowspan="2" valign="top">
+              <xsl:choose>
+                <xsl:when test="$config/search/@provider = 'lucene'">
+<!-- Lucene search -->
+                  <form method="get" action="{$root}{$lucene-search}">
+                    <table class="dialog" cellspacing="0" cellpadding="0" border="0">
+                      <tr>
+                        <td colspan="3" class="border" height="10"></td>
+                      </tr>
+                      <tr>
+                        <td colspan="3" height="8"></td>
+                      </tr>
+                      <tr>
+                        <td></td>
+                        <td nowrap="nowrap">
+                          <input type="text" id="query" name="queryString" size="15"/>
 			&#160;
 			<input type="submit" value="Search" name="Search"/>
-			<br />
+                          <br />
 			the <xsl:value-of select="$config/search/@name"/> site
 		      </td>
-		      <td></td>
-		    </tr>
-		    
-		    <tr>
-		      <td colspan="3" height="7"></td>
-		    </tr>
-		    
-		    <tr>
-		      <td class="search border bottom-left SBBL"></td>
-		      <td class="search border bottomborder"></td>
-		      <td class="search border bottom-right SBBR"></td>
-		    </tr>
-		  </table>
-		</form>
-	      </xsl:when>
-	      <xsl:otherwise>
-		<!-- Google search -->
-		<form method="get" action="http://www.google.com/search" target="_blank">
-		  <table class="dialog" cellspacing="0" cellpadding="0" border="0">
-		    <tr>
-		      <td colspan="3" class="border" height="10"></td>
-		    </tr>
-		    <tr>
-		      <td colspan="3" height="8"></td>
-		    </tr>
-		    <tr>
-		      <td></td>
-		      <td nowrap="nowrap">
-			<input type="hidden" name="as_sitesearch" value="{$config/search/@domain}"/>
-			<input type="text" id="query" name="as_q" size="15"/>
+                        <td></td>
+                      </tr>
+                      <tr>
+                        <td colspan="3" height="7"></td>
+                      </tr>
+                      <tr>
+                        <td class="search border bottom-left SBBL"></td>
+                        <td class="search border bottomborder"></td>
+                        <td class="search border bottom-right SBBR"></td>
+                      </tr>
+                    </table>
+                  </form>
+                </xsl:when>
+                <xsl:otherwise>
+<!-- Google search -->
+                  <form method="get" action="http://www.google.com/search" target="_blank">
+                    <table class="dialog" cellspacing="0" cellpadding="0" border="0">
+                      <tr>
+                        <td colspan="3" class="border" height="10"></td>
+                      </tr>
+                      <tr>
+                        <td colspan="3" height="8"></td>
+                      </tr>
+                      <tr>
+                        <td></td>
+                        <td nowrap="nowrap">
+                          <input type="hidden" name="as_sitesearch" value="{$config/search/@domain}"/>
+                          <input type="text" id="query" name="as_q" size="15"/>
 			&#160;
 			<input type="submit" value="Search" name="Search"/>
-			<br />
+                          <br />
 			the <xsl:value-of select="$config/search/@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
 			-->
-		      </td>
-		      <td></td>
-		    </tr>
-		    
-		    <tr>
-		      <td colspan="3" height="7"></td>
-		    </tr>
-		    
-		    <tr>
-		      <td class="search border bottom-left SBBL"></td>
-		      <td class="search border bottomborder"></td>
-		      <td class="search border bottom-right SBBR"></td>
-		    </tr>
-		  </table>
-		</form>
-	      </xsl:otherwise>
-	    </xsl:choose>
-        </td>
-        <td align="right" width="10" height="10">
-          <span class="textheader"><xsl:value-of select="//skinconfig/project-name"/></span>
-        </td>
-	      </xsl:when>
-      </xsl:choose>
-      
-
+                        </td>
+                        <td></td>
+                      </tr>
+                      <tr>
+                        <td colspan="3" height="7"></td>
+                      </tr>
+                      <tr>
+                        <td class="search border bottom-left SBBL"></td>
+                        <td class="search border bottomborder"></td>
+                        <td class="search border bottom-right SBBR"></td>
+                      </tr>
+                    </table>
+                  </form>
+                </xsl:otherwise>
+              </xsl:choose>
+            </td>
+            <td align="right" width="10" height="10">
+              <span class="textheader">
+                <xsl:value-of select="//skinconfig/project-name"/>
+              </span>
+            </td>
+          </xsl:when>
+        </xsl:choose>
       </tr>
-      <!-- ( ================= Tabs ================== ) -->
+<!-- ( ================= Tabs ================== ) -->
       <tr>
         <td colspan="4" class="tabstrip">
           <xsl:apply-templates select="table[@class='tab']"/>
@@ -233,17 +215,17 @@
           <xsl:apply-templates select="table[@class='level2tab']"/>
         </td>
         <td colspan="2" class="datenote level2tabstrip">
-        <div class="published">
-           <script language="JavaScript" type="text/javascript"><![CDATA[<!--
+          <div class="published">
+<script language="JavaScript" type="text/javascript"><![CDATA[<!--
               document.write("Published: " + document.lastModified);
-              //  -->]]></script></div>
+              //  -->]]></script>
+          </div>
         </td>
       </tr>
     </table>
   </xsl:template>
-  
   <xsl:template name="centerstrip" >
-   <!--
+<!--
      +=========+======================+
      |         |                      |
      |         |                      |
@@ -258,46 +240,44 @@
     -->
     <table cellspacing="0" cellpadding="0" border="0" width="100%">
       <tr>
-        <!-- ( =================  Menu  ================== ) -->
+<!-- ( =================  Menu  ================== ) -->
         <td valign="top">
-          <!-- If we have any menu items, draw a menu -->
+<!-- If we have any menu items, draw a menu -->
           <xsl:if test="div[@class='menu']/ul/li">
             <xsl:call-template name="menu"/>
           </xsl:if>
         </td>
-        <!-- ( =================  Main Area  ================== ) -->
+<!-- ( =================  Main Area  ================== ) -->
         <td valign="top" width="100%">
-           <xsl:call-template name="mainarea"/>
+          <xsl:call-template name="mainarea"/>
         </td>
       </tr>
     </table>
   </xsl:template>
-
   <xsl:template name="menu">
     <table cellpadding="0" cellspacing="0" class="menuarea">
       <tr>
-        <!-- ( ================= start left top NavBar ================== ) -->
+<!-- ( ================= start left top NavBar ================== ) -->
         <td valign = "top" width="6px">
           <table class="leftpagemargin" cellspacing="0" cellpadding="0" border="0">
-            <tr><td class="subborder trail">&#160;</td></tr>
+            <tr>
+              <td class="subborder trail">&#160;</td>
+            </tr>
           </table>
         </td>
-        <!-- ( ================= end left top NavBar ================== ) -->
-
+<!-- ( ================= end left top NavBar ================== ) -->
         <td class="dialog">
-          <!-- ( ================= start Menu items ================== ) -->
+<!-- ( ================= start Menu items ================== ) -->
           <div class="menu">
             <xsl:for-each select = "div[@class='menu']/ul/li">
               <xsl:call-template name = "innermenuli" >
-                  <xsl:with-param name="id" select="concat('1.', position())"/>
+                <xsl:with-param name="id" select="concat('1.', position())"/>
               </xsl:call-template>
             </xsl:for-each>
           </div>
-
-          <!-- ( ================= end Menu items ================== ) -->
+<!-- ( ================= end Menu items ================== ) -->
         </td>
       </tr>
-
       <tr>
         <td></td>
         <td>
@@ -308,246 +288,256 @@
               <td class="border bottom-right" ></td>
             </tr>
           </table>
-        </td>      
+        </td>
       </tr>
-
       <tr>
         <td height="10" colspan="2"></td>
       </tr>
-      
       <xsl:if test="$config/search and ($config/search/@box-location = 'alt' or $config/search/@box-location = 'all')">
-      <tr>
-        <td></td>
-        <td class="search">
-          <xsl:choose>
-          <xsl:when test="$config/search/@provider = 'lucene'">
-            <form method="get" action="{$root}{$lucene-search}">
-             <table class="dialog" cellspacing="0" cellpadding="0" border="0" width="100%">
-                <tr>
-                  <td class="border top-left"></td>
-                  <td class="border"></td>
-                  <td class="border top-right"></td>
-                </tr>    
-                <tr>
-                  <td class="border" ></td>
-                  <td colspan="2" class="border" height="10"><b>Search</b></td>
-                </tr>
-                <tr>
-                  <td colspan="3" height="8"></td>
-                </tr>
-                <tr>
-                  <td></td>
-                  <td>
-                    <input type="hidden" name="sitesearch" value="{$config/search/@domain}"/>
+        <tr>
+          <td></td>
+          <td class="search">
+            <xsl:choose>
+              <xsl:when test="$config/search/@provider = 'lucene'">
+                <form method="get" action="{$root}{$lucene-search}">
+                  <table class="dialog" cellspacing="0" cellpadding="0" border="0" width="100%">
+                    <tr>
+                      <td class="border top-left"></td>
+                      <td class="border"></td>
+                      <td class="border top-right"></td>
+                    </tr>
+                    <tr>
+                      <td class="border" ></td>
+                      <td colspan="2" class="border" height="10">
+                        <b>Search</b>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" height="8"></td>
+                    </tr>
+                    <tr>
+                      <td></td>
+                      <td>
+                        <input type="hidden" name="sitesearch" value="{$config/search/@domain}"/>
                     the <xsl:value-of select="$config/search/@name"/> site
                     <br />
-                    <input type="text" id="query" name="queryString" size="13"/><input type="submit" value="Go" name="Search"/>
-                  </td>
-                  <td></td>
-                </tr>
-
-                <tr>
-                  <td colspan="3" height="7"></td>
-                </tr>
-
-                <tr>
-                  <td class="border bottom-left"></td>
-                  <td class="border bottomborder"></td>
-                  <td class="border bottom-right"></td>
-                </tr>
-              </table>
-            </form>
-	  </xsl:when>
-          <xsl:otherwise>
-            <form method="get" action="http://www.google.com/search" target="_blank">
-             <table class="dialog" cellspacing="0" cellpadding="0" border="0" width="100%">
-                <tr>
-                  <td class="border top-left"></td>
-                  <td class="border"></td>
-                  <td class="border top-right"></td>
-                </tr>    
-                <tr>
-                  <td class="border" ></td>
-                  <td colspan="2" class="border" height="10"><b>Search</b></td>
-                </tr>
-                <tr>
-                  <td colspan="3" height="8"></td>
-                </tr>
-                <tr>
-                  <td></td>
-                  <td>
-                    <input type="hidden" name="as_sitesearch" value="{$config/search/@domain}"/>
+                        <input type="text" id="query" name="queryString" size="13"/>
+                        <input type="submit" value="Go" name="Search"/>
+                      </td>
+                      <td></td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" height="7"></td>
+                    </tr>
+                    <tr>
+                      <td class="border bottom-left"></td>
+                      <td class="border bottomborder"></td>
+                      <td class="border bottom-right"></td>
+                    </tr>
+                  </table>
+                </form>
+              </xsl:when>
+              <xsl:otherwise>
+                <form method="get" action="http://www.google.com/search" target="_blank">
+                  <table class="dialog" cellspacing="0" cellpadding="0" border="0" width="100%">
+                    <tr>
+                      <td class="border top-left"></td>
+                      <td class="border"></td>
+                      <td class="border top-right"></td>
+                    </tr>
+                    <tr>
+                      <td class="border" ></td>
+                      <td colspan="2" class="border" height="10">
+                        <b>Search</b>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" height="8"></td>
+                    </tr>
+                    <tr>
+                      <td></td>
+                      <td>
+                        <input type="hidden" name="as_sitesearch" value="{$config/search/@domain}"/>
                     the <xsl:value-of select="$config/search/@name"/> site
                     <br />
-                    <input type="text" id="query" name="as_q" size="13"/><input type="submit" value="Go" name="Search"/>
-                  </td>
-                  <td></td>
-                </tr>
-
-                <tr>
-                  <td colspan="3" height="7"></td>
-                </tr>
-
-                <tr>
-                  <td class="border bottom-left"></td>
-                  <td class="border bottomborder"></td>
-                  <td class="border bottom-right"></td>
-                </tr>
-              </table>
-            </form>
-	  </xsl:otherwise>
-	  </xsl:choose>
-        </td>
+                        <input type="text" id="query" name="as_q" size="13"/>
+                        <input type="submit" value="Go" name="Search"/>
+                      </td>
+                      <td></td>
+                    </tr>
+                    <tr>
+                      <td colspan="3" height="7"></td>
+                    </tr>
+                    <tr>
+                      <td class="border bottom-left"></td>
+                      <td class="border bottomborder"></td>
+                      <td class="border bottom-right"></td>
+                    </tr>
+                  </table>
+                </form>
+              </xsl:otherwise>
+            </xsl:choose>
+          </td>
         </tr>
       </xsl:if>
- 	  
-       <xsl:if test="$filename = 'index.html' and //skinconfig/credits">
-	     <tr>
-           <td></td>
- 	       <td>
-	        <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"/>
-	            <span class="logos">
-	              <a href="{$url}">
-	                <img alt="{$name} logo" border="0">
-	                  <xsl:attribute name="src">
-	                    <xsl:if test="not(starts-with($image, 'http://'))"><xsl:value-of select="$root"/></xsl:if>
-	                    <xsl:value-of select="$image"/>
-	                  </xsl:attribute>
-	                  <xsl:if test="$width"><xsl:attribute name="width"><xsl:value-of select="$width"/></xsl:attribute></xsl:if>
-	                  <xsl:if test="$height"><xsl:attribute name="height"><xsl:value-of select="$height"/></xsl:attribute></xsl:if>
-	                </img>
-	              </a>
-                  </span><br/>
-	        </xsl:for-each>
+      <xsl:if test="$filename = 'index.html' and //skinconfig/credits">
+        <tr>
+          <td></td>
+          <td>
+            <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"/>
+              <span class="logos"><a href="{$url}">
+                <img alt="{$name} logo" border="0">
+                  <xsl:attribute name="src">
+                    <xsl:if test="not(starts-with($image, 'http://'))">
+                      <xsl:value-of select="$root"/>
+                    </xsl:if>
+                    <xsl:value-of select="$image"/>
+                  </xsl:attribute>
+                  <xsl:if test="$width">
+                    <xsl:attribute name="width">
+                      <xsl:value-of select="$width"/>
+                    </xsl:attribute>
+                  </xsl:if>
+                  <xsl:if test="$height">
+                    <xsl:attribute name="height">
+                      <xsl:value-of select="$height"/>
+                    </xsl:attribute>
+                  </xsl:if>
+                </img></a>
+              </span>
+              <br/>
+            </xsl:for-each>
           </td>
-        </tr> 
-      </xsl:if>      
-
+        </tr>
+      </xsl:if>
     </table>
   </xsl:template>
-
-
   <xsl:template name="innermenuli">
     <xsl:param name="id"/>
     <xsl:variable name="tagid">
       <xsl:choose>
-        <xsl:when test="descendant-or-self::node()/li/span/@class='sel'"><xsl:value-of select="concat('menu_selected_',$id)"/></xsl:when>
-        <xsl:otherwise><xsl:value-of select="concat('menu_',concat(font,$id))"/></xsl:otherwise>
+        <xsl:when test="descendant-or-self::node()/li/span/@class='sel'">
+          <xsl:value-of select="concat('menu_selected_',$id)"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="concat('menu_',concat(font,$id))"/>
+        </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
     <xsl:variable name="whichGroup">
       <xsl:choose>
-    	<xsl:when test="descendant-or-self::node()/li/span/@class='sel'">selectedmenuitemgroup</xsl:when>
-       	<xsl:otherwise>menuitemgroup</xsl:otherwise>
+        <xsl:when test="descendant-or-self::node()/li/span/@class='sel'">selectedmenuitemgroup</xsl:when>
+        <xsl:otherwise>menuitemgroup</xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-    
-    
-    <div class="menutitle" id="{$tagid}Title" onclick="SwitchMenu('{$tagid}')"><xsl:value-of select="span"/></div>
-      <div class="{$whichGroup}" id="{$tagid}">
-        <xsl:for-each select= "ul/li">
-
-          <xsl:choose>
-            <xsl:when test="a">
-              <div class="menuitem"><a href="{a/@href}"><xsl:value-of select="a" /></a></div>
-            </xsl:when>
-            <xsl:when test="span/@class='sel'">
-              <div class="menupage">
-                <div class="menupagetitle"><xsl:value-of select="span" /></div>
-				<xsl:if test="$config/toc/@max-depth&gt;0 and contains($minitoc-location,'menu')">
-                  <div class="menupageitemgroup">
-                      <xsl:for-each select = "//tocitems/tocitem">
-                        <div class="menupageitem">
-                          <xsl:choose>
-                            <xsl:when test="string-length(@title)>15">
-                              <a href="{@href}" title="{@title}"><xsl:value-of select="substring(@title,0,20)" />...</a>
-                            </xsl:when>
-                            <xsl:otherwise>
-                              <a href="{@href}"><xsl:value-of select="@title" /></a>
-                            </xsl:otherwise>
-                          </xsl:choose>
-
-                          <xsl:if test="tocitem">
-                          <!-- nicolaken: this enables double-nested page links-->
-                            <ul>
-                              <xsl:for-each select = "tocitem">
-
-                                <xsl:choose>
-                                  <xsl:when test="string-length(@title)>15">
-                                    <li><a href="{@href}" title="{@title}"><xsl:value-of select="substring(@title,0,20)" />...</a></li>
-                                  </xsl:when>
-                                  <xsl:otherwise>
-                                    <li><a href="{@href}"><xsl:value-of select="@title" /></a></li>
-                                  </xsl:otherwise>
-                                </xsl:choose>
-
-                              </xsl:for-each>
-                            </ul> 
-                          <!-- nicolaken: ...till here -->
-                          </xsl:if>
-                        </div>
-                      </xsl:for-each>
-                  </div>
-                </xsl:if>
+    <div class="menutitle" id="{$tagid}Title" onclick="SwitchMenu('{$tagid}')">
+      <xsl:value-of select="span"/>
+    </div>
+    <div class="{$whichGroup}" id="{$tagid}">
+      <xsl:for-each select= "ul/li">
+        <xsl:choose>
+          <xsl:when test="a">
+            <div class="menuitem"><a href="{a/@href}">
+              <xsl:value-of select="a" /></a>
+            </div>
+          </xsl:when>
+          <xsl:when test="span/@class='sel'">
+            <div class="menupage">
+              <div class="menupagetitle">
+                <xsl:value-of select="span" />
               </div>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:call-template name = "innermenuli">
-                 <xsl:with-param name="id" select="concat($id, '.', position())"/>
-              </xsl:call-template>
-            </xsl:otherwise>
-          </xsl:choose>
-
-        </xsl:for-each>
-      </div>
+              <xsl:if test="$config/toc/@max-depth&gt;0 and contains($minitoc-location,'menu')">
+                <div class="menupageitemgroup">
+                  <xsl:for-each select = "//tocitems/tocitem">
+                    <div class="menupageitem">
+                      <xsl:choose>
+                        <xsl:when test="string-length(@title)>15"><a href="{@href}" title="{@title}">
+                          <xsl:value-of select="substring(@title,0,20)" />...</a>
+                        </xsl:when>
+                        <xsl:otherwise><a href="{@href}">
+                          <xsl:value-of select="@title" /></a>
+                        </xsl:otherwise>
+                      </xsl:choose>
+                      <xsl:if test="tocitem">
+<!-- nicolaken: this enables double-nested page links-->
+                        <ul>
+                          <xsl:for-each select = "tocitem">
+                            <xsl:choose>
+                              <xsl:when test="string-length(@title)>15">
+                                <li><a href="{@href}" title="{@title}">
+                                  <xsl:value-of select="substring(@title,0,20)" />...</a></li>
+                              </xsl:when>
+                              <xsl:otherwise>
+                                <li><a href="{@href}">
+                                  <xsl:value-of select="@title" /></a></li>
+                              </xsl:otherwise>
+                            </xsl:choose>
+                          </xsl:for-each>
+                        </ul>
+<!-- nicolaken: ...till here -->
+                      </xsl:if>
+                    </div>
+                  </xsl:for-each>
+                </div>
+              </xsl:if>
+            </div>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name = "innermenuli">
+              <xsl:with-param name="id" select="concat($id, '.', position())"/>
+            </xsl:call-template>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:for-each>
+    </div>
   </xsl:template>
-
   <xsl:template name="mainarea">
-	  <table cellspacing="0" cellpadding="0" border="0" width="100%">
-	    <!-- ( ================= middle NavBar ================== ) -->
-	    <tr>
-	      <!-- ============ Breadcrumbs =========== -->
-          <td class="subborder trail">
+    <table cellspacing="0" cellpadding="0" border="0" width="100%">
+<!-- ( ================= middle NavBar ================== ) -->
+      <tr>
+<!-- ============ Breadcrumbs =========== -->
+        <td class="subborder trail">
 	         &#160;
 			 <xsl:if test="not ($config/trail/@location)">
-				<xsl:call-template name="breadcrumbs"/>&#160;
+            <xsl:call-template name="breadcrumbs"/>&#160;
              </xsl:if>
-          </td>
-	      <!-- ============ Page font settings =========== -->
-	      <td class="subborder trail" align="right" nowrap="nowrap">
+        </td>
+<!-- ============ Page font settings =========== -->
+        <td class="subborder trail" align="right" nowrap="nowrap">
 			 &#160;
 	       <xsl:if test="$disable-font-script = 'false'">
 	        Font size: 
 	          &#160;<input type="button" onclick="ndeSetTextSize('reset'); return false;" title="Reset text" class="resetfont" value="Reset"/>      
 	          &#160;<input type="button" onclick="ndeSetTextSize('decr'); return false;" title="Shrink text" class="smallerfont" value="-a"/>
 	          &#160;<input type="button" onclick="ndeSetTextSize('incr'); return false;" title="Enlarge text" class="biggerfont" value="+a"/>
-           </xsl:if>
-          </td>
-	    </tr>
-
-	    <!-- ( ================= Content================== ) -->
-	    <tr >
-	      <td align="left" colspan="2">
-	        <xsl:apply-templates select="div[@class='content']"/>
-	      </td>
-	    </tr>
-	  </table>
+          </xsl:if>
+        </td>
+      </tr>
+<!-- ( ================= Content================== ) -->
+      <tr >
+        <td align="left" colspan="2">
+          <xsl:apply-templates select="div[@class='content']"/>
+        </td>
+      </tr>
+    </table>
   </xsl:template>
-  
   <xsl:template match="div[@class = 'skinconf-heading-1']">
     <xsl:choose>
       <xsl:when test="//skinconfig/headings/@type='underlined'">
-      
         <table class="h3" cellpadding="0" cellspacing="0" border="0" width="100%">
           <tbody>
             <tr>
               <td width="9" height="10"></td>
-              <td><h3><xsl:value-of select="h1"/></h3></td>
+              <td>
+                <h3>
+                  <xsl:value-of select="h1"/>
+                </h3>
+              </td>
               <td></td>
             </tr>
             <tr class="heading ">
@@ -555,21 +545,24 @@
               <td class="bottomborder"></td>
               <td class="bottom-right"></td>
             </tr>
- 
-          </tbody>            
+          </tbody>
         </table>
       </xsl:when>
       <xsl:when test="//skinconfig/headings/@type='boxed'">
         <table class="h3 heading" cellpadding="0" cellspacing="0" border="0" width="100%">
           <tbody>
             <tr>
-            <td class="top-left"></td>
-            <td></td>
-            <td></td>
+              <td class="top-left"></td>
+              <td></td>
+              <td></td>
             </tr>
             <tr>
               <td></td>
-              <td><h3><xsl:value-of select="h1"/></h3></td>
+              <td>
+                <h3>
+                  <xsl:value-of select="h1"/>
+                </h3>
+              </td>
               <td></td>
             </tr>
             <tr>
@@ -577,15 +570,16 @@
               <td></td>
               <td></td>
             </tr>
-          </tbody>            
+          </tbody>
         </table>
       </xsl:when>
       <xsl:otherwise>
-        <h3 class="h3"><xsl:value-of select="h1"/></h3>
+        <h3 class="h3">
+          <xsl:value-of select="h1"/>
+        </h3>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
   <xsl:template match="div[@class = 'skinconf-heading-2']">
     <xsl:choose>
       <xsl:when test="//skinconfig/headings/@type='underlined'">
@@ -593,7 +587,11 @@
           <tbody>
             <tr>
               <td width="9" height="10"></td>
-              <td><h4><xsl:value-of select="h1"/></h4></td>
+              <td>
+                <h4>
+                  <xsl:value-of select="h1"/>
+                </h4>
+              </td>
               <td></td>
             </tr>
             <tr class="subheading">
@@ -601,7 +599,7 @@
               <td></td>
               <td class="bottom-right"></td>
             </tr>
-          </tbody>            
+          </tbody>
         </table>
       </xsl:when>
       <xsl:when test="//skinconfig/headings/@type='boxed'">
@@ -614,7 +612,11 @@
             </tr>
             <tr>
               <td></td>
-              <td><h4><xsl:value-of select="h1"/></h4></td>
+              <td>
+                <h4>
+                  <xsl:value-of select="h1"/>
+                </h4>
+              </td>
               <td></td>
             </tr>
             <tr>
@@ -622,22 +624,25 @@
               <td></td>
               <td></td>
             </tr>
-          </tbody>            
+          </tbody>
         </table>
       </xsl:when>
       <xsl:otherwise>
-        <h4 class="h4"><xsl:value-of select="h1"/></h4>
+        <h4 class="h4">
+          <xsl:value-of select="h1"/>
+        </h4>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
   <xsl:template name="bottomstrip">
-    <!-- ( ================= start Footer ================== ) -->
+<!-- ( ================= start Footer ================== ) -->
     <table>
       <tr>
-       <td><!-- using breaks so it scales with font size -->
-         <br/><br/>
-       </td>
+        <td>
+<!-- using breaks so it scales with font size -->
+          <br/>
+          <br/>
+        </td>
       </tr>
     </table>
     <table class="footer">
@@ -655,14 +660,12 @@
         <td width="90%" align="center" colspan="2">
           <span class="footnote">
             <xsl:choose>
-              <xsl:when test="$config/copyright-link">
-                <a>
-                  <xsl:attribute name="href">
-                    <xsl:value-of select="$config/copyright-link"/>
-                  </xsl:attribute>
+              <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:value-of select="$config/vendor"/></a>
               </xsl:when>
               <xsl:otherwise>
                 Copyright &#169; <xsl:value-of select="$config/year"/>&#160;
@@ -670,26 +673,26 @@
               </xsl:otherwise>
             </xsl:choose>
             All rights reserved.
-            <br/><script language="JavaScript" type="text/javascript"><![CDATA[<!--
+            <br/>
+<script language="JavaScript" type="text/javascript"><![CDATA[<!--
               document.write(" - "+"Last Published: " + document.lastModified);
               //  -->]]></script>
             <xsl:if test="$config/feedback">
               <xsl:call-template name="feedback"/>
             </xsl:if>
-            </span>
+          </span>
         </td>
         <td class="logos" align="right" nowrap="nowrap">
           <xsl:call-template name="compliancy-logos"/>
-          <xsl:call-template name="bottom-credit-icons"/>              
+          <xsl:call-template name="bottom-credit-icons"/>
         </td>
       </tr>
     </table>
-    <!-- ( ================= end Footer ================== ) -->
+<!-- ( ================= end Footer ================== ) -->
   </xsl:template>
-    
   <xsl:template name="bottom-credit-icons">
-      <!-- old place where to put credits icons-->
-      <!--
+<!-- old place where to put credits icons-->
+<!--
       <xsl:if test="$filename = 'index.html' and //skinconfig/credits">
         <xsl:for-each select="//skinconfig/credits/credit[not(@role='pdf')]">
           <xsl:variable name="name" select="name"/>
@@ -711,5 +714,4 @@
       </xsl:if>
       -->
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/tab2menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/tab2menu.xsl?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/tab2menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/krysalis-site/xslt/html/tab2menu.xsl Mon Apr  9 18:49:44 2007
@@ -41,85 +41,68 @@
 
 -->
 <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">
-      <table class="tab" cellspacing="0" cellpadding="0" border="0"> 
+    <table class="tab" cellspacing="0" cellpadding="0" border="0">
+      <tr>
+        <xsl:call-template name="base-tabs"/>
+      </tr>
+    </table>
+    <xsl:if test="tab[@dir=$longest-dir]/tab">
+      <table class="level2tab" cellspacing="0" cellpadding="0" border="0">
         <tr>
-          <xsl:call-template name="base-tabs"/>
+          <td>
+            <xsl:call-template name="level2tabs"/>
+          </td>
         </tr>
       </table>
-      <xsl:if test="tab[@dir=$longest-dir]/tab">
-      <table class="level2tab" cellspacing="0" cellpadding="0" border="0">
-          <tr>
-            <td>
-              <xsl:call-template name="level2tabs"/>
-            </td>
-          </tr>
-        </table>
-      </xsl:if>      
+    </xsl:if>
   </xsl:template>
-
   <xsl:template name="pre-separator">
-     <td class="tab pre-separator"></td>
-  </xsl:template>
-
-  <xsl:template name="post-separator">
-  
+    <td class="tab pre-separator"></td>
   </xsl:template>
-
+  <xsl:template name="post-separator"></xsl:template>
   <xsl:template name="separator">
-     <td class="tab separator"></td>
+    <td class="tab separator"></td>
   </xsl:template>
-
   <xsl:template name="level2-pre-separator">
-     <td class="tab pre-separator"></td>
+    <td class="tab pre-separator"></td>
   </xsl:template>
-
-  <xsl:template name="level2-post-separator">
-  
-  </xsl:template>
-
+  <xsl:template name="level2-post-separator"></xsl:template>
   <xsl:template name="level2-separator">
-     <td class="level2tab separator">|</td>
+    <td class="level2tab separator">|</td>
   </xsl:template>
-
   <xsl:template name="selected">
-        <td class="tab selected top-left TSTL"></td>
-        <td class="tab selected">
-           <xsl:call-template name="base-selected"/>
-        </td>
-        <td class="tab selected top-right TSTR"></td>
+    <td class="tab selected top-left TSTL"></td>
+    <td class="tab selected">
+      <xsl:call-template name="base-selected"/>
+    </td>
+    <td class="tab selected top-right TSTR"></td>
   </xsl:template>
-
   <xsl:template name="not-selected">
     <td>
       <table cellspacing="0" cellpadding="0" border="0">
         <tr>
-         <td class="tab unselected top-left TUTL"></td>
+          <td class="tab unselected top-left TUTL"></td>
           <td class="tab unselected corner">
-             <xsl:call-template name="base-not-selected"/>
+            <xsl:call-template name="base-not-selected"/>
           </td>
           <td class="tab unselected top-right TUTR"></td>
-        </tr> 
+        </tr>
         <tr>
           <td colspan="3" class="spacer"/>
         </tr>
       </table>
     </td>
   </xsl:template>
-  
   <xsl:template name="level2-selected">
-        <td class="level2tab selected">
-           <xsl:call-template name="base-selected"/>
-        </td>
+    <td class="level2tab selected">
+      <xsl:call-template name="base-selected"/>
+    </td>
   </xsl:template>
-
   <xsl:template name="level2-not-selected">
     <td class="level2tab unselected">
-      <xsl:call-template name="base-not-selected"/> 
+      <xsl:call-template name="base-not-selected"/>
     </td>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/skins/leather-dev/css/profiling.css.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/css/profiling.css.xslt?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/css/profiling.css.xslt (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/css/profiling.css.xslt Mon Apr  9 18:49:44 2007
@@ -16,49 +16,41 @@
   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']">
 #branding {
 background-color: <xsl:value-of select="@value"/>;
 }  
 </xsl:template>
-
-<xsl:template match="color[@name='tab-selected']"> 
+  <xsl:template match="color[@name='tab-selected']"> 
 #nav-main .current { background-color: <xsl:value-of select="@value"/>;} 
 #nav-main .current a:link {  color: <xsl:value-of select="@link"/>;  }
 #nav-main .current a:visited { color: <xsl:value-of select="@vlink"/>; }
 #nav-main .current a:hover { color: <xsl:value-of select="@hlink"/>; }
-</xsl:template> 
-
-<xsl:template match="color[@name='tab-unselected']"> 
+</xsl:template>
+  <xsl:template match="color[@name='tab-unselected']"> 
 #nav-main li      { background-color: <xsl:value-of select="@value"/> ;} 
 #nav-main li a:link {  color: <xsl:value-of select="@link"/>;  }
 #nav-main li a:visited { color: <xsl:value-of select="@vlink"/>; }
 #nav-main li 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']">
 #branding-tagline   { background-color: <xsl:value-of select="@value"/> ;} 
 #branding-tagline a:link {  color: <xsl:value-of select="@link"/>;  }
 #branding-tagline a:visited { color: <xsl:value-of select="@vlink"/>; }
 #branding-tagline a:hover { color: <xsl:value-of select="@hlink"/>; }
-</xsl:template> 
-
+</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-->
 <!--
 <xsl:template match="color[@name='heading']">
 .heading { background-color: <xsl:value-of select="@value"/>;} 
@@ -116,9 +108,8 @@
 #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']">
 #nav-section {
 background-color: <xsl:value-of select="@value"/>;
 color: <xsl:value-of select="@font"/>;
@@ -130,7 +121,7 @@
 color: <xsl:value-of select="@hlink"/>;
 } 
 #nav-section .menupagetitle  { color: <xsl:value-of select="@hlink"/>;}     
-</xsl:template> 
+</xsl:template>
 <!--xsl:template match="color[@name='dialog']"> 
 #menu .menupageitemgroup     { 
 	background-color: <xsl:value-of select="@value"/>;
@@ -138,27 +129,26 @@
 #menu .menupageitem {
 	color: <xsl:value-of select="@font"/>;
 } 
-</xsl:template--> 
-<xsl:template match="color[@name='menuheading']">
+</xsl:template-->
+  <xsl:template match="color[@name='menuheading']">
 .nav-section-title {
     color: <xsl:value-of select="@font"/>;
     background-color: <xsl:value-of select="@value"/>;
 }   
-</xsl:template> 
-<xsl:template match="color[@name='menuarea']">
+</xsl:template>
+  <xsl:template match="color[@name='menuarea']">
 #nav-section .currentmenuitemgroup {
     color: <xsl:value-of select="@font"/>;
     background-color: <xsl:value-of select="@value"/>;
 }   
-</xsl:template> 
-<xsl:template match="color[@name='searchbox']"> 
+</xsl:template>
+  <xsl:template match="color[@name='searchbox']"> 
 .search-input { 
     background-color: <xsl:value-of select="@value"/> ;
     color: <xsl:value-of select="@font"/>; 
 } 
 </xsl:template>
-
-<xsl:template match="color[@name='body']">
+  <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"/>} 
@@ -173,12 +163,9 @@
                                 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']"> 
 .highlight        { background-color: <xsl:value-of select="@value"/>;} 
@@ -206,7 +193,5 @@
 
 <xsl:template match="color[@name='table-cell']"> 
 .ForrestTable td   { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template--> 
-
-
+</xsl:template-->
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/skins/leather-dev/forrest-template.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/forrest-template.xml?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/forrest-template.xml (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/forrest-template.xml Mon Apr  9 18:49:44 2007
@@ -15,7 +15,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <forrest-template>
   <contract name="branding-trail-path"/>
   <hook name="intro">

Modified: forrest/trunk/main/webapp/skins/leather-dev/skinconf.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/skinconf.xsl?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/skinconf.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/skinconf.xsl Mon Apr  9 18:49:44 2007
@@ -16,138 +16,122 @@
   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>
+  <xsl:template match="skinconfig">
+    <xsl:if test="not(colors)">
+      <colors>
 <!-- Lenya -->
-  <color name="header" value="#ffffff"/>
-
-    <color name="tab-selected" value="#4C6C8F" link="#ffffff" vlink="#ffffff" hlink="#ffffff"/>
-    <color name="tab-unselected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/>
-    <color name="subtab-selected" value="#000000" link="#000000" vlink="#000000" hlink="#000000"/>
-    <color name="subtab-unselected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/>
-
-    <color name="heading" value="#E5E4D9"/>
-    <color name="subheading" value="#E5E4D9"/>
-    <color name="published" value="#4C6C8F" font="#FFFFFF"/>
-	<color name="feedback" value="#4C6C8F" font="#FFFFFF" align="center"/>
-    <color name="navstrip" value="#E5E4D9" font="#000000"/>
-
-    <color name="toolbox" value="#CFDCED" font="#000000"/>
-
-    <color name="border" value="#999999"/>
-    <color name="menu" value="#4C6C8F" font="#ffffff" link="#ffffff" vlink="#ffffff" hlink="#ffffff"  />    
-    <color name="menuheading" value="#cfdced" font="#000000" />
-    <color name="searchbox" value="#E5E4D9" font="#000000"/>
-    
-    <color name="dialog" value="#E5E4D9" font="#000000"/>
-	<color name="body" value="#ffffff" />            
-    
-    <color name="table" value="#ccc"/>    
-    <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="#003366"/>
-        
-    <color name="footer" value="#E5E4D9"/>
-  </colors>
-  </xsl:if>
-
-     <xsl:copy>
+        <color name="header" value="#ffffff"/>
+        <color name="tab-selected" value="#4C6C8F" link="#ffffff" vlink="#ffffff" hlink="#ffffff"/>
+        <color name="tab-unselected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/>
+        <color name="subtab-selected" value="#000000" link="#000000" vlink="#000000" hlink="#000000"/>
+        <color name="subtab-unselected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/>
+        <color name="heading" value="#E5E4D9"/>
+        <color name="subheading" value="#E5E4D9"/>
+        <color name="published" value="#4C6C8F" font="#FFFFFF"/>
+        <color name="feedback" value="#4C6C8F" font="#FFFFFF" align="center"/>
+        <color name="navstrip" value="#E5E4D9" font="#000000"/>
+        <color name="toolbox" value="#CFDCED" font="#000000"/>
+        <color name="border" value="#999999"/>
+        <color name="menu" value="#4C6C8F" font="#ffffff" link="#ffffff" vlink="#ffffff" hlink="#ffffff"  />
+        <color name="menuheading" value="#cfdced" font="#000000" />
+        <color name="searchbox" value="#E5E4D9" font="#000000"/>
+        <color name="dialog" value="#E5E4D9" font="#000000"/>
+        <color name="body" value="#ffffff" />
+        <color name="table" value="#ccc"/>
+        <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="#003366"/>
+        <color name="footer" value="#E5E4D9"/>
+      </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="#4C6C8F" link="#ffffff" vlink="#ffffff" hlink="#ffffff"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='tab-unselected'])">
-      <color name="tab-unselected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/>
-     </xsl:if>
-     <xsl:if test="not(color[@name='subtab-selected'])">
-      <color name="subtab-selected" value="#000000" link="#000000" vlink="#000000" hlink="#000000"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='subtab-unselected'])">
-      <color name="subtab-unselected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='heading'])">
-      <color name="heading" value="#E5E4D9"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='subheading'])">
-      <color name="subheading" value="#E5E4D9"/>
-     </xsl:if>
+      <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="#4C6C8F" link="#ffffff" vlink="#ffffff" hlink="#ffffff"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='tab-unselected'])">
+        <color name="tab-unselected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='subtab-selected'])">
+        <color name="subtab-selected" value="#000000" link="#000000" vlink="#000000" hlink="#000000"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='subtab-unselected'])">
+        <color name="subtab-unselected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='heading'])">
+        <color name="heading" value="#E5E4D9"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='subheading'])">
+        <color name="subheading" value="#E5E4D9"/>
+      </xsl:if>
       <xsl:if test="not(color[@name='feedback'])">
-		<color name="feedback" value="#4C6C8F" font="#FFFFFF" align="center"/>
-     </xsl:if> 
-     <xsl:if test="not(color[@name='published'])">
+        <color name="feedback" value="#4C6C8F" font="#FFFFFF" align="center"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='published'])">
         <color name="published" value="#4C6C8F" font="#FFFFFF"/>
-     </xsl:if> 
-     <xsl:if test="not(color[@name='navstrip'])">
-      <color name="navstrip" value="#E5E4D9" font="#000000"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='toolbox'])">
-       <color name="toolbox" value="#CFDCED" font="#000000"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='border'])">
-       <color name="border" value="#999999"/>
-     </xsl:if>       
-     <xsl:if test="not(color[@name='menu'])">
-      	<color name="menu" value="#4C6C8F" font="#ffffff" link="#ffffff" vlink="#ffffff" hlink="#ffffff"  /> 
-     </xsl:if>
-     <xsl:if test="not(color[@name='menuheading'])">
-	     <color name="menuheading" value="#cfdced" font="#000000" />
-     </xsl:if> 
-     <xsl:if test="not(color[@name='searchbox'])">
-	 	<color name="searchbox" value="#E5E4D9" font="#000000"/>
-     </xsl:if> 
-     <xsl:if test="not(color[@name='dialog'])">
-      <color name="dialog" value="#E5E4D9" font="#000000"/>
-     </xsl:if>  
-     <xsl:if test="not(color[@name='body'])">
-      <color name="body" value="#ffffff" /> 
-     </xsl:if>  
-     <xsl:if test="not(color[@name='table'])">
-      <color name="table" value="#ccc"/>    
-     </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="#E5E4D9"/>
-     </xsl:if>  
-    
-     </xsl:copy> 
-
-    </xsl:template>
-    
+      </xsl:if>
+      <xsl:if test="not(color[@name='navstrip'])">
+        <color name="navstrip" value="#E5E4D9" font="#000000"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='toolbox'])">
+        <color name="toolbox" value="#CFDCED" font="#000000"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='border'])">
+        <color name="border" value="#999999"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='menu'])">
+        <color name="menu" value="#4C6C8F" font="#ffffff" link="#ffffff" vlink="#ffffff" hlink="#ffffff"  />
+      </xsl:if>
+      <xsl:if test="not(color[@name='menuheading'])">
+        <color name="menuheading" value="#cfdced" font="#000000" />
+      </xsl:if>
+      <xsl:if test="not(color[@name='searchbox'])">
+        <color name="searchbox" value="#E5E4D9" font="#000000"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='dialog'])">
+        <color name="dialog" value="#E5E4D9" font="#000000"/>
+      </xsl:if>
+      <xsl:if test="not(color[@name='body'])">
+        <color name="body" value="#ffffff" />
+      </xsl:if>
+      <xsl:if test="not(color[@name='table'])">
+        <color name="table" value="#ccc"/>
+      </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="#E5E4D9"/>
+      </xsl:if>
+    </xsl:copy>
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/skins/leather-dev/templates/default.fv
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/templates/default.fv?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/templates/default.fv (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/templates/default.fv Mon Apr  9 18:49:44 2007
@@ -15,30 +15,26 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <forrest:view
   xmlns:forrest="http://apache.org/forrest/templates/1.0" type="xhtml">
-  
   <forrest:contract name="meta"/>
-  
   <forrest:hook name="container">
     <forrest:hook name="branding">
-			<forrest:contract name="projectlogo"/>
+      <forrest:contract name="projectlogo"/>
       <forrest:contract name="grouplogo"/>
       <forrest:contract name="searchbox"/>
       <forrest:contract name="nav-main"/>
-      <!--<forrest:contract name="nav-main-sub"/>-->
+<!--<forrest:contract name="nav-main-sub"/>-->
     </forrest:hook>
     <forrest:hook name="spacer" />
     <forrest:contract name="nav"/>
     <forrest:contract name="content"/>
-	    <!--<forrest:contract name="fontsize"/>-->
-			<!--<forrest:hook name="export-link">
+<!--<forrest:contract name="fontsize"/>-->
+<!--<forrest:hook name="export-link">
 	      <forrest:contract name="txt-link"/>
 		    <forrest:contract name="xml-link"/>
 			</forrest:hook>
 	  </forrest:contract>-->
   </forrest:hook>
   <forrest:contract name="feedback"/>
-  
 </forrest:view>

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/fo/document-to-fo.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/fo/document-to-fo.xsl?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/fo/document-to-fo.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/fo/document-to-fo.xsl Mon Apr  9 18:49:44 2007
@@ -15,11 +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/leather-dev/xslt/fo/document2fo.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/fo/document2fo.xsl?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/fo/document2fo.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/fo/document2fo.xsl Mon Apr  9 18:49:44 2007
@@ -15,11 +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/leather-dev/xslt/html/book-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/html/book-to-menu.xsl?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/html/book-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/html/book-to-menu.xsl Mon Apr  9 18:49:44 2007
@@ -19,44 +19,35 @@
 book-to-menu.xsl generates the HTML menu.  See the imported book-to-menu.xsl for
 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 id="menu">
-        <ul>
-	      <xsl:apply-templates select="menu"/>
-	    </ul>
+      <ul>
+        <xsl:apply-templates select="menu"/>
+      </ul>
     </div>
   </xsl:template>
-
   <xsl:template match="menu">
-	<li>
-    <h1><xsl:value-of select="@label"/></h1>
-    <ul>
-      <xsl:apply-templates/>
-    </ul>
-    </li>
+    <li><h1>
+        <xsl:value-of select="@label"/>
+      </h1>
+      <ul>
+        <xsl:apply-templates/>
+      </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">
-	<div class="current"><xsl:value-of select="@label"/></div>
+    <div class="current">
+      <xsl:value-of select="@label"/>
+    </div>
   </xsl:template>
-
   <xsl:template name="print-external">
     <font color="#ffcc00">
       <xsl:apply-imports/>
     </font>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document-to-html.xsl?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document-to-html.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document-to-html.xsl Mon Apr  9 18:49:44 2007
@@ -19,20 +19,19 @@
 This stylesheet contains templates for converting documentv11 to HTML.  See the
 imported document-to-html.xsl for details.
 -->
-
 <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 id="content">
-
       <xsl:if test="normalize-space(header/title)!=''">
-        <h1><xsl:value-of select="header/title"/></h1>
+        <h1>
+          <xsl:value-of select="header/title"/>
+        </h1>
       </xsl:if>
-
       <xsl:if test="normalize-space(header/subtitle)!=''">
-        <h3><xsl:value-of select="header/subtitle"/></h3>
+        <h3>
+          <xsl:value-of select="header/subtitle"/>
+        </h3>
       </xsl:if>
 <!--
       <xsl:apply-templates select="header/type"/>
@@ -47,15 +46,15 @@
         </xsl:if>
         <xsl:apply-templates select="header/version"/>
       </div>
-    -->  
-	<xsl:if test="header/abstract">
+    -->
+      <xsl:if test="header/abstract">
         <div class="abstract">
           <xsl:value-of select="header/abstract"/>
         </div>
       </xsl:if>
-<div id="content-main">
-      <xsl:apply-templates select="body"/>
-</div>
+      <div id="content-main">
+        <xsl:apply-templates select="body"/>
+      </div>
       <xsl:if test="header/authors">
         <p align="right">
           <font size="-2">
@@ -71,74 +70,80 @@
       </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>
-  <!-- Generate a <a name="..."> tag for an @id -->
+<!-- Generate a <a name="..."> tag for an @id -->
   <xsl:template match="@id">
-    <xsl:if test="normalize-space(.)!=''">
-      <a name="{.}"><xsl:text> </xsl:text></a>
+    <xsl:if test="normalize-space(.)!=''"><a name="{.}">
+<xsl:text> </xsl:text></a>
     </xsl:if>
   </xsl:template>
-  <xsl:template match="section">
-    <a name="{generate-id()}"><xsl:text> </xsl:text></a>
+  <xsl:template match="section"><a name="{generate-id()}">
+<xsl:text> </xsl:text></a>
     <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 select="*[not(self::title)]"/>
-		</div>  
+          <xsl:apply-templates select="*[not(self::title)]"/>
+        </div>
       </xsl:when>
       <xsl:when test="$level=2">
         <div class="skinconf-heading-{$level}">
-          <h2><xsl:value-of select="title"/></h2>
+          <h2>
+            <xsl:value-of select="title"/>
+          </h2>
         </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="figure">
     <xsl:apply-templates select="@id"/>
     <div style="text-align: center;">
       <img src="{@src}" alt="{@alt}" class="figure">
         <xsl:if test="@height">
-          <xsl:attribute name="height"><xsl:value-of select="@height"/></xsl:attribute>
+          <xsl:attribute name="height">
+            <xsl:value-of select="@height"/>
+          </xsl:attribute>
         </xsl:if>
         <xsl:if test="@width">
-          <xsl:attribute name="width"><xsl:value-of select="@width"/></xsl:attribute>
+          <xsl:attribute name="width">
+            <xsl:value-of select="@width"/>
+          </xsl:attribute>
         </xsl:if>
       </img>
     </div>
@@ -148,8 +153,10 @@
     <div class="{local-name()}">
       <div class="label">
         <xsl:choose>
-          <!-- FIXME: i18n Transformer here -->
-          <xsl:when test="@label"><xsl:value-of select="@label"/></xsl:when>
+<!-- FIXME: i18n Transformer here -->
+          <xsl:when test="@label">
+            <xsl:value-of select="@label"/>
+          </xsl:when>
           <xsl:when test="local-name() = 'note'">Note</xsl:when>
           <xsl:when test="local-name() = 'warning'">Warning</xsl:when>
           <xsl:otherwise>Fixme (<xsl:value-of select="@author"/>)</xsl:otherwise>

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/html/site-to-xhtml.xsl?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/html/site-to-xhtml.xsl Mon Apr  9 18:49:44 2007
@@ -33,52 +33,43 @@
 </site>
 
 -->
-
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:dyn="http://exslt.org/dynamic"
   extension-element-prefixes="dyn">
-
-  
-
   <xsl:import href="../../../common/xslt/html/site-to-xhtml.xsl"/>
   <xsl:variable name="request" select="substring-before($filename,'.html')"/>
-
   <xsl:include href="cocoon:/prepare.include.dyn:evaluate($request)"/>
   <xsl:include href="cocoon:/prepare.xhtml.dyn:evaluate($request)"/>
-    
   <xsl:template match="/">
-	    <xsl:apply-templates/>
+    <xsl:apply-templates/>
   </xsl:template>
-  
 <!--+
   |Overall site template
   +-->
   <xsl:template match="site">
     <xhtml>
       <head>
-    		<xsl:call-template name="getHead"/>
+        <xsl:call-template name="getHead"/>
 <!--+
   |stylesheets -> 
   |1. default css of the contracts
   |2. default css to overide the above created
   +-->
-         <style type="text/css">
-<xsl:call-template name="getCss"/>
-</style>
-            <link rel="stylesheet" href="{$root}skin/basic.css" type="text/css" 
+        <style type="text/css">
+          <xsl:call-template name="getCss"/>
+        </style><link rel="stylesheet" href="{$root}skin/basic.css" type="text/css" 
                 />
 <!--+
   |title
   +-->
-            <title>
-                <xsl:value-of select="div[@id='content']/h1"/>
-            </title>
+        <title><xsl:value-of select="div[@id='content']/h1"/></title>
       </head>
       <body onload="init()">
-        <!--<p><xsl:value-of select="substring-before($filename,'.html')"/></p>-->
+<!--<p><xsl:value-of select="substring-before($filename,'.html')"/></p>-->
         <xsl:call-template name="getBody"/>
       </body>
-    </xhtml><!--
+    </xhtml>
+<!--
     <site>
       <name><xsl:value-of select="$filename"/></name>
       <call><xsl:call-template name="getHead"/></call>
@@ -87,29 +78,33 @@
     </site>-->
   </xsl:template>
   <xsl:template name="menu">
-<xsl:comment>+
+    <xsl:comment>+
     |start Menu
     +</xsl:comment>
-   <div id="nav">
-<ul>
-<!--menu - inner-->	
-            <xsl:for-each select = "div[@id='menu']/ul/li">
-              <xsl:call-template name = "innermenuli" >
-                  <xsl:with-param name="id" select="concat('1.', position())"/>
-              </xsl:call-template>
-            </xsl:for-each>
-</ul>
-</div>
-        <!--
+    <div id="nav">
+      <ul>
+<!--menu - inner-->
+        <xsl:for-each select = "div[@id='menu']/ul/li">
+          <xsl:call-template name = "innermenuli" >
+            <xsl:with-param name="id" select="concat('1.', position())"/>
+          </xsl:call-template>
+        </xsl:for-each>
+      </ul>
+    </div>
+<!--
 			<xsl:apply-templates select="div[@id='menu']/*" />
 		-->
-</xsl:template>  
-  <xsl:template name="innermenuli">   
+  </xsl:template>
+  <xsl:template name="innermenuli">
     <xsl:param name="id"/>
     <xsl:variable name="tagid">
       <xsl:choose>
-        <xsl:when test="descendant-or-self::node()/li/div/@class='current'"><xsl:value-of select="concat('menu_selected_',$id)"/></xsl:when>
-        <xsl:otherwise><xsl:value-of select="concat('menu_',concat(font,$id))"/></xsl:otherwise>
+        <xsl:when test="descendant-or-self::node()/li/div/@class='current'">
+          <xsl:value-of select="concat('menu_selected_',$id)"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="concat('menu_',concat(font,$id))"/>
+        </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
     <xsl:variable name="whichGroup">
@@ -118,46 +113,42 @@
         <xsl:otherwise>menuitemgroup</xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-    
-    
-    <li class="pagegroup"><strong><xsl:value-of select="h1"/></strong>
+    <li class="pagegroup"><strong>
+      <xsl:value-of select="h1"/></strong>
       <ul>
         <xsl:for-each select= "ul/li">
-
           <xsl:choose>
             <xsl:when test="a">
-              <li><a href="{a/@href}"><xsl:value-of select="a" /></a></li>
+              <li><a href="{a/@href}">
+                <xsl:value-of select="a" /></a></li>
             </xsl:when>
             <xsl:when test="div/@class='current'">
-              <li class="menupage">
-                <div class="menupagetitle"><xsl:value-of select="div" /></div>
+              <li class="menupage"><div class="menupagetitle">
+                  <xsl:value-of select="div" />
+                </div>
                 <xsl:if test="$config/toc/@max-depth&gt;0
                     and contains($minitoc-location,'menu')
                     and count(//tocitems/tocitem) >= $config/toc/@min-sections">
-                  <li class="menupageitemgroup">
-                      <xsl:for-each select = "//tocitems/tocitem">
-                        <div class="menupageitem">
-                          <xsl:choose>
-                            <xsl:when test="string-length(@title)>15">
-                              <a href="{@href}" title="{@title}"><xsl:value-of select="substring(@title,0,20)" />...</a>
-                            </xsl:when>
-                            <xsl:otherwise>
-                              <a href="{@href}"><xsl:value-of select="@title" /></a>
-                            </xsl:otherwise>
-                          </xsl:choose>
-                        </div>
-                      </xsl:for-each>
-                  </li>
-                </xsl:if>
-              </li>
+                  <li class="menupageitemgroup"><xsl:for-each select = "//tocitems/tocitem">
+                      <div class="menupageitem">
+                        <xsl:choose>
+                          <xsl:when test="string-length(@title)>15"><a href="{@href}" title="{@title}">
+                            <xsl:value-of select="substring(@title,0,20)" />...</a>
+                          </xsl:when>
+                          <xsl:otherwise><a href="{@href}">
+                            <xsl:value-of select="@title" /></a>
+                          </xsl:otherwise>
+                        </xsl:choose>
+                      </div>
+                    </xsl:for-each></li>
+                </xsl:if></li>
             </xsl:when>
             <xsl:otherwise>
               <xsl:call-template name = "innermenuli">
-                 <xsl:with-param name="id" select="concat($id, '.', position())"/>
+                <xsl:with-param name="id" select="concat($id, '.', position())"/>
               </xsl:call-template>
             </xsl:otherwise>
           </xsl:choose>
-
         </xsl:for-each>
       </ul></li>
   </xsl:template>

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/html/tab-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/html/tab-to-menu.xsl?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/html/tab-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/html/tab-to-menu.xsl Mon Apr  9 18:49:44 2007
@@ -15,7 +15,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!--
 This stylesheet generates 'tabs' at the top left of the screen.  Tabs are
 visual indicators that a certain subsection of the URI space is being browsed.
@@ -38,44 +37,31 @@
 which is then merged by site-to-xhtml.xsl
 
 -->
-
 <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">
-  	<ul id="nav-main">
-  		<xsl:call-template name="base-tabs"/>
-  	</ul>
+    <ul id="nav-main">
+      <xsl:call-template name="base-tabs"/>
+    </ul>
     <xsl:if test="tab[@dir=$longest-dir]/tab">
       <div id="nav-main-sub">
         <xsl:call-template name="level2tabs"/>
       </div>
     </xsl:if>
   </xsl:template>
-
-  <xsl:template name="pre-separator">
-  </xsl:template>
-
-  <xsl:template name="post-separator">
-  </xsl:template>
-
-  <xsl:template name="separator">
-  </xsl:template>
-
+  <xsl:template name="pre-separator"></xsl:template>
+  <xsl:template name="post-separator"></xsl:template>
+  <xsl:template name="separator"></xsl:template>
   <xsl:template name="selected">
-	<li class="current"><xsl:call-template name="base-selected"/></li>
+    <li class="current"><xsl:call-template name="base-selected"/></li>
   </xsl:template>
-
   <xsl:template name="not-selected">
-	<li><xsl:call-template name="base-not-selected"/></li>
+    <li><xsl:call-template name="base-not-selected"/></li>
   </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/leather-dev/xslt/xml/contract.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/contract.xsl?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/contract.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/contract.xsl Mon Apr  9 18:49:44 2007
@@ -29,23 +29,22 @@
 </elements>
 
 -->
-
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="fct-bits/fct-bits.xsl"/>
   <xsl:param name="contextPath"/>
-  
-  <!--+
+<!--+
   |Overall site template
   +-->
   <xsl:template match="/">
     <elements>
-    <xsl:comment>context: <xsl:value-of select="$contextPath"/></xsl:comment>
+      <xsl:comment>context: <xsl:value-of select="$contextPath"/>
+      </xsl:comment>
 <!--+
   |XHTML-head
   +-->
-        <head>
-            <xsl:apply-templates select="contract" mode="xhtml-head"/>
-        </head>
+      <head>
+        <xsl:apply-templates select="contract" mode="xhtml-head"/>
+      </head>
 <!--+
   |XHTML-body
   +-->
@@ -54,5 +53,4 @@
       </body>
     </elements>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/dir-to-contracts.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/dir-to-contracts.xsl?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/dir-to-contracts.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/dir-to-contracts.xsl Mon Apr  9 18:49:44 2007
@@ -22,24 +22,21 @@
     xmlns:dir="http://apache.org/cocoon/directory/2.0"
     xmlns:session="http://apache.org/cocoon/session/1.0"
     >
-
-<xsl:param name="contentDir" select="'default/path'"/>
-
-  <!--
+  <xsl:param name="contentDir" select="'default/path'"/>
+<!--
       Create row for each document.  Information about the document is
       extracted from the document itself using the document()
       function.
   -->
   <xsl:template match="/">
-      <contracts xmlns:xhtml="http://www.w3.org/1999/xhtml">
-        <xsl:apply-templates select="//dir:file"/>                    
-      </contracts>
+    <contracts xmlns:xhtml="http://www.w3.org/1999/xhtml">
+      <xsl:apply-templates select="//dir:file"/>
+    </contracts>
   </xsl:template>
-
-<xsl:template match="dir:file[starts-with(@name,'c-')]">
+  <xsl:template match="dir:file[starts-with(@name,'c-')]">
     <xsl:variable name="fct-bit-file">
       <xsl:value-of select="$contentDir"/>
-      <xsl:text>/</xsl:text>
+<xsl:text>/</xsl:text>
       <xsl:value-of select="@name"/>
     </xsl:variable>
     <xsl:variable name="fct-bit-title">
@@ -66,7 +63,5 @@
         </contract>
       </content>
     </xsl:if>
-</xsl:template>
-
+  </xsl:template>
 </xsl:stylesheet>
-

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/fct-bits/c-fontsize-fct.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/fct-bits/c-fontsize-fct.xml?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/fct-bits/c-fontsize-fct.xml (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/fct-bits/c-fontsize-fct.xml Mon Apr  9 18:49:44 2007
@@ -17,15 +17,16 @@
 -->
 <contract name="fontsize-fct" nc="fontsize" tlc="content">
   <description>
-    This functions lets you change the size of the font you are using in the site with a jscript.
+    This functions lets you change the size of the font you are using in the
+    site with a jscript.
   </description>
   <xhtml>
     <head>
-      <script type="text/javascript" language="javascript" 
+<script type="text/javascript" language="javascript" 
         src="{$root}skin/fontsize.js"></script>
     </head>
     <body onload="init()">
-      <script type="text/javascript">ndeSetTextSize();</script>
+<script type="text/javascript">ndeSetTextSize();</script>
       <div class="trail">
             Font size: 
               &#160;<input type="button" onclick="ndeSetTextSize('reset'); return false;" title="Reset text" class="resetfont" value="Reset"/>      

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/fct-bits/fct-bits.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/fct-bits/fct-bits.xsl?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/fct-bits/fct-bits.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/fct-bits/fct-bits.xsl Mon Apr  9 18:49:44 2007
@@ -16,14 +16,12 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<xsl:template match="contract" mode="xhtml-head">
-  <xsl:comment>function name=<xsl:value-of select="@name"/> HEAD</xsl:comment>
-  <xsl:copy-of select="xhtml/head/*"/>
-</xsl:template>
-
-<xsl:template match="contract" mode="xhtml-body">
-  <xsl:comment>function name=<xsl:value-of select="@name"/> BODY</xsl:comment>
-  <xsl:copy-of select="xhtml/body/*"/>
-</xsl:template>
+  <xsl:template match="contract" mode="xhtml-head">
+    <xsl:comment>function name=<xsl:value-of select="@name"/> HEAD</xsl:comment>
+    <xsl:copy-of select="xhtml/head/*"/>
+  </xsl:template>
+  <xsl:template match="contract" mode="xhtml-body">
+    <xsl:comment>function name=<xsl:value-of select="@name"/> BODY</xsl:comment>
+    <xsl:copy-of select="xhtml/body/*"/>
+  </xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/ft-leather.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/ft-leather.xml?view=diff&rev=526993&r1=526992&r2=526993
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/ft-leather.xml (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/ft-leather.xml Mon Apr  9 18:49:44 2007
@@ -15,7 +15,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <forrest-template>
   <hook name="content">
     <contract name="fontsize"/>



Mime
View raw message