forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From che...@apache.org
Subject svn commit: rev 10609 - in xml/forrest/trunk: . src/core/context src/core/context/skins/common/xslt/html
Date Thu, 13 May 2004 00:44:17 GMT
Author: cheche
Date: Wed May 12 17:44:16 2004
New Revision: 10609

Modified:
   xml/forrest/trunk/src/core/context/resources.xmap
   xml/forrest/trunk/src/core/context/sitemap.xmap
   xml/forrest/trunk/src/core/context/skins/common/xslt/html/document2html.xsl
   xml/forrest/trunk/src/core/context/skins/common/xslt/html/site2xhtml.xsl
   xml/forrest/trunk/status.xml
Log:
 revert the changes to access skinconf using "skinconf//" done on r10259


Modified: xml/forrest/trunk/src/core/context/resources.xmap
==============================================================================
--- xml/forrest/trunk/src/core/context/resources.xmap	(original)
+++ xml/forrest/trunk/src/core/context/resources.xmap	Wed May 12 17:44:16 2004
@@ -157,7 +157,7 @@
       </map:resource>
 
       <map:resource name="pipe-svg2png-corner-resource">
-        <map:generate src="cocoon:/skinconf.xml" />
+        <map:generate src="cocoon:/skin/skinconf.xml" />
         <map:transform src="{path}">
             <map:parameter name="orientation-tb" 
                          value="{orientation-tb}"/>
@@ -177,7 +177,7 @@
       </map:resource>
       
       <map:resource name="generate-resource">
-        <map:generate src="cocoon:/skinconf.xml" />
+        <map:generate src="cocoon:/skin/skinconf.xml" />
         <map:transform src="{path}"/>
       </map:resource>
       
@@ -192,7 +192,7 @@
    <map:pipelines>
        
       <map:pipeline internal-only="false">
-         <map:match pattern="skinconf.xml">
+         <map:match pattern="**skin/skinconf.xml">
            <map:generate src="{project:skinconf}" />
            <map:select type="exists">
              <map:when test="{project:skins-dir}{forrest:skin}/skinconf.xsl">
@@ -379,4 +379,4 @@
          </map:match>
       </map:pipeline>
    </map:pipelines>
-</map:sitemap>
+</map:sitemap>
\ No newline at end of file

Modified: xml/forrest/trunk/src/core/context/sitemap.xmap
==============================================================================
--- xml/forrest/trunk/src/core/context/sitemap.xmap	(original)
+++ xml/forrest/trunk/src/core/context/sitemap.xmap	Wed May 12 17:44:16 2004
@@ -116,6 +116,7 @@
       <map:serializer name="html" mime-type="text/html" src="org.apache.cocoon.serialization.HTMLSerializer">
         <doctype-public>-//W3C//DTD HTML 4.01 Transitional//EN</doctype-public>
         <doctype-system>http://www.w3.org/TR/html4/loose.dtd</doctype-system>
+        <encoding>UTF-8</encoding>
       </map:serializer>
 
       <map:serializer name="xml" mime-type="text/xml" src="org.apache.cocoon.serialization.XMLSerializer"/>
@@ -375,7 +376,6 @@
 
       <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,7 +388,6 @@
 
       <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/trunk/src/core/context/skins/common/xslt/html/document2html.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/skins/common/xslt/html/document2html.xsl	(original)
+++ xml/forrest/trunk/src/core/context/skins/common/xslt/html/document2html.xsl	Wed May 12
17:44:16 2004
@@ -34,7 +34,8 @@
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <!-- the skinconf file -->
-  <xsl:variable name="config" select="//skinconfig"/>
+  <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"/>

Modified: xml/forrest/trunk/src/core/context/skins/common/xslt/html/site2xhtml.xsl
==============================================================================
--- xml/forrest/trunk/src/core/context/skins/common/xslt/html/site2xhtml.xsl	(original)
+++ xml/forrest/trunk/src/core/context/skins/common/xslt/html/site2xhtml.xsl	Wed May 12 17:44:16
2004
@@ -37,7 +37,8 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <!-- Default skinconf.xml in the skins/ directory -->
-  <xsl:variable name="config" select="//skinconfig"/>
+  <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"/>

Modified: xml/forrest/trunk/status.xml
==============================================================================
--- xml/forrest/trunk/status.xml	(original)
+++ xml/forrest/trunk/status.xml	Wed May 12 17:44:16 2004
@@ -44,6 +44,9 @@
 
   <changes>
     <release version="0.6-dev" date="unreleased">
+      <action dev="JJP" type="remove" context="documentation" >
+       revert the changes to access skinconf using "skinconf//" done on r10259
+      </action>
       <action dev="JJP" type="add" context="documentation" >
        Information about the user list 
       </action>

Mime
View raw message