forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject svn commit: rev 10158 - in xml/forrest/branches/copyless/src/core/context: . skins/avalon-tigris/xslt/html skins/common/xslt/html skins/forrest-css/xslt/html skins/forrest-site/xslt/html skins/krysalis-site/xslt/html
Date Wed, 21 Apr 2004 23:19:55 GMT
Author: nicolaken
Date: Wed Apr 21 16:19:53 2004
New Revision: 10158

Modified:
   xml/forrest/branches/copyless/src/core/context/sitemap.xmap
   xml/forrest/branches/copyless/src/core/context/skins/avalon-tigris/xslt/html/site2xhtml.xsl
   xml/forrest/branches/copyless/src/core/context/skins/common/xslt/html/document2html.xsl
   xml/forrest/branches/copyless/src/core/context/skins/common/xslt/html/site2xhtml.xsl
   xml/forrest/branches/copyless/src/core/context/skins/forrest-css/xslt/html/document2html.xsl
   xml/forrest/branches/copyless/src/core/context/skins/forrest-css/xslt/html/site2xhtml.xsl
   xml/forrest/branches/copyless/src/core/context/skins/forrest-site/xslt/html/site2xhtml.xsl
   xml/forrest/branches/copyless/src/core/context/skins/krysalis-site/xslt/html/document2html.xsl
   xml/forrest/branches/copyless/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl
Log:
Add skinconf.xml to the page aggregation, before the tabs, menu and body.
(@see [1] for a prior discussion that thought how this was a good idea)
Make every skin use the skinconf data in the aggregated xml instead of loading it from a file with the document() function.

[1] http://nagoya.apache.org/eyebrowse/ReadMsg?listName=forrest-dev@xml.apache.org&msgId=1216516




Modified: xml/forrest/branches/copyless/src/core/context/sitemap.xmap
==============================================================================
--- xml/forrest/branches/copyless/src/core/context/sitemap.xmap	(original)
+++ xml/forrest/branches/copyless/src/core/context/sitemap.xmap	Wed Apr 21 16:19:53 2004
@@ -376,6 +376,7 @@
 
       <map:match pattern="*.html">
         <map:aggregate element="site">
+          <map:part src="cocoon:/skinconf.xml"/>
           <map:part src="cocoon:/tab-{0}"/>
           <map:part src="cocoon:/menu-{0}"/>
           <map:part src="cocoon:/body-{0}"/>
@@ -388,6 +389,7 @@
 
       <map:match pattern="**/*.html">
         <map:aggregate element="site">
+          <map:part src="cocoon:/skinconf.xml"/>
           <map:part src="cocoon:/{1}/tab-{2}.html"/>
           <map:part src="cocoon:/{1}/menu-{2}.html"/>
           <map:part src="cocoon:/{1}/body-{2}.html"/>

Modified: xml/forrest/branches/copyless/src/core/context/skins/avalon-tigris/xslt/html/site2xhtml.xsl
==============================================================================
--- xml/forrest/branches/copyless/src/core/context/skins/avalon-tigris/xslt/html/site2xhtml.xsl	(original)
+++ xml/forrest/branches/copyless/src/core/context/skins/avalon-tigris/xslt/html/site2xhtml.xsl	Wed Apr 21 16:19:53 2004
@@ -46,10 +46,10 @@
             <link type="text/css" href="{$root}skin/mysite.css" rel="stylesheet" />
             <link type="text/css" href="{$root}skin/site.css"   rel="stylesheet" />
             <link type="text/css" href="{$root}skin/print.css"  rel="stylesheet" media="print" />
-            <xsl:if test="$config/favicon-url">
+            <xsl:if test="//skinconfig/favicon-url">
               <link rel="shortcut icon">
                 <xsl:attribute name="href">
-                  <xsl:value-of select="concat($root,$config/favicon-url)"/>
+                  <xsl:value-of select="concat($root,//skinconfig/favicon-url)"/>
                 </xsl:attribute>
               </link>
             </xsl:if>
@@ -67,13 +67,13 @@
          <tbody>        
           <tr>
             <xsl:comment>================= start Group Logo ==================</xsl:comment>
-            <xsl:if test="$config/group-name">
+            <xsl:if test="//skinconfig/group-name">
             <td align="left">
               <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="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>
@@ -84,9 +84,9 @@
             <td align="right">
               <div class="projectLogo">
                 <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="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>
@@ -105,13 +105,13 @@
       <tr class="status">
         <td>
           <xsl:comment>================= start BreadCrumb ==================</xsl:comment>
