forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r526989 - in /forrest/trunk/main/webapp/skins/pelt: css/profile.css.xslt skinconf.xsl xslt/fo/document-to-fo.xsl xslt/html/book-to-menu.xsl xslt/html/document-to-html.xsl xslt/html/site-to-xhtml.xsl xslt/html/tab-to-menu.xsl
Date Tue, 10 Apr 2007 01:35:27 GMT
Author: crossley
Date: Mon Apr  9 18:35:26 2007
New Revision: 526989

URL: http://svn.apache.org/viewvc?view=rev&rev=526989
Log:
Whitespace changes only. Using xmlformat. Issue: FOR-644

Modified:
    forrest/trunk/main/webapp/skins/pelt/css/profile.css.xslt
    forrest/trunk/main/webapp/skins/pelt/skinconf.xsl
    forrest/trunk/main/webapp/skins/pelt/xslt/fo/document-to-fo.xsl
    forrest/trunk/main/webapp/skins/pelt/xslt/html/book-to-menu.xsl
    forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl
    forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl
    forrest/trunk/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl

Modified: forrest/trunk/main/webapp/skins/pelt/css/profile.css.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/css/profile.css.xslt?view=diff&rev=526989&r1=526988&r2=526989
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/css/profile.css.xslt (original)
+++ forrest/trunk/main/webapp/skins/pelt/css/profile.css.xslt Mon Apr  9 18:35:26 2007
@@ -16,52 +16,42 @@
   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"/>
-
-  <!-- xsl:output is not used by Forrest but makes it possible to debug the 
+<!-- xsl:output 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']">
 #top          { background-color: <xsl:value-of select="@value"/>;}  
 </xsl:template>
-
-<xsl:template match="color[@name='tab-selected']"> 
+  <xsl:template match="color[@name='tab-selected']"> 
 #top .header .current { background-color: <xsl:value-of select="@value"/>;} 
 #top .header .current a:link {  color: <xsl:value-of select="@link"/>;  }
 #top .header .current a:visited { color: <xsl:value-of select="@vlink"/>; }
 #top .header .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']"> 
 #tabs li      { background-color: <xsl:value-of select="@value"/> ;} 
 #tabs li a:link {  color: <xsl:value-of select="@link"/>;  }
 #tabs li a:visited { color: <xsl:value-of select="@vlink"/>; }
 #tabs 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']">
 #level2tabs a.selected      { background-color: <xsl:value-of select="@value"/> ;} 
 #level2tabs a:link {  color: <xsl:value-of select="@link"/>;  }
 #level2tabs a:visited { color: <xsl:value-of select="@vlink"/>; }
 #level2tabs 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']">
 #level2tabs { background-color: <xsl:value-of select="@value"/>;}
 #level2tabs a.unselected:link {  color: <xsl:value-of select="@link"/>;  }
 #level2tabs a.unselected:visited { color: <xsl:value-of select="@vlink"/>; }
 #level2tabs a.unselected: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']">
 .boxed { background-color: <xsl:value-of select="@value"/>;} 
 .underlined_5 	{border-bottom: solid 5px <xsl:value-of select="@value"/>;}
 .underlined_10 	{border-bottom: solid 10px <xsl:value-of select="@value"/>;}
@@ -69,8 +59,8 @@
 background-color: <xsl:value-of select="@value"/>; 
 color: <xsl:value-of select="@font"/>;
 }
-</xsl:template> 
-<xsl:template match="color[@name='feedback']">    
+</xsl:template>
+  <xsl:template match="color[@name='feedback']">    
 #feedback {
 color: <xsl:value-of select="@font"/>;
 background: <xsl:value-of select="@value"/>;
@@ -80,8 +70,7 @@
 color: <xsl:value-of select="@font"/>;
 }   
 </xsl:template>
-
-<xsl:template match="color[@name='breadtrail']">
+  <xsl:template match="color[@name='breadtrail']">
 #main .breadtrail {
 background: <xsl:value-of select="@value"/>; 
 color: <xsl:value-of select="@font"/>;
@@ -98,31 +87,29 @@
 #top .breadtrail a:hover { color: <xsl:value-of select="@hlink"/>; }    
 </xsl:template>
 <!--Fix for other (old) profiles-->
-<xsl:template match="color[@name='navstrip']">
+  <xsl:template match="color[@name='navstrip']">
 #publishedStrip { 
 color: <xsl:value-of select="@font"/>;
 background: <xsl:value-of select="@value"/>; 
 }
-</xsl:template> 
+</xsl:template>
 <!--has to go after the nav-strip (no 'navstrip')-->
-<xsl:template match="color[@name='published']">
+  <xsl:template match="color[@name='published']">
 #publishedStrip { 
 color: <xsl:value-of select="@font"/>;
 background: <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"/>;
   color: <xsl:value-of select="@font"/>;}
-</xsl:template> 
-
-<xsl:template match="color[@name='border']">
+</xsl:template>
+  <xsl:template match="color[@name='border']">
 #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"/>;} 
@@ -130,8 +117,8 @@
 #menu a:hover {  
 background-color: <xsl:value-of select="@value"/>;
 color: <xsl:value-of select="@hlink"/>;} 
-</xsl:template> 
-<xsl:template match="color[@name='dialog']"> 
+</xsl:template>
+  <xsl:template match="color[@name='dialog']"> 
 #menu .menupageitemgroup     { 
 background-color: <xsl:value-of select="@value"/>;
 }
@@ -144,21 +131,20 @@
 background-color: <xsl:value-of select="@value"/>;
 color: <xsl:value-of select="@hlink"/>;
 }
-</xsl:template> 
-<xsl:template match="color[@name='menuheading']">
+</xsl:template>
+  <xsl:template match="color[@name='menuheading']">
 #menu h1 {
 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']"> 
 #top .searchbox { 
 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"/>;