-            <a href="{$config/trail/link1/@href}"><xsl:value-of select="$config/trail/link1/@name" /></a> 
-            <xsl:if test = "($config/trail/link2/@name)and(normalize-space($config/trail/link2/@name)!='')"><xsl:text> | </xsl:text></xsl:if>                                 
-            <a href="{$config/trail/link2/@href}"><xsl:value-of select="$config/trail/link2/@name" /></a>
-            <xsl:if test = "($config/trail/link3/@name)and(normalize-space($config/trail/link3/@name)!='')"><xsl:text> | </xsl:text></xsl:if>                                 
-            <a href="{$config/trail/link3/@href}"><xsl:value-of select="$config/trail/link3/@name" /></a>
+            <a href="{//skinconfig/trail/link1/@href}"><xsl:value-of select="//skinconfig/trail/link1/@name" /></a> 
+            <xsl:if test = "(//skinconfig/trail/link2/@name)and(normalize-space(//skinconfig/trail/link2/@name)!='')"><xsl:text> | </xsl:text></xsl:if>                                 
+            <a href="{//skinconfig/trail/link2/@href}"><xsl:value-of select="//skinconfig/trail/link2/@name" /></a>
+            <xsl:if test = "(//skinconfig/trail/link3/@name)and(normalize-space(//skinconfig/trail/link3/@name)!='')"><xsl:text> | </xsl:text></xsl:if>                                 
+            <a href="{//skinconfig/trail/link3/@href}"><xsl:value-of select="//skinconfig/trail/link3/@name" /></a>
           <!-- useful when we have <link> elements instead of link(n:=1..3)  
-          <xsl:for-each select="$config/trail/link">
+          <xsl:for-each select="//skinconfig/trail/link">
             <xsl:if test="position()!=1">|</xsl:if>
             <a href="{@href}"><xsl:value-of select="@name"/></a>
           </xsl:for-each>
@@ -171,8 +171,8 @@
         <td colspan="2">
           <div align="center">
             <div class="copyright">
-              Copyright &#169; <xsl:value-of select="$config/year"/>&#160;<xsl:value-of
-              select="$config/vendor"/>. All rights reserved.
+              Copyright &#169; <xsl:value-of select="//skinconfig/year"/>&#160;<xsl:value-of
+              select="//skinconfig/vendor"/>. All rights reserved.
             </div>
           </div>
         </td>
@@ -181,13 +181,13 @@
       <tr>
       <td align="left">
         <xsl:comment>================= start Host ==================</xsl:comment>
-        <xsl:if test="$config/host-logo and not($config/host-logo = '')">
+        <xsl:if test="//skinconfig/host-logo and not(//skinconfig/host-logo = '')">
           <div align="left">
             <div class="host">
               <xsl:call-template name="renderlogo">
-                <xsl:with-param name="name" select="$config/host-name"/>
-                <xsl:with-param name="url" select="$config/host-url"/>
-                <xsl:with-param name="logo" select="$config/host-logo"/>
+                <xsl:with-param name="name" select="//skinconfig/host-name"/>
+                <xsl:with-param name="url" select="//skinconfig/host-url"/>
+                <xsl:with-param name="logo" select="//skinconfig/host-logo"/>
                 <xsl:with-param name="root" select="$root"/>
               </xsl:call-template>
             </div>
@@ -201,8 +201,8 @@
           <div class="credit">
             <xsl:if test="$filename = 'index.html'">
               <xsl:call-template name="compliancy-logos"/>
-              <xsl:if test="$config/credits">
-                <xsl:for-each select="$config/credits/credit[not(@role='pdf')]">
+              <xsl:if test="//skinconfig/credits">
+                <xsl:for-each select="//skinconfig/credits/credit[not(@role='pdf')]">
                   <xsl:call-template name="renderlogo">
                     <xsl:with-param name="name" select="name"/>
                     <xsl:with-param name="url" select="url"/>

Modified: xml/forrest/branches/copyless/src/core/context/skins/common/xslt/html/document2html.xsl
==============================================================================
--- xml/forrest/branches/copyless/src/core/context/skins/common/xslt/html/document2html.xsl	(original)
+++ xml/forrest/branches/copyless/src/core/context/skins/common/xslt/html/document2html.xsl	Wed Apr 21 16:19:53 2004
@@ -33,22 +33,18 @@
 <xsl:stylesheet version="1.0" 
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-  <!-- the skinconf file -->
-  <xsl:param name="config-file" select="'../../../../skinconf.xml'"/>
-  <xsl:variable name="config" select="document($config-file)/skinconfig"/>
-  
   <!-- If true, a PDF link for this page will not be generated -->
-  <xsl:variable name="disable-pdf-link" select="$config/disable-pdf-link"/>
+  <xsl:variable name="disable-pdf-link" select="//skinconfig/disable-pdf-link"/>
   <!-- If true, a "print" link for this page will not be generated -->
-  <xsl:variable name="disable-print-link" select="$config/disable-print-link"/>
+  <xsl:variable name="disable-print-link" select="//skinconfig/disable-print-link"/>
   <!-- If true, an XML link for this page will not be generated -->
-  <xsl:variable name="disable-xml-link" select="$config/disable-xml-link"/>  
+  <xsl:variable name="disable-xml-link" select="//skinconfig/disable-xml-link"/>  
   <!-- Get the location where to generate the minitoc -->
-  <xsl:variable name="minitoc-location" select="$config/toc/@location"/>
+  <xsl:variable name="minitoc-location" select="//skinconfig/toc/@location"/>
   <!-- Whether to obfuscate email links -->
-  <xsl:variable name="obfuscate-mail-links" select="$config/obfuscate-mail-links"/>
+  <xsl:variable name="obfuscate-mail-links" select="//skinconfig/obfuscate-mail-links"/>
   <!-- If true, an the images on all external links will not be added -->
-  <xsl:variable name="disable-external-link-image" select="$config/disable-external-link-image"/>  
+  <xsl:variable name="disable-external-link-image" select="//skinconfig/disable-external-link-image"/>  
 
   <xsl:param name="dynamic-page" select="'false'"/>  
   <xsl:param name="notoc"/>
@@ -140,7 +136,7 @@
   <!-- Generates the PDF link -->
   <xsl:template name="pdflink">
     <xsl:if test="$dynamic-page='false'">
-      <xsl:if test="not($config/disable-pdf-link) or $disable-pdf-link = 'false'"> 
+      <xsl:if test="not(//skinconfig/disable-pdf-link) or $disable-pdf-link = 'false'"> 
         <td align="center" width="40" nowrap="nowrap"><a href="{$filename-noext}.pdf" class="dida">
           <img class="skin" src="{$skin-img-dir}/pdfdoc.gif" alt="PDF"/><br/>
           PDF</a>
@@ -163,7 +159,7 @@
   </xsl:template>
   
   <xsl:template match="body">
-    <xsl:if test="$config/toc">
+    <xsl:if test="//skinconfig/toc">
       <xsl:call-template name="minitoc">
         <xsl:with-param name="tocroot" select="."/>
         <xsl:with-param name="depth">1</xsl:with-param>
@@ -246,7 +242,7 @@
             <xsl:apply-templates/>
           </a>
        </xsl:when>
-       <xsl:when test="not($disable-external-link-image='true') and contains(@href, ':') and not(contains(@href, $config/group-url)) and not(contains(@href, $config/project-url))">
+       <xsl:when test="not($disable-external-link-image='true') and contains(@href, ':') and not(contains(@href, //skinconfig/group-url)) and not(contains(@href, //skinconfig/project-url))">
           <a href="{@href}" class="external">
             <xsl:apply-templates/>
           </a>
@@ -350,12 +346,12 @@
   <xsl:template name="minitoc">  
     <xsl:param name="tocroot"/>
     <xsl:param name="depth"/>     
-    <xsl:if test="count($tocroot/section) >= $config/toc/@min-sections">
+    <xsl:if test="count($tocroot/section) >= //skinconfig/toc/@min-sections">
       <ul class="minitoc">
         <xsl:for-each select="$tocroot/section">
           <li>
             <xsl:call-template name="toclink"/>
-            <xsl:if test="$depth&lt;$config/toc/@max-depth">
+            <xsl:if test="$depth&lt;//skinconfig/toc/@max-depth">
               <xsl:call-template name="minitoc">
                 <xsl:with-param name="tocroot" select="."/>
                 <xsl:with-param name="depth" select="$depth + 1"/>

Modified: xml/forrest/branches/copyless/src/core/context/skins/common/xslt/html/site2xhtml.xsl
==============================================================================
--- xml/forrest/branches/copyless/src/core/context/skins/common/xslt/html/site2xhtml.xsl	(original)
+++ xml/forrest/branches/copyless/src/core/context/skins/common/xslt/html/site2xhtml.xsl	Wed Apr 21 16:19:53 2004
@@ -36,9 +36,6 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-  <!-- Default skinconf.xml in the skins/ directory -->
-  <xsl:param name="config-file" select="'../../../../skinconf.xml'"/>
-  <xsl:variable name="config" select="document($config-file)/skinconfig"/>
   <xsl:param name="path"/>
 
   <xsl:include href="dotdots.xsl"/>
@@ -63,9 +60,9 @@
   <xsl:variable name="spacer" select="concat($root, 'skin/images/spacer.gif')"/>
 
   <xsl:template name="breadcrumbs">
-    <xsl:if test="($config/trail/link1/@name)and($config/trail/link1/@name!='')"><a href="{$config/trail/link1/@href}"><xsl:value-of select="$config/trail/link1/@name"/></a></xsl:if>
-    <xsl:if test="($config/trail/link2/@name)and($config/trail/link2/@name!='')"> &gt; <a href="{$config/trail/link2/@href}">  <xsl:value-of select="$config/trail/link2/@name"/></a> </xsl:if>
-    <xsl:if test="($config/trail/link3/@name)and($config/trail/link3/@name!='')"> &gt; <a href="{$config/trail/link3/@href}">  <xsl:value-of select="$config/trail/link3/@name"/></a> </xsl:if>
+    <xsl:if test="(//skinconfig/trail/link1/@name)and(//skinconfig/trail/link1/@name!='')"><a href="{//skinconfig/trail/link1/@href}"><xsl:value-of select="//skinconfig/trail/link1/@name"/></a></xsl:if>
+    <xsl:if test="(//skinconfig/trail/link2/@name)and(//skinconfig/trail/link2/@name!='')"> &gt; <a href="{//skinconfig/trail/link2/@href}">  <xsl:value-of select="//skinconfig/trail/link2/@name"/></a> </xsl:if>
+    <xsl:if test="(//skinconfig/trail/link3/@name)and(//skinconfig/trail/link3/@name!='')"> &gt; <a href="{//skinconfig/trail/link3/@href}">  <xsl:value-of select="//skinconfig/trail/link3/@name"/></a> </xsl:if>
     <script type="text/javascript" language="JavaScript" src="{$root}skin/breadcrumbs.js"/>
   </xsl:template>
   