@@ -168,40 +154,29 @@
 a:hover { 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']"> 
 .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']"> 
 .ForrestTable td   { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
-
-
+</xsl:template>
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/skins/pelt/skinconf.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/skinconf.xsl?view=diff&rev=526989&r1=526988&r2=526989
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/skinconf.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/skinconf.xsl Mon Apr  9 18:35:26 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="#4C6C8F" link="#ffffff" vlink="#ffffff" hlink="#ffffff"/>
-    <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="#4C6C8F" link="#ffffff" vlink="#ffffff" hlink="#ffffff"/>
+        <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="#4C6C8F" link="#ffffff" vlink="#ffffff" hlink="#ffffff"/>
-     </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="#4C6C8F" link="#ffffff" vlink="#ffffff" hlink="#ffffff"/>
+      </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" link="#000000" vlink="#000000" hlink="#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" link="#000000" vlink="#000000" hlink="#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/pelt/xslt/fo/document-to-fo.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/fo/document-to-fo.xsl?view=diff&rev=526989&r1=526988&r2=526989
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/fo/document-to-fo.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/fo/document-to-fo.xsl Mon Apr  9 18:35:26 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/pelt/xslt/html/book-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/html/book-to-menu.xsl?view=diff&rev=526989&r1=526988&r2=526989
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/book-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/book-to-menu.xsl Mon Apr  9 18:35:26 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/pelt/xslt/html/document-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl?view=diff&rev=526989&r1=526988&r2=526989
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl Mon Apr  9 18:35:26 2007
@@ -19,16 +19,12 @@
 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">
     <meta-data>
-      <xsl:apply-templates select="header/meta"/>   
+      <xsl:apply-templates select="header/meta"/>
     </meta-data>
-    
     <div id="content">
       <div id="skinconf-printlink"/>
       <div id="skinconf-xmllink"/>
@@ -37,11 +33,14 @@
       <div id="skinconf-pdflink"/>
       <div id="disable-font-script"/>
       <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"/>
@@ -56,15 +55,13 @@
         </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>
-
       <xsl:apply-templates select="body"/>
-
       <xsl:if test="header/authors">
         <p align="right">
           <font size="-2">
@@ -83,72 +80,75 @@
       </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 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;" id="{@id}">
       <img src="{@src}" alt="{@alt}" class="figure"  id="{@id}">
         <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>
   </xsl:template>
-
 </xsl:stylesheet>

Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl?view=diff&rev=526989&r1=526988&r2=526989
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl Mon Apr  9 18:35:26 2007
@@ -33,95 +33,85 @@
 </site>
 
 -->
-
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1" exclude-result-prefixes="i18n">
-
   <xsl:import href="../../../common/xslt/html/site-to-xhtml.xsl"/>
 <!--+
   |Overall site template
   +-->
   <xsl:template match="site">
-    <!--html lang="en" xml:lang="en"-->
+<!--html lang="en" xml:lang="en"-->
     <html>
 <!--+
   |HTML-head
   +-->
-        <head>
+      <head>
 <!--+
   |generator meta
   +-->
-            <!-- Add some Forrest-specific metadata -->
-            <xsl:call-template name="html-meta"/>
-            <!-- Add any metadata from the documents -->
-            <xsl:call-template name="meta-data"/>
+<!-- Add some Forrest-specific metadata -->
+        <xsl:call-template name="html-meta"/>
+<!-- Add any metadata from the documents -->
+        <xsl:call-template name="meta-data"/>
 <!--+
   |title
   +-->
-            <title>
-                <xsl:value-of select="div[@id='content']/h1"/>
-                <xsl:if test="$config/motd">
-                  <xsl:for-each select="$config/motd/motd-option">
-                    <xsl:choose>
-                      <xsl:when test="@starts-with='true'">
-                        <xsl:if test="starts-with($path, @pattern)">
-                          <xsl:if test="normalize-space(motd-title) != ''">
-                            <xsl:text> (</xsl:text>
-                            <xsl:value-of select="motd-title"/>
-                            <xsl:text>)</xsl:text>
-                          </xsl:if>
-                        </xsl:if>
-                      </xsl:when>
-                      <xsl:otherwise>
-                        <xsl:if test="contains($path, @pattern)">
-                          <xsl:if test="normalize-space(motd-title) != ''">
-                            <xsl:text> (</xsl:text>
-                            <xsl:value-of select="motd-title"/>
-                            <xsl:text>)</xsl:text>
-                          </xsl:if>
-                        </xsl:if>
-                      </xsl:otherwise>
-                    </xsl:choose>
-                  </xsl:for-each>
-                </xsl:if>
-            </title>
+        <title><xsl:value-of select="div[@id='content']/h1"/>
+          <xsl:if test="$config/motd">
+            <xsl:for-each select="$config/motd/motd-option">
+              <xsl:choose>
+                <xsl:when test="@starts-with='true'">
+                  <xsl:if test="starts-with($path, @pattern)">
+                    <xsl:if test="normalize-space(motd-title) != ''">
+<xsl:text> (</xsl:text>
+                      <xsl:value-of select="motd-title"/>
+<xsl:text>)</xsl:text>
+                    </xsl:if>
+                  </xsl:if>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:if test="contains($path, @pattern)">
+                    <xsl:if test="normalize-space(motd-title) != ''">
+<xsl:text> (</xsl:text>
+                      <xsl:value-of select="motd-title"/>
+<xsl:text>)</xsl:text>
+                    </xsl:if>
+                  </xsl:if>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:for-each>
+          </xsl:if></title>
 <!--+
   |stylesheets
-  +-->
-            <link rel="stylesheet" href="{$root}skin/basic.css" type="text/css" 
-                />
-            <link rel="stylesheet" href="{$root}skin/screen.css" 
-                type="text/css" media="screen" />
-            <link rel="stylesheet" href="{$root}skin/print.css" type="text/css" 
-                media="print" />
-            <link rel="stylesheet" href="{$root}skin/profile.css" 
+  +--><link rel="stylesheet" href="{$root}skin/basic.css" type="text/css" 
+                /><link rel="stylesheet" href="{$root}skin/screen.css" 
+                type="text/css" media="screen" /><link rel="stylesheet" href="{$root}skin/print.css" type="text/css" 
+                media="print" /><link rel="stylesheet" href="{$root}skin/profile.css" 
                 type="text/css" />
 <!--+
   |Javascripts
   +-->
-            <script type="text/javascript" language="javascript" 
+<script type="text/javascript" language="javascript" 
                 src="{$root}skin/getBlank.js"></script>
-	        <script type="text/javascript" language="javascript" 
+<script type="text/javascript" language="javascript" 
 				src="{$root}skin/getMenu.js"></script>
-	        <script type="text/javascript" language="javascript" 
+<script type="text/javascript" language="javascript" 
 				src="{$root}skin/fontsize.js"></script>
 <!--+
   |favicon
   +-->
-            <xsl:if test="//skinconfig/favicon-url">
-                <link rel="shortcut icon">
-                    <xsl:attribute name="href">
-                        <xsl:value-of 
+        <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>
+          </xsl:attribute></link>
+        </xsl:if>
+      </head>
 <!--+
   |HTML-body
   +-->
       <body onload="init()">
-		<script type="text/javascript">ndeSetTextSize();</script>
+<script type="text/javascript">ndeSetTextSize();</script>
 <!--+Site structure
   +++++++++++++++++++++++++++
      +=========================+
@@ -139,204 +129,208 @@
 <!--+
   |topstrip with logos and search box 
   +-->
-    <div id="top">
+        <div id="top">
 <!--breadcrumbs org location-->
-<xsl:if test="not ($config/trail/@location)">
-<xsl:comment>+
+          <xsl:if test="not ($config/trail/@location)">
+            <xsl:comment>+
     |breadtrail
     +</xsl:comment>
-      <div class="breadtrail">
-          <xsl:call-template name="breadcrumbs"/>
-      </div>
-</xsl:if>
-<xsl:comment>+
+            <div class="breadtrail">
+              <xsl:call-template name="breadcrumbs"/>
+            </div>
+          </xsl:if>
+          <xsl:comment>+
     |header
     +</xsl:comment>
-    <div class="header">          
-<xsl:comment>+
+          <div class="header">
+            <xsl:comment>+
     |start group logo
-    +</xsl:comment> 
-        <xsl:if test="$config/group-url">
-          <div class="grouplogo">
-            <xsl:call-template name="renderlogo">
-              <xsl:with-param name="name" select="$config/group-name"/>
-              <xsl:with-param name="url" select="$config/group-url"/>
-              <xsl:with-param name="logo" select="$config/group-logo"/>
-              <xsl:with-param name="root" select="$root"/>
-              <xsl:with-param name="description" select="$config/group-description"/>
-            </xsl:call-template>
-          </div>
-        </xsl:if>
-<xsl:comment>+
+    +</xsl:comment>
+            <xsl:if test="$config/group-url">
+              <div class="grouplogo">
+                <xsl:call-template name="renderlogo">
+                  <xsl:with-param name="name" select="$config/group-name"/>
+                  <xsl:with-param name="url" select="$config/group-url"/>
+                  <xsl:with-param name="logo" select="$config/group-logo"/>
+                  <xsl:with-param name="root" select="$root"/>
+                  <xsl:with-param name="description" select="$config/group-description"/>
+                </xsl:call-template>
+              </div>
+            </xsl:if>
+            <xsl:comment>+
     |end group logo
     +</xsl:comment>
-<xsl:comment>+
+            <xsl:comment>+
     |start Project Logo
-    +</xsl:comment> 
-   <xsl:variable name="xtest">
-       <xsl:choose>
+    +</xsl:comment>
+            <xsl:variable name="xtest">
+              <xsl:choose>
                 <xsl:when 
                     test="$config/group-url and $config/search and not($config/search/@box-location = 'alt')">
-                     <xsl:text>true</xsl:text></xsl:when>
-                <xsl:otherwise><xsl:text>false</xsl:text></xsl:otherwise>
-             </xsl:choose>
-   </xsl:variable>
-     <div class="projectlogo">
-            <xsl:if test="$xtest='false'" >
-                    <xsl:attribute name="class">
-                        <xsl:text>projectlogoA1</xsl:text>
-                    </xsl:attribute>      
-            </xsl:if>
-          <xsl:call-template name="renderlogo">
-            <xsl:with-param name="name" select="$config/project-name"/>
-            <xsl:with-param name="url" select="$config/project-url"/>
-            <xsl:with-param name="logo" select="$config/project-logo"/>
-            <xsl:with-param name="root" select="$root"/>
-            <xsl:with-param name="description" select="$config/project-description"/>
-        </xsl:call-template>
-      </div>
-<xsl:comment>+
+<xsl:text>true</xsl:text>
+                </xsl:when>
+                <xsl:otherwise>
+<xsl:text>false</xsl:text>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+            <div class="projectlogo">
+              <xsl:if test="$xtest='false'" >
+                <xsl:attribute name="class">
+<xsl:text>projectlogoA1</xsl:text>
+                </xsl:attribute>
+              </xsl:if>
+              <xsl:call-template name="renderlogo">
+                <xsl:with-param name="name" select="$config/project-name"/>
+                <xsl:with-param name="url" select="$config/project-url"/>
+                <xsl:with-param name="logo" select="$config/project-logo"/>
+                <xsl:with-param name="root" select="$root"/>
+                <xsl:with-param name="description" select="$config/project-description"/>
+              </xsl:call-template>
+            </div>
+            <xsl:comment>+
     |end Project Logo
-    +</xsl:comment> 
-
-        <xsl:if 
+    +</xsl:comment>
+            <xsl:if 
             test="$config/search and not($config/search/@box-location = 'alt')">
-<xsl:comment>+
+              <xsl:comment>+
     |start Search
-    +</xsl:comment> 
-            <div class="searchbox">
-             <xsl:variable name="search-prompt">
-               <i18n:text>Search the site with</i18n:text>
-               <xsl:text> </xsl:text>
-               <xsl:value-of select="$config/search/@provider"/>
-             </xsl:variable>
-             <xsl:choose>
-              <xsl:when test="$config/search/@provider = 'lucene'">
-                <!-- Lucene search -->
-                <form method="get" action="{$root}{$lucene-search}">
-                  <input type="text" id="query" name="queryString" size="25" onFocus="getBlank (this, '{$search-prompt}');">
-                    <xsl:attribute name="value"><xsl:value-of select="$search-prompt"/></xsl:attribute>
-                  </input>&#160;
+    +</xsl:comment>
+              <div class="searchbox">
+                <xsl:variable name="search-prompt">
+                  <i18n:text>Search the site with</i18n:text>
+<xsl:text> </xsl:text>
+                  <xsl:value-of select="$config/search/@provider"/>
+                </xsl:variable>
+                <xsl:choose>
+                  <xsl:when test="$config/search/@provider = 'lucene'">
+<!-- Lucene search -->
+                    <form method="get" action="{$root}{$lucene-search}">
+                      <input type="text" id="query" name="queryString" size="25" onFocus="getBlank (this, '{$search-prompt}');">
+                        <xsl:attribute name="value">
+                          <xsl:value-of select="$search-prompt"/>
+                        </xsl:attribute>
+                      </input>&#160;
 		  <input type="submit" value="Search" name="Search" i18n:attr="value"/>
-		 </form>
-	      </xsl:when>
-	      <xsl:otherwise>
-                <form class="roundtopsmall" method="get" action="http://www.google.com/search"> 
-                    <input type="hidden" name="sitesearch" value="{$config/search/@domain}"/> 
-                    <input type="text" id="query" name="q" size="25" onFocus="getBlank (this, '{$search-prompt}');">
-                      <xsl:attribute name="value"><xsl:value-of select="$search-prompt"/></xsl:attribute>
-                    </input>&#160; 
-                    <input type="submit" value="Search" name="Search" i18n:attr="value"/> </form>
-        </xsl:otherwise>
-</xsl:choose>
-            <!--div id="roundbottomsmall">
+                    </form>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <form class="roundtopsmall" method="get" action="http://www.google.com/search">
+                      <input type="hidden" name="sitesearch" value="{$config/search/@domain}"/>
+                      <input type="text" id="query" name="q" size="25" onFocus="getBlank (this, '{$search-prompt}');">
+                        <xsl:attribute name="value">
+                          <xsl:value-of select="$search-prompt"/>
+                        </xsl:attribute>
+                      </input>&#160; 
+                    <input type="submit" value="Search" name="Search" i18n:attr="value"/>
+                    </form>
+                  </xsl:otherwise>
+                </xsl:choose>
+<!--div id="roundbottomsmall">
             <img 
                 src="{$skin-img-dir}/rc-b-l-5-1body-2menu-3menu.png" 
                 alt="" width="5" height="5" class="cornersmall" 
                 style="display: none" />
         </div-->
-            </div>
-<xsl:comment>+
+              </div>
+              <xsl:comment>+
     |end search
-    +</xsl:comment> 
-        </xsl:if>
-<xsl:comment>+
+    +</xsl:comment>
+            </xsl:if>
+            <xsl:comment>+
     |start Tabs
     +</xsl:comment>
-        <xsl:apply-templates select="ul[@id='tabs']"/>
-<xsl:comment>+
+            <xsl:apply-templates select="ul[@id='tabs']"/>
+            <xsl:comment>+
     |end Tabs
     +</xsl:comment>
-       </div>
-    </div>
+          </div>
+        </div>
 <!--+
   |centerstrip with menu and mainarea
   +-->
-    <div id="main">       
-        <div id="publishedStrip">
-<xsl:comment>+
+        <div id="main">
+          <div id="publishedStrip">
+            <xsl:comment>+
     |start Subtabs
     +</xsl:comment>
             <div id="level2tabs">
-		<xsl:apply-templates select="span[@id='level2tabs']/node()"/>       
+              <xsl:apply-templates select="span[@id='level2tabs']/node()"/>
             </div>
-<xsl:comment>+
+            <xsl:comment>+
     |end Endtabs
     +</xsl:comment>
             <xsl:call-template name="last-published"/>
-        </div>
-
-<xsl:comment>+
+          </div>
+          <xsl:comment>+
     |breadtrail
     +</xsl:comment>
-        <div class="breadtrail">
-          <xsl:choose>
-           <xsl:when test="$config/trail/@location='alt'">
-            <!--breadtrail location='alt'-->
-                  <xsl:call-template name="breadcrumbs"/>
-           </xsl:when>
-           <xsl:otherwise>
-             <!--*NO* breadtrail-->
+          <div class="breadtrail">
+            <xsl:choose>
+              <xsl:when test="$config/trail/@location='alt'">
+<!--breadtrail location='alt'-->
+                <xsl:call-template name="breadcrumbs"/>
+              </xsl:when>
+              <xsl:otherwise>
+<!--*NO* breadtrail-->
              &#160;
            </xsl:otherwise>
-          </xsl:choose>
-         </div>
-<xsl:comment>+
+            </xsl:choose>
+          </div>
+          <xsl:comment>+
     |start Menu, mainarea
     +</xsl:comment>
-    <xsl:if test="div[@id='menu']/ul/li">
-      <xsl:call-template name="menu"/>
-    </xsl:if>
-<xsl:comment>+
+          <xsl:if test="div[@id='menu']/ul/li">
+            <xsl:call-template name="menu"/>
+          </xsl:if>
+          <xsl:comment>+
     |start content
     +</xsl:comment>
-    <xsl:apply-templates select="div[@id='content']"/>
-<xsl:comment>+
+          <xsl:apply-templates select="div[@id='content']"/>
+          <xsl:comment>+
     |end content
-    +</xsl:comment>    
-    <div class="clearboth">&#160;</div>
-
-  </div>
+    +</xsl:comment>
+          <div class="clearboth">&#160;</div>
+        </div>
 <!--+
   |bottomstrip with footer
   +-->
-    <div id="footer">
-<xsl:comment>+
+        <div id="footer">
+          <xsl:comment>+
     |start bottomstrip
     +</xsl:comment>
-  <div class="lastmodified"><xsl:call-template name="last-published"/> </div>
-
-    <xsl:if test="not($config/disable-copyright-footer = 'true')">
-      <div class="copyright">
+          <div class="lastmodified">
+            <xsl:call-template name="last-published"/>
+          </div>
+          <xsl:if test="not($config/disable-copyright-footer = 'true')">
+            <div class="copyright">
         Copyright &#169;
         <xsl:text> </xsl:text>
-        <xsl:value-of select="$config/year"/>
-        <xsl:call-template name="current-year">
-          <xsl:with-param name="copyrightyear" select="$config/year"/>
-        </xsl:call-template>
-        <xsl:text> </xsl:text>
-        <xsl:choose>
-          <xsl:when test="$config/copyright-link">
-            <a>
-              <xsl:attribute name="href">
-                <xsl:value-of select="$config/copyright-link"/>
-              </xsl:attribute>
-            <xsl:value-of select="$config/vendor"/>
-            </a>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$config/vendor"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </div>
-    </xsl:if>
-
+              <xsl:value-of select="$config/year"/>
+              <xsl:call-template name="current-year">
+                <xsl:with-param name="copyrightyear" select="$config/year"/>
+              </xsl:call-template>
+<xsl:text> </xsl:text>
+              <xsl:choose>
+                <xsl:when test="$config/copyright-link"><a>
+                  <xsl:attribute name="href">
+                    <xsl:value-of select="$config/copyright-link"/>
+                  </xsl:attribute>
+                  <xsl:value-of select="$config/vendor"/></a>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="$config/vendor"/>
+                </xsl:otherwise>
+              </xsl:choose>
+            </div>
+          </xsl:if>
           <xsl:if test="$filename = 'index.html'">
             <div id="logos" >
-            <xsl:if test="$config/disable-compliance-links/@align">
-              <xsl:attribute name="style">text-align: <xsl:value-of select="$config/disable-compliance-links/@align"/></xsl:attribute>
-            </xsl:if>
-              <!-- W3C logos style="text-align: center;"-->
+              <xsl:if test="$config/disable-compliance-links/@align">
+                <xsl:attribute name="style">text-align: <xsl:value-of select="$config/disable-compliance-links/@align"/>
+                </xsl:attribute>
+              </xsl:if>
+<!-- W3C logos style="text-align: center;"-->
               <xsl:call-template name="compliancy-logos"/>
               <xsl:if test="$filename = 'index.html' and $config/credits">
                 <xsl:for-each select="$config/credits/credit[not(@role='pdf')]">
@@ -345,19 +339,19 @@
                     <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" title="{$name}" 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:attribute name="style">
-                          <xsl:if test="$width">width: <xsl:value-of select="$width"/>px;</xsl:if>
-                          <xsl:if test="$height">height: <xsl:value-of select="$height"/>px;</xsl:if>
-                        </xsl:attribute>
-                      </img>
-                    </a>
+                    <xsl:variable name="height" select="height"/><a href="{$url}">
+                    <img alt="{$name} - logo" title="{$name}" 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:attribute name="style">
+                        <xsl:if test="$width">width: <xsl:value-of select="$width"/>px;</xsl:if>
+                        <xsl:if test="$height">height: <xsl:value-of select="$height"/>px;</xsl:if>
+                      </xsl:attribute>
+                    </img></a>
                   </xsl:if>
                 </xsl:for-each>
               </xsl:if>
@@ -376,236 +370,240 @@
           <xsl:if test="$config/feedback">
             <xsl:call-template name="feedback"/>
           </xsl:if>
-<xsl:comment>+
+          <xsl:comment>+
     |end bottomstrip
     +</xsl:comment>
-    </div>
-
-
+        </div>
       </body>
     </html>
   </xsl:template>
   <xsl:template name="last-published">
-    <script type="text/javascript"><![CDATA[<!--
+<script type="text/javascript"><![CDATA[<!--
 document.write("]]><i18n:text >Last Published:</i18n:text><![CDATA[ " + document.lastModified);
 //  -->]]></script>
   </xsl:template>
 <!--headings-->
-<xsl:template match="div[@class = 'skinconf-heading-1']">
+  <xsl:template match="div[@class = 'skinconf-heading-1']">
     <xsl:choose>
       <xsl:when test="//skinconfig/headings/@type='underlined'">
-      	<h2 class="underlined_10"><xsl:value-of select="h1"/></h2>
+        <h2 class="underlined_10">
+          <xsl:value-of select="h1"/>
+        </h2>
       </xsl:when>
       <xsl:when test="//skinconfig/headings/@type='boxed'">
-	       <h2 class="boxed"><xsl:value-of select="h1"/></h2>
+        <h2 class="boxed">
+          <xsl:value-of select="h1"/>
+        </h2>
       </xsl:when>
       <xsl:otherwise>
-        <h2 class="h3"><xsl:value-of select="h1"/></h2>
+        <h2 class="h3">
+          <xsl:value-of select="h1"/>
+        </h2>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-
   <xsl:template match="div[@class = 'skinconf-heading-2']">
     <xsl:choose>
       <xsl:when test="//skinconfig/headings/@type='underlined'">
-        <h3 class="underlined_5"><xsl:value-of select="h2"/></h3>
+        <h3 class="underlined_5">
+          <xsl:value-of select="h2"/>
+        </h3>
       </xsl:when>
       <xsl:when test="//skinconfig/headings/@type='boxed'">
-       	<h3 class="boxed"><xsl:value-of select="h2"/></h3>
+        <h3 class="boxed">
+          <xsl:value-of select="h2"/>
+        </h3>
       </xsl:when>
       <xsl:otherwise>
-        <h3 class="h4"><xsl:value-of select="h2"/></h3>
+        <h3 class="h4">
+          <xsl:value-of select="h2"/>
+        </h3>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-  <!-- Add links to any standards-compliance logos -->
+<!-- Add links to any standards-compliance logos -->
   <xsl:template name="compliancy-logos">
-    <xsl:if test="$filename = 'index.html' and $config/disable-compliance-links = 'false'">
-      <a href="http://validator.w3.org/check/referer"><img class="logoImage" 
+    <xsl:if test="$filename = 'index.html' and $config/disable-compliance-links = 'false'"><a href="http://validator.w3.org/check/referer">
+      <img class="logoImage" 
           src="{$skin-img-dir}/valid-html401.png"
-          alt="Valid HTML 4.01!" title="Valid HTML 4.01!" style="height: 31px; width: 88px;" /></a>
-          
-      <a href="http://jigsaw.w3.org/css-validator/check/referer"><img class="logoImage" 
+          alt="Valid HTML 4.01!" title="Valid HTML 4.01!" style="height: 31px; width: 88px;" /></a><a href="http://jigsaw.w3.org/css-validator/check/referer">
+      <img class="logoImage" 
           src="{$skin-img-dir}/vcss.png" 
           alt="Valid CSS!" title="Valid CSS!" style="height: 31px; width: 88px;"/></a>
     </xsl:if>
   </xsl:template>
-
   <xsl:template name="menu">
-<xsl:comment>+
+    <xsl:comment>+
     |start Menu
     +</xsl:comment>
-   <div id="menu">
-<!--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>
-        <!--
+    <div id="menu">
+<!--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>
+<!--
 			<xsl:apply-templates select="div[@id='menu']/*" />
 		-->
-
 <!-- Search box: alternative location -->
-        <xsl:if 
+      <xsl:if 
             test="$config/search and $config/search/@box-location='alt'">
-<xsl:comment>+
+        <xsl:comment>+
     |start Search
-    +</xsl:comment> 
-            <div class="searchbox">
-             <hr />
-             <xsl:variable name="search-prompt">
-               <i18n:text>Search the site with</i18n:text>
-               <xsl:text> </xsl:text>
-               <xsl:value-of select="$config/search/@provider"/>
-             </xsl:variable>
-             <xsl:choose>
-              <xsl:when test="$config/search/@provider = 'lucene'">
-                <!-- Lucene search -->
-                <form method="get" action="{$root}{$lucene-search}">
-                  <input type="text" id="query" name="queryString" size="18" onFocus="getBlank (this, '{$search-prompt}');">
-                    <xsl:attribute name="value"><xsl:value-of select="$search-prompt"/></xsl:attribute>
-                  </input>&#160;
+    +</xsl:comment>
+        <div class="searchbox">
+          <hr />
+          <xsl:variable name="search-prompt">
+            <i18n:text>Search the site with</i18n:text>
+<xsl:text> </xsl:text>
+            <xsl:value-of select="$config/search/@provider"/>
+          </xsl:variable>
+          <xsl:choose>
+            <xsl:when test="$config/search/@provider = 'lucene'">
+<!-- Lucene search -->
+              <form method="get" action="{$root}{$lucene-search}">
+                <input type="text" id="query" name="queryString" size="18" onFocus="getBlank (this, '{$search-prompt}');">
+                  <xsl:attribute name="value">
+                    <xsl:value-of select="$search-prompt"/>
+                  </xsl:attribute>
+                </input>&#160;
 		  <input type="submit" value="Search" name="Search" i18n:attr="value"/>
-		 </form>
-	      </xsl:when>
-	      <xsl:otherwise>
-                <form method="get" action="http://www.google.com/search">
-                  <input type="hidden" name="sitesearch" value="{$config/search/@domain}"/> 
-                  <input type="text" id="query" name="q" size="18" onFocus="getBlank (this, '{$search-prompt}');">
-                    <xsl:attribute name="value"><xsl:value-of select="$search-prompt"/></xsl:attribute>
-                  </input>&#160; 
+              </form>
+            </xsl:when>
+            <xsl:otherwise>
+              <form method="get" action="http://www.google.com/search">
+                <input type="hidden" name="sitesearch" value="{$config/search/@domain}"/>
+                <input type="text" id="query" name="q" size="18" onFocus="getBlank (this, '{$search-prompt}');">
+                  <xsl:attribute name="value">
+                    <xsl:value-of select="$search-prompt"/>
+                  </xsl:attribute>
+                </input>&#160; 
                   <input type="submit" value="Search" name="Search" i18n:attr="value"/>
-                </form>
-        </xsl:otherwise>
-</xsl:choose>
-            </div>
-<xsl:comment>+
+              </form>
+            </xsl:otherwise>
+          </xsl:choose>
+        </div>
+        <xsl:comment>+
     |end search
-    +</xsl:comment> 
-        </xsl:if>
-
+    +</xsl:comment>
+      </xsl:if>
 <!--credits in alternative location-->
-	<div id="credit">
-	 <xsl:if test="$filename = 'index.html' and $config/credits and ($config/credits/credit/@box-location = 'alt')">
-           <hr />
-                <xsl:for-each select="$config/credits/credit[not(@role='pdf')]">
-                  <xsl:if test="@box-location = 'alt'">
-                  <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" title="{$name}" 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"/>
+      <div id="credit">
+        <xsl:if test="$filename = 'index.html' and $config/credits and ($config/credits/credit/@box-location = 'alt')">
+          <hr />
+          <xsl:for-each select="$config/credits/credit[not(@role='pdf')]">
+            <xsl:if test="@box-location = 'alt'">
+              <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" title="{$name}" 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:attribute name="style">
+                  <xsl:if test="$width">width: <xsl:value-of select="$width"/>px;</xsl:if>
+                  <xsl:if test="$height">height: <xsl:value-of select="$height"/>px;</xsl:if>
+                </xsl:attribute>
+              </img></a>
+            </xsl:if>
+          </xsl:for-each>
+        </xsl:if>
+<!-- Message of the day -->
+        <xsl:if test="$config/motd">
+          <xsl:for-each select="$config/motd/motd-option">
+            <xsl:choose>
+              <xsl:when test="@starts-with='true'">
+                <xsl:if test="starts-with($path, @pattern)">
+                  <xsl:if test="motd-page/@location='alt' or motd-page/@location='both'">
+                    <hr />
+                    <xsl:value-of select="motd-page"/>
+                    <xsl:if test="motd-page-url">
+<xsl:text> (</xsl:text><a>
+                      <xsl:attribute name="href">
+                        <xsl:value-of select="motd-page-url"/>
                       </xsl:attribute>
-                      <xsl:attribute name="style">
-                        <xsl:if test="$width">width: <xsl:value-of select="$width"/>px;</xsl:if>
-                        <xsl:if test="$height">height: <xsl:value-of select="$height"/>px;</xsl:if>
+<xsl:text>More</xsl:text></a>
+<xsl:text>)</xsl:text>
+                    </xsl:if>
+                  </xsl:if>
+                </xsl:if>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:if test="contains($path, @pattern)">
+                  <xsl:if test="motd-page/@location='alt' or motd-page/@location='both'">
+                    <hr />
+                    <xsl:value-of select="motd-page"/>
+                    <xsl:if test="motd-page-url">
+<xsl:text> (</xsl:text><a>
+                      <xsl:attribute name="href">
+                        <xsl:value-of select="motd-page-url"/>
                       </xsl:attribute>
-                    </img>
-                  </a>
+<xsl:text>More</xsl:text></a>
+<xsl:text>)</xsl:text>
+                    </xsl:if>
                   </xsl:if>
-                </xsl:for-each>
-              </xsl:if>
-
-<!-- Message of the day -->
-              <xsl:if test="$config/motd">
-                <xsl:for-each select="$config/motd/motd-option">
-                  <xsl:choose>
-                    <xsl:when test="@starts-with='true'">
-                      <xsl:if test="starts-with($path, @pattern)">
-                        <xsl:if test="motd-page/@location='alt' or motd-page/@location='both'">
-                          <hr />
-                          <xsl:value-of select="motd-page"/>
-                          <xsl:if test="motd-page-url">
-                            <xsl:text> (</xsl:text>
-                            <a>
-                              <xsl:attribute name="href">
-                                <xsl:value-of select="motd-page-url"/>
-                              </xsl:attribute>
-                              <xsl:text>More</xsl:text>
-                            </a>
-                            <xsl:text>)</xsl:text>
-                          </xsl:if>
-                        </xsl:if>
-                      </xsl:if>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:if test="contains($path, @pattern)">
-                        <xsl:if test="motd-page/@location='alt' or motd-page/@location='both'">
-                          <hr />
-                          <xsl:value-of select="motd-page"/>
-                          <xsl:if test="motd-page-url">
-                            <xsl:text> (</xsl:text>
-                            <a>
-                              <xsl:attribute name="href">
-                                <xsl:value-of select="motd-page-url"/>
-                              </xsl:attribute>
-                              <xsl:text>More</xsl:text>
-                            </a>
-                            <xsl:text>)</xsl:text>
-                          </xsl:if>
-                        </xsl:if>
-                      </xsl:if>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:for-each>
-              </xsl:if>
-		</div>
-
-        <div id="roundbottom">
-            <img 
+                </xsl:if>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:for-each>
+        </xsl:if>
+      </div>
+      <div id="roundbottom">
+        <img 
                 src="{$skin-img-dir}/rc-b-l-15-1body-2menu-3menu.png" 
                 alt="" width="15" height="15" class="corner" 
                 style="display: none" />
-        </div>
-
+      </div>
 <!--credits in alternative location #2-->
-        <xsl:comment>+
+      <xsl:comment>+
   |alternative credits
   +</xsl:comment>
-
-	<div id="credit2">
-	  <xsl:if test="$config/credits and ($config/credits/credit/@box-location = 'alt2')">
-            <xsl:for-each select="$config/credits/credit[not(@role='pdf')]">
-              <xsl:if test="@box-location = 'alt2'">
-                <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" title="{$name}" 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:attribute name="style">
-                      <xsl:if test="$width">width: <xsl:value-of select="$width"/>px;</xsl:if>
-                      <xsl:if test="$height">height: <xsl:value-of select="$height"/>px;</xsl:if>
-                    </xsl:attribute>
-                  </img>
-                </a>
-              </xsl:if>
-            </xsl:for-each>
-          </xsl:if>
-        </div>
+      <div id="credit2">
+        <xsl:if test="$config/credits and ($config/credits/credit/@box-location = 'alt2')">
+          <xsl:for-each select="$config/credits/credit[not(@role='pdf')]">
+            <xsl:if test="@box-location = 'alt2'">
+              <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" title="{$name}" 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:attribute name="style">
+                  <xsl:if test="$width">width: <xsl:value-of select="$width"/>px;</xsl:if>
+                  <xsl:if test="$height">height: <xsl:value-of select="$height"/>px;</xsl:if>
+                </xsl:attribute>
+              </img></a>
+            </xsl:if>
+          </xsl:for-each>
+        </xsl:if>
       </div>
-<xsl:comment>+
+    </div>
+    <xsl:comment>+
     |end Menu
     +</xsl:comment>
   </xsl:template>
-  
-  <xsl:template name="innermenuli">   
+  <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">
@@ -614,114 +612,114 @@
         <xsl:otherwise>menuitemgroup</xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-    
     <div class="menutitle" id="{$tagid}Title" 
         onclick="SwitchMenu('{$tagid}', '{$root}skin/')">
-        <xsl:if test="contains($tagid, '_selected_')" >
-            <xsl:attribute name="style">
-                <xsl:text>background-image: url('</xsl:text>
-                <xsl:value-of select="$root"/>
-                <xsl:text>skin/images/chapter_open.gif');</xsl:text>
-            </xsl:attribute>
-        </xsl:if>
-        <xsl:value-of select="h1"/>
+      <xsl:if test="contains($tagid, '_selected_')" >
+        <xsl:attribute name="style">
+<xsl:text>background-image: url('</xsl:text>
+          <xsl:value-of select="$root"/>
+<xsl:text>skin/images/chapter_open.gif');</xsl:text>
+        </xsl:attribute>
+      </xsl:if>
+      <xsl:value-of select="h1"/>
     </div>
-      <div class="{$whichGroup}" id="{$tagid}">
-        <xsl:if test="contains($tagid, '_selected_')" >
-          <xsl:attribute name="style">
-            <xsl:text>display: block;</xsl:text>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:for-each select= "ul/li">
-
-          <xsl:choose>
-            <xsl:when test="a">
-              <div class="menuitem">
-                <a>
-                  <xsl:attribute name="href">
-                    <xsl:value-of select="a/@href"/>
-                  </xsl:attribute>
-                  <xsl:if test="a/@title!=''">
-                    <xsl:attribute name="title">
-                      <xsl:value-of select="a/@title"/>
-                    </xsl:attribute>
-                  </xsl:if>
-                  <xsl:value-of select="a"/>
-                </a>
+    <div class="{$whichGroup}" id="{$tagid}">
+      <xsl:if test="contains($tagid, '_selected_')" >
+        <xsl:attribute name="style">
+<xsl:text>display: block;</xsl:text>
+        </xsl:attribute>
+      </xsl:if>
+      <xsl:for-each select= "ul/li">
+        <xsl:choose>
+          <xsl:when test="a">
+            <div class="menuitem"><a>
+              <xsl:attribute name="href">
+                <xsl:value-of select="a/@href"/>
+              </xsl:attribute>
+              <xsl:if test="a/@title!=''">
+                <xsl:attribute name="title">
+                  <xsl:value-of select="a/@title"/>
+                </xsl:attribute>
+              </xsl:if>
+              <xsl:value-of select="a"/></a>
+            </div>
+          </xsl:when>
+          <xsl:when test="div/@class='current'">
+            <div class="menupage">
+              <div class="menupagetitle">
+                <xsl:value-of select="div" />
               </div>
-            </xsl:when>
-            <xsl:when test="div/@class='current'">
-              <div class="menupage">
-                <div class="menupagetitle"><xsl:value-of select="div" /></div>
-                <xsl:if test="$config/toc/@max-depth > 0
+              <xsl:if test="$config/toc/@max-depth > 0
                     and contains($minitoc-location,'menu')
                     and count(//tocitems/tocitem) >= $config/toc/@min-sections">
-                  <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>
-                        </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>
+                <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>
+                    </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>
-
 <!--+
     |Generates the PDF link 
     +-->
   <xsl:template match="div[@id='skinconf-pdflink']">
-    <xsl:if test="not($config/disable-pdf-link) or $disable-pdf-link = 'false'"> 
+    <xsl:if test="not($config/disable-pdf-link) or $disable-pdf-link = 'false'">
       <div class="pdflink" title="Portable Document Format"><a href="{$filename-noext}.pdf" class="dida">
-        <img class="skin" src="{$skin-img-dir}/pdfdoc.gif" alt="PDF -icon" /><br/>
+        <img class="skin" src="{$skin-img-dir}/pdfdoc.gif" alt="PDF -icon" />
+        <br/>
         PDF</a>
       </div>
     </xsl:if>
   </xsl:template>
   <xsl:template match="div[@id='skinconf-xmllink']">
-    <xsl:if test="not($config/disable-xml-link) or $disable-xml-link = 'false'"> 
+    <xsl:if test="not($config/disable-xml-link) or $disable-xml-link = 'false'">
       <div class="xmllink" title="raw XML"><a href="{$filename-noext}.xml" class="dida">
-        <img class="skin" src="{$skin-img-dir}/xmldoc.gif" alt="XML - icon" /><br/>
+        <img class="skin" src="{$skin-img-dir}/xmldoc.gif" alt="XML - icon" />
+        <br/>
         XML</a>
       </div>
     </xsl:if>
   </xsl:template>
   <xsl:template match="div[@id='skinconf-txtlink']">
-    <xsl:if test="not($config/disable-txt-link) or $disable-txt-link = 'false'"> 
+    <xsl:if test="not($config/disable-txt-link) or $disable-txt-link = 'false'">
       <div class="podlink" title="Plain Text Documentation"><a href="{$filename-noext}.txt" class="dida">
-        <img class="skin" src="{$skin-img-dir}/txtdoc.png" alt="TXT - icon" /><br/>
+        <img class="skin" src="{$skin-img-dir}/txtdoc.png" alt="TXT - icon" />
+        <br/>
         TXT</a>
       </div>
     </xsl:if>
   </xsl:template>
   <xsl:template match="div[@id='skinconf-podlink']">
-    <xsl:if test="not($config/disable-pod-link) or $disable-pod-link = 'false'"> 
+    <xsl:if test="not($config/disable-pod-link) or $disable-pod-link = 'false'">
       <div class="podlink" title="Plain Old Documentation"><a href="{$filename-noext}.pod" class="dida">
-        <img class="skin" src="{$skin-img-dir}/poddoc.png" alt="POD - icon" /><br/>
+        <img class="skin" src="{$skin-img-dir}/poddoc.png" alt="POD - icon" />
+        <br/>
         POD</a>
       </div>
     </xsl:if>
   </xsl:template>
   <xsl:template match="div[@id='skinconf-printlink']">
-    <xsl:if test="not($config/disable-print-link) or $disable-print-link = 'false'"> 
-        <script type="text/javascript" language="Javascript">
+    <xsl:if test="not($config/disable-print-link) or $disable-print-link = 'false'">
+<script type="text/javascript" language="Javascript">
 function printit() {
   if (window.print) {
     window.focus();
@@ -729,8 +727,7 @@
   }
 }
         </script>
-
-        <script type="text/javascript" language="Javascript">
+<script type="text/javascript" language="Javascript">
 var NS = (navigator.appName == "Netscape");
 var VERSION = parseInt(navigator.appVersion);
 if (VERSION > 3) {
@@ -744,18 +741,16 @@
         </script>
     </xsl:if>
   </xsl:template>
-  
   <xsl:template match="div[@id='disable-font-script']">
     <xsl:if test="$disable-font-script = 'false'">
-	  <div class="trail">
-	         <i18n:text >Font size:</i18n:text> 
+      <div class="trail">
+        <i18n:text >Font size:</i18n:text> 
 	          &#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"/>
       </div>
     </xsl:if>
   </xsl:template>
-
   <xsl:template match="div[@id='skinconf-toc-page']">
 <!-- Message of the day -->
     <xsl:if test="$config/motd">
@@ -767,14 +762,12 @@
                 <div id="motd-area">
                   <xsl:value-of select="motd-page"/>
                   <xsl:if test="motd-page-url">
-                    <xsl:text> (</xsl:text>
-                    <a>
-                      <xsl:attribute name="href">
-                        <xsl:value-of select="motd-page-url"/>
-                      </xsl:attribute>
-                      <xsl:text>More</xsl:text>
-                    </a>
-                    <xsl:text>)</xsl:text>
+<xsl:text> (</xsl:text><a>
+                    <xsl:attribute name="href">
+                      <xsl:value-of select="motd-page-url"/>
+                    </xsl:attribute>
+<xsl:text>More</xsl:text></a>
+<xsl:text>)</xsl:text>
                   </xsl:if>
                 </div>
               </xsl:if>
@@ -786,14 +779,12 @@
                 <div id="motd-area">
                   <xsl:value-of select="motd-page"/>
                   <xsl:if test="motd-page-url">
-                    <xsl:text> (</xsl:text>
-                    <a>
-                      <xsl:attribute name="href">
-                        <xsl:value-of select="motd-page-url"/>
-                      </xsl:attribute>
-                      <xsl:text>More</xsl:text>
-                    </a>
-                    <xsl:text>)</xsl:text>
+<xsl:text> (</xsl:text><a>
+                    <xsl:attribute name="href">
+                      <xsl:value-of select="motd-page-url"/>
+                    </xsl:attribute>
+<xsl:text>More</xsl:text></a>
+<xsl:text>)</xsl:text>
                   </xsl:if>
                 </div>
               </xsl:if>
@@ -802,17 +793,16 @@
         </xsl:choose>
       </xsl:for-each>
     </xsl:if>
-
 <!-- Table of Contents ToC -->
     <xsl:if test="$config/toc">
       <xsl:if test="contains($minitoc-location,'page')">
         <xsl:if test="(count(//tocitems/tocitem) >= $config/toc/@min-sections) or (//tocitems/@force = 'true')">
-			<div id="minitoc-area">
-    			<xsl:call-template name="minitoc">
-        		    <xsl:with-param name="tocroot" select="//tocitems"/>
-	          	</xsl:call-template>
-			</div>
-	    </xsl:if>
+          <div id="minitoc-area">
+            <xsl:call-template name="minitoc">
+              <xsl:with-param name="tocroot" select="//tocitems"/>
+            </xsl:call-template>
+          </div>
+        </xsl:if>
       </xsl:if>
     </xsl:if>
   </xsl:template>

Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl?view=diff&rev=526989&r1=526988&r2=526989
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl Mon Apr  9 18:35:26 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,45 +37,30 @@
 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="tabs">
-  		<xsl:call-template name="base-tabs"/>
-  	</ul>
+    <ul id="tabs">
+      <xsl:call-template name="base-tabs"/>
+    </ul>
     <span id="level2tabs">
       <xsl:call-template name="level2tabs"/>
     </span>
   </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="level2-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="level2-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>



Mime
View raw message