@@ -73,30 +70,30 @@
     <html>
       <head>
         <title><xsl:value-of select="div[@class='content']/table/tr/td/h1"/></title>
-        <xsl:if test="$config/favicon-url">
+        <xsl:if test="//skinconfig/favicon-url">
           <link rel="shortcut icon">
             <xsl:attribute name="href">
-              <xsl:value-of select="concat($root,$config/favicon-url)"/>
+              <xsl:value-of select="concat($root,//skinconfig/favicon-url)"/>
             </xsl:attribute>
           </link>
         </xsl:if>
       </head>
       <body>
-        <xsl:if test="$config/group-url">
+        <xsl:if test="//skinconfig/group-url">
           <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="name" select="//skinconfig/group-name"/>
+            <xsl:with-param name="url" select="//skinconfig/group-url"/>
+            <xsl:with-param name="logo" select="//skinconfig/group-logo"/>
             <xsl:with-param name="root" select="$root"/>
-            <xsl:with-param name="description" select="$config/group-description"/>
+            <xsl:with-param name="description" select="//skinconfig/group-description"/>
           </xsl:call-template>
         </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="name" select="//skinconfig/project-name"/>
+          <xsl:with-param name="url" select="//skinconfig/project-url"/>
+          <xsl:with-param name="logo" select="//skinconfig/project-logo"/>
           <xsl:with-param name="root" select="$root"/>
-          <xsl:with-param name="description" select="$config/project-description"/>
+          <xsl:with-param name="description" select="//skinconfig/project-description"/>
         </xsl:call-template>
         <xsl:comment>================= start Tabs ==================</xsl:comment>
         <xsl:apply-templates select="div[@class='tab']"/>
@@ -109,23 +106,23 @@
         <xsl:comment>================= end Content==================</xsl:comment>
 
         <xsl:comment>================= start Footer ==================</xsl:comment>
-        Copyright &#169; <xsl:value-of select="$config/year"/>&#160;<xsl:value-of
-          select="$config/vendor"/> All rights reserved.
+        Copyright &#169; <xsl:value-of select="//skinconfig/year"/>&#160;<xsl:value-of
+          select="//skinconfig/vendor"/> All rights reserved.
         <script language="JavaScript" type="text/javascript"><![CDATA[<!--
           document.write(" - "+"Last Published: " + document.lastModified);
           //  -->]]></script>
-        <xsl:if test="$config/host-logo and not($config/host-logo = '')">
-          <a href="{$config/host-url}">
+        <xsl:if test="//skinconfig/host-logo and not(//skinconfig/host-logo = '')">
+          <a href="{//skinconfig/host-url}">
             <xsl:call-template name="renderlogo">
-              <xsl:with-param name="name" select="$config/host-name"/>
-              <xsl:with-param name="url" select="$config/host-url"/>
-              <xsl:with-param name="logo" select="$config/host-logo"/>
+              <xsl:with-param name="name" select="//skinconfig/host-name"/>
+              <xsl:with-param name="url" select="//skinconfig/host-url"/>
+              <xsl:with-param name="logo" select="//skinconfig/host-logo"/>
               <xsl:with-param name="root" select="$root"/>
             </xsl:call-template>
           </a>
         </xsl:if>
-        <xsl:if test="$filename = 'index.html' and $config/credits">
-          <xsl:for-each select="$config/credits/credit[not(@role='pdf')]">
+        <xsl:if test="$filename = 'index.html' and //skinconfig/credits">
+          <xsl:for-each select="//skinconfig/credits/credit[not(@role='pdf')]">
             <xsl:call-template name="renderlogo">
               <xsl:with-param name="name" select="name"/>
               <xsl:with-param name="url" select="url"/>
@@ -145,7 +142,7 @@
 
   <!-- Add links to any standards-compliance logos -->
   <xsl:template name="compliancy-logos">
-    <xsl:if test="$config/disable-compliance-links = 'false'">
+    <xsl:if test="//skinconfig/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!" height="31" width="88" border="0"/></a>

Modified: xml/forrest/branches/copyless/src/core/context/skins/forrest-css/xslt/html/document2html.xsl
==============================================================================
--- xml/forrest/branches/copyless/src/core/context/skins/forrest-css/xslt/html/document2html.xsl	(original)
+++ xml/forrest/branches/copyless/src/core/context/skins/forrest-css/xslt/html/document2html.xsl	Wed Apr 21 16:19:53 2004
@@ -63,7 +63,7 @@
   </xsl:template>
 
   <xsl:template match="body">
-    <xsl:if test="$config/toc/@max-depth&gt;0 and not($notoc='true')" >
+    <xsl:if test="//skinconfig/toc/@max-depth&gt;0 and not($notoc='true')" >
       <xsl:call-template name="minitoc">
         <xsl:with-param name="tocroot" select="."/>
         <xsl:with-param name="depth">1</xsl:with-param>
@@ -94,7 +94,7 @@
     <ul>
       <xsl:for-each select="$tocroot/section">
         <xsl:call-template name="toclink"/>
-        <xsl:if test="$depth&lt;$config/toc/@max-depth">
+        <xsl:if test="$depth&lt;//skinconfig/toc/@max-depth">
           <xsl:call-template name="minitoc">
             <xsl:with-param name="tocroot" select="."/>
             <xsl:with-param name="depth" select="$depth + 1"/>          

Modified: xml/forrest/branches/copyless/src/core/context/skins/forrest-css/xslt/html/site2xhtml.xsl
==============================================================================
--- xml/forrest/branches/copyless/src/core/context/skins/forrest-css/xslt/html/site2xhtml.xsl	(original)
+++ xml/forrest/branches/copyless/src/core/context/skins/forrest-css/xslt/html/site2xhtml.xsl	Wed Apr 21 16:19:53 2004
@@ -50,10 +50,10 @@
         <title><xsl:value-of select="div[@class='content']/h1"/></title>
         <link rel="stylesheet" href="{$root}skin/page.css" type="text/css"/>
         <link rel="alternate stylesheet" title="Krysalis" href="{$root}skin/krysalis.css" type="text/css"/>
-        <xsl:if test="$config/favicon-url">
+        <xsl:if test="//skinconfig/favicon-url">
           <link rel="shortcut icon">
             <xsl:attribute name="href">
-              <xsl:value-of select="concat($root,$config/favicon-url)"/>
+              <xsl:value-of select="concat($root,//skinconfig/favicon-url)"/>
             </xsl:attribute>
           </link>
         </xsl:if>
@@ -67,11 +67,11 @@
         <form method="get" action="http://www.google.com/search">
 			<div id="mainheader">
 	          <!-- ================= start Group Logo ================== -->
-	          <xsl:if test="$config/group-url">
+	          <xsl:if test="//skinconfig/group-url">
 	  	      	<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="name" select="//skinconfig/group-name"/>
+		            <xsl:with-param name="url" select="//skinconfig/group-url"/>
+		            <xsl:with-param name="logo" select="//skinconfig/group-logo"/>
 		            <xsl:with-param name="root" select="$root"/>
 		            <xsl:with-param name="imgid">grouplogo</xsl:with-param>
 		            <xsl:with-param name="linkid">grouplogolink</xsl:with-param>
@@ -80,27 +80,27 @@
 	          <!-- ================= end Group Logo ================== -->
 	          <span class="textonly"> - </span>
 	          <!-- ================= start Search ================== -->
-	          <xsl:if test="not($config/disable-search) or
-	                $config/disable-search='false' and $config/searchsite-domain and
-	                $config/searchsite-name">
+	          <xsl:if test="not(//skinconfig/disable-search) or
+	                //skinconfig/disable-search='false' and //skinconfig/searchsite-domain and
+	                //skinconfig/searchsite-name">
 	              <span id="search">
-		              <input type="hidden" name="as_sitesearch" value="{$config/searchsite-domain}"/>
+		              <input type="hidden" name="as_sitesearch" value="{//skinconfig/searchsite-domain}"/>
 		              <input type="text" class="query" name="as_q"/>
 		              <input type="submit" value="Search"/>
 		              <br />
 		              <span class="searchtext">
-		                the <xsl:value-of select="$config/searchsite-name"/> site
+		                the <xsl:value-of select="//skinconfig/searchsite-name"/> site
 		              </span>
 		          </span>
 	          </xsl:if>
 			  <!-- ================= end Search ================== -->
 			  <span class="textonly"> - </span>
 	          <!-- ================= start Project Logo ================== -->
-	          <xsl:if test="$config/project-url">
+	          <xsl:if test="//skinconfig/project-url">
 	              <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="name" select="//skinconfig/project-name"/>
+	                <xsl:with-param name="url" select="//skinconfig/project-url"/>
+	                <xsl:with-param name="logo" select="//skinconfig/project-logo"/>
 	                <xsl:with-param name="root" select="$root"/>
 		            <xsl:with-param name="imgid">projectlogo</xsl:with-param>
 		            <xsl:with-param name="linkid">projectlogolink</xsl:with-param>
@@ -144,8 +144,8 @@
 			<a href="{$skin-img-dir}/current.gif"/>
 	
 			<span id="copyright">Copyright &#169;
-				<xsl:value-of select="$config/year"/>&#160;<xsl:value-of
-			  select="$config/vendor"/> All rights reserved.
+				<xsl:value-of select="//skinconfig/year"/>&#160;<xsl:value-of
+			  select="//skinconfig/vendor"/> All rights reserved.
 			</span>
 			<br class="textonly"/>
 			<span id="revision"><script language="JavaScript" type="text/javascript"><![CDATA[<!--
@@ -154,13 +154,13 @@
 			</span>
 			<br class="textonly"/>
 	
-	        <xsl:if test="$config/host-logo and not($config/host-logo = '')">
+	        <xsl:if test="//skinconfig/host-logo and not(//skinconfig/host-logo = '')">
 	          <div class="host">
 	            <img src="{$root}skin/images/spacer.gif" width="10" height="1" alt=""/>
 	            <xsl:call-template name="renderlogo">
-	              <xsl:with-param name="name" select="$config/host-name"/>
-	              <xsl:with-param name="url" select="$config/host-url"/>
-	              <xsl:with-param name="logo" select="$config/host-logo"/>
+	              <xsl:with-param name="name" select="//skinconfig/host-name"/>
+	              <xsl:with-param name="url" select="//skinconfig/host-url"/>
+	              <xsl:with-param name="logo" select="//skinconfig/host-logo"/>
 	              <xsl:with-param name="root" select="$root"/>
 	            </xsl:call-template>
 	          </div>
@@ -168,8 +168,8 @@
 	
 			<span id="validation">
 	        	<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')]">
+		        <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"/>
 		              <xsl:variable name="url" select="url"/>
 		              <xsl:variable name="image" select="image"/>

Modified: xml/forrest/branches/copyless/src/core/context/skins/forrest-site/xslt/html/site2xhtml.xsl
==============================================================================
--- xml/forrest/branches/copyless/src/core/context/skins/forrest-site/xslt/html/site2xhtml.xsl	(original)
+++ xml/forrest/branches/copyless/src/core/context/skins/forrest-site/xslt/html/site2xhtml.xsl	Wed Apr 21 16:19:53 2004
@@ -47,10 +47,10 @@
       <head>
         <title><xsl:value-of select="div[@class='content']/table/tr/td/h1"/></title>
         <link rel="stylesheet" href="{$root}skin/page.css" type="text/css"/>
-        <xsl:if test="$config/favicon-url">
+        <xsl:if test="//skinconfig/favicon-url">
           <link rel="shortcut icon">
             <xsl:attribute name="href">
-              <xsl:value-of select="concat($root,$config/favicon-url)"/>
+              <xsl:value-of select="concat($root,//skinconfig/favicon-url)"/>
             </xsl:attribute>
           </link>
         </xsl:if>
@@ -81,13 +81,13 @@
 
         <xsl:comment>================= start Group Logo ==================</xsl:comment>
         <td bgcolor="{$header-color}">
-          <xsl:if test="$config/group-url">
+          <xsl:if test="//skinconfig/group-url">
             <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="name" select="//skinconfig/group-name"/>
+              <xsl:with-param name="url" select="//skinconfig/group-url"/>
+              <xsl:with-param name="logo" select="//skinconfig/group-logo"/>
               <xsl:with-param name="root" select="$root"/>
-              <xsl:with-param name="description" select="$config/group-description"/>
+              <xsl:with-param name="description" select="//skinconfig/group-description"/>
             </xsl:call-template>
           </xsl:if>
         </td>
@@ -95,20 +95,20 @@
         <xsl:comment>================= start Project Logo ==================</xsl:comment>
         <td bgcolor="{$header-color}" align="center" width="100%">
           <xsl:call-template name="renderlogo">
-            <xsl:with-param name="name" select="$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="name" select="//skinconfig/project-name"/>
+            <xsl:with-param name="url" select="//skinconfig/project-url"/>
+            <xsl:with-param name="logo" select="//skinconfig/project-logo"/>
             <xsl:with-param name="root" select="$root"/>
-            <xsl:with-param name="description" select="$config/project-description"/>
+            <xsl:with-param name="description" select="//skinconfig/project-description"/>
           </xsl:call-template>
         </td>
         <xsl:comment>================= end Project Logo ==================</xsl:comment>
 
         <xsl:comment>================= start Search ==================</xsl:comment>
         <td bgcolor="{$header-color}" rowspan="2" valign="top">
-          <xsl:if test="not($config/disable-search) or
-            $config/disable-search='false' and $config/searchsite-domain and
-            $config/searchsite-name">
+          <xsl:if test="not(//skinconfig/disable-search) or
+            //skinconfig/disable-search='false' and //skinconfig/searchsite-domain and
+            //skinconfig/searchsite-name">
             <form method="get" action="http://www.google.com/search" target="_blank">
               <table bgcolor="{$menu-border}" cellpadding="0" cellspacing="0" border="0" summary="search">
                 <tr>
@@ -117,13 +117,13 @@
                 <tr>
                   <td><img class="spacer" src="{$spacer}" alt="" width="1" height="1" /></td>
                   <td nowrap="nowrap">
-                    <input type="hidden" name="sitesearch" value="{$config/searchsite-domain}"/>
+                    <input type="hidden" name="sitesearch" value="{//skinconfig/searchsite-domain}"/>
                     <input type="text" id="query" name="q" size="15"/>
                     <img class="spacer" src="{$spacer}" alt="" width="5" height="1" />
                     <input type="submit" value="Search" name="Search"/>
                     <br />
                     <font color="white" size="2" face="Arial, Helvetica, Sans-serif">
-                      the <xsl:value-of select="$config/searchsite-name"/> site
+                      the <xsl:value-of select="//skinconfig/searchsite-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
@@ -228,8 +228,8 @@
       <tr>
         <td align="center" class="copyright" bgcolor="{$background-bars}" colspan="2">
           <font face="Arial, Helvetica, Sans-Serif" size="2">Copyright &#169;
-          <xsl:value-of select="$config/year"/>&#160;<xsl:value-of
-          select="$config/vendor"/> All rights reserved.<script language="JavaScript" type="text/javascript"><![CDATA[<!--
+          <xsl:value-of select="//skinconfig/year"/>&#160;<xsl:value-of
+          select="//skinconfig/vendor"/> All rights reserved.<script language="JavaScript" type="text/javascript"><![CDATA[<!--
               document.write(" - "+"Last Published: " + document.lastModified);
             //  -->]]></script></font>
         </td>
@@ -241,9 +241,9 @@
               <!-- W3C logos -->
               <xsl:call-template name="compliancy-logos"/>
 
-              <xsl:if test="$config/credits">
+              <xsl:if test="//skinconfig/credits">
                 <img src="{$root}skin/images/spacer.gif" width="10" height="1" alt=""/>
-                <xsl:for-each select="$config/credits/credit[not(@role='pdf')]">
+                <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"/>
@@ -264,13 +264,13 @@
               </xsl:if>
             </div>
           </xsl:if>
-        <xsl:if test="$config/host-logo and not($config/host-logo = '')">
+        <xsl:if test="//skinconfig/host-logo and not(//skinconfig/host-logo = '')">
           <div class="host">
             <img src="{$root}skin/images/spacer.gif" width="10" height="1" alt=""/>
             <xsl:call-template name="renderlogo">
-              <xsl:with-param name="name" select="$config/host-name"/>
-              <xsl:with-param name="url" select="$config/host-url"/>
-              <xsl:with-param name="logo" select="$config/host-logo"/>
+              <xsl:with-param name="name" select="//skinconfig/host-name"/>
+              <xsl:with-param name="url" select="//skinconfig/host-url"/>
+              <xsl:with-param name="logo" select="//skinconfig/host-logo"/>
               <xsl:with-param name="root" select="$root"/>
             </xsl:call-template>
           </div>

Modified: xml/forrest/branches/copyless/src/core/context/skins/krysalis-site/xslt/html/document2html.xsl
==============================================================================
--- xml/forrest/branches/copyless/src/core/context/skins/krysalis-site/xslt/html/document2html.xsl	(original)
+++ xml/forrest/branches/copyless/src/core/context/skins/krysalis-site/xslt/html/document2html.xsl	Wed Apr 21 16:19:53 2004
@@ -77,7 +77,7 @@
 
   <xsl:template match="body">
 
-    <xsl:if test="section and $config/toc/@max-depth&gt;0 and not($notoc='true') and contains($minitoc-location,'menu')">
+    <xsl:if test="section and //skinconfig/toc/@max-depth&gt;0 and not($notoc='true') and contains($minitoc-location,'menu')">
       <toc>
         <xsl:for-each select="section">
           <tocc>
@@ -106,7 +106,7 @@
       </toc>
     </xsl:if>
     
-   <xsl:if test="$config/toc/@max-depth&gt;0 and not($notoc='true') and contains($minitoc-location,'page')" >
+   <xsl:if test="//skinconfig/toc/@max-depth&gt;0 and not($notoc='true') and contains($minitoc-location,'page')" >
       <xsl:call-template name="minitoc">
         <xsl:with-param name="tocroot" select="."/>
         <xsl:with-param name="depth">1</xsl:with-param>
@@ -139,7 +139,7 @@
     <xsl:choose>
       <xsl:when test="$level=1">
          <xsl:choose>
-           <xsl:when test="$config/headings/@type='underlined'">
+           <xsl:when test="//skinconfig/headings/@type='underlined'">
            
 	        <table class="h3" cellpadding="0" cellspacing="0" border="0" width="100%">
 	          <tbody>
@@ -158,7 +158,7 @@
 	        </table>
 
            </xsl:when>
-           <xsl:when test="$config/headings/@type='boxed'">
+           <xsl:when test="//skinconfig/headings/@type='boxed'">
            
 	        <table class="h3 heading" cellpadding="0" cellspacing="0" border="0" width="100%">
 	          <tbody>
@@ -192,7 +192,7 @@
       </xsl:when>
       <xsl:when test="$level=2">
          <xsl:choose>
-           <xsl:when test="$config/headings/@type='underlined'">
+           <xsl:when test="//skinconfig/headings/@type='underlined'">
            
 		        <table class="h4" cellpadding="0" cellspacing="0" border="0" width="100%">
 		          <tbody>
@@ -211,7 +211,7 @@
 		        </table>
 
            </xsl:when>
-           <xsl:when test="$config/headings/@type='boxed'">
+           <xsl:when test="//skinconfig/headings/@type='boxed'">
            
 		        <table class="h4 subheading" cellpadding="0" cellspacing="0" border="0" width="100%">
 		          <tbody>

Modified: xml/forrest/branches/copyless/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl
==============================================================================
--- xml/forrest/branches/copyless/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl	(original)
+++ xml/forrest/branches/copyless/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl	Wed Apr 21 16:19:53 2004
@@ -44,10 +44,10 @@
         <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="$config/favicon-url">
+        <xsl:if test="//skinconfig/favicon-url">
           <link rel="shortcut icon">
             <xsl:attribute name="href">
-              <xsl:value-of select="concat($root,$config/favicon-url)"/>
+              <xsl:value-of select="concat($root,//skinconfig/favicon-url)"/>
             </xsl:attribute>
           </link>
         </xsl:if>
@@ -98,9 +98,9 @@
         <td >
             <div class="headerlogo">
             <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="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>
@@ -109,19 +109,19 @@
         <td align="center" >
          <div class="headerlogo">
           <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="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>
         <!-- ( =================  Search ================== ) -->
         <td class="search" align="right" rowspan="2" valign="top">
-          <xsl:if test="not($config/disable-search) or
-            $config/disable-search='false' and not($config/disable-search='alt')
-            and $config/searchsite-domain and
-            $config/searchsite-name">
+          <xsl:if test="not(//skinconfig/disable-search) or
+            //skinconfig/disable-search='false' and not(//skinconfig/disable-search='alt')
+            and //skinconfig/searchsite-domain and
+            //skinconfig/searchsite-name">
             <form method="get" action="http://www.google.com/search" target="_blank">
               <table class="dialog" cellspacing="0" cellpadding="0" border="0">
                 <tr>
@@ -133,12 +133,12 @@
                 <tr>
                   <td></td>
                   <td nowrap="nowrap">
-                    <input type="hidden" name="sitesearch" value="{$config/searchsite-domain}"/>
+                    <input type="hidden" name="sitesearch" value="{//skinconfig/searchsite-domain}"/>
                     <input type="text" id="query" name="q" size="15"/>
                     &#160;
                     <input type="submit" value="Search" name="Search"/>
                     <br />
-                      the <xsl:value-of select="$config/searchsite-name"/> site
+                      the <xsl:value-of select="//skinconfig/searchsite-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
@@ -162,7 +162,7 @@
         </td>
 
         <td align="right" width="10" height="10">
-          <span class="textheader"><xsl:value-of select="$config/project-name"/></span>
+          <span class="textheader"><xsl:value-of select="//skinconfig/project-name"/></span>
         </td>
       </tr>
       <!-- ( ================= Tabs ================== ) -->
@@ -257,9 +257,9 @@
         <td height="10" colspan="2"></td>
       </tr>
       
-      <xsl:if test="not($config/disable-search) or
-            $config/disable-search='alt' and $config/searchsite-domain and
-            $config/searchsite-name">
+      <xsl:if test="not(//skinconfig/disable-search) or
+            //skinconfig/disable-search='alt' and //skinconfig/searchsite-domain and
+            //skinconfig/searchsite-name">
       <tr>
         <td ></td>
         <td class="search">
@@ -280,8 +280,8 @@
                 <tr>
                   <td></td>
                   <td>
-                    <input type="hidden" name="sitesearch" value="{$config/searchsite-domain}"/>
-                    the <xsl:value-of select="$config/searchsite-name"/> site
+                    <input type="hidden" name="sitesearch" value="{//skinconfig/searchsite-domain}"/>
+                    the <xsl:value-of select="//skinconfig/searchsite-name"/> site
                     <br />
                     <input type="text" id="query" name="q" size="13"/><input type="submit" value="Go" name="Search"/>
                   </td>
@@ -303,7 +303,7 @@
           </tr>
           </xsl:if>
  	  
-          <xsl:if test="$filename = 'index.html' and $config/credits">
+          <xsl:if test="$filename = 'index.html' and //skinconfig/credits">
  	     <tr>
                <td></td>
  	       <td class="search">
@@ -318,7 +318,7 @@
                 <tr>
                   <td colspan="3" height="8"></td>
                 </tr>
-		        <xsl:for-each select="$config/credits/credit[not(@role='pdf')]">
+		        <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"/>
@@ -474,20 +474,20 @@
     </table>
     <table class="footer">
       <tr>
-        <xsl:if test="$config/host-logo and not($config/host-logo = '')">
+        <xsl:if test="//skinconfig/host-logo and not(//skinconfig/host-logo = '')">
           <div class="host">
             <xsl:call-template name="renderlogo">
-              <xsl:with-param name="name" select="$config/host-name"/>
-              <xsl:with-param name="url" select="$config/host-url"/>
-              <xsl:with-param name="logo" select="$config/host-logo"/>
+              <xsl:with-param name="name" select="//skinconfig/host-name"/>
+              <xsl:with-param name="url" select="//skinconfig/host-url"/>
+              <xsl:with-param name="logo" select="//skinconfig/host-logo"/>
               <xsl:with-param name="root" select="$root"/>
             </xsl:call-template>
           </div>
         </xsl:if>
         <td width="90%" align="center" colspan="2">
           <span class="footnote">Copyright &#169;
-            <xsl:value-of select="$config/year"/>&#160;<xsl:value-of
-              select="$config/vendor"/> All rights reserved.
+            <xsl:value-of select="//skinconfig/year"/>&#160;<xsl:value-of
+              select="//skinconfig/vendor"/> All rights reserved.
             <br/><script language="JavaScript" type="text/javascript"><![CDATA[<!--
               document.write(" - "+"Last Published: " + document.lastModified);
               //  -->]]></script></span>
@@ -506,8 +506,8 @@
   <xsl:template name="bottom-credit-icons">
       <!-- old place where to put credits icons-->
       <!--
-      <xsl:if test="$filename = 'index.html' and $config/credits">
-        <xsl:for-each select="$config/credits/credit[not(@role='pdf')]">
+      <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"/>
           <xsl:variable name="url" select="url"/>
           <xsl:variable name="image" select="image"/>

Mime
View raw message