You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by fe...@apache.org on 2007/05/15 13:42:35 UTC

svn commit: r538140 - in /cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF: ./ common/style/xsl/html/

Author: felixk
Date: Tue May 15 04:42:32 2007
New Revision: 538140

URL: http://svn.apache.org/viewvc?view=rev&rev=538140
Log:
some cleanups

Modified:
    cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/adding-header.xsl
    cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/complex-page2html.xsl
    cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/simple-header.xsl
    cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/sitemap.xmap

Modified: cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/adding-header.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/adding-header.xsl?view=diff&rev=538140&r1=538139&r2=538140
==============================================================================
--- cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/adding-header.xsl (original)
+++ cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/adding-header.xsl Tue May 15 04:42:32 2007
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:param name="contextPath"/>
   <xsl:param name="servletPath" select="string('/samples')"/>
   <xsl:param name="sitemapURI"/>
   <xsl:variable name="directory" select="substring-before($servletPath,$sitemapURI)"/>

Modified: cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/complex-page2html.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/complex-page2html.xsl?view=diff&rev=538140&r1=538139&r2=538140
==============================================================================
--- cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/complex-page2html.xsl (original)
+++ cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/complex-page2html.xsl Tue May 15 04:42:32 2007
@@ -24,14 +24,12 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink">
 
-  <xsl:param name="contextPath" select="string('/cocoon')"/>
-
   <xsl:template match="/">
     <html>
       <head>
         <title>Apache Cocoon @version@</title>
         <link rel="SHORTCUT ICON" href="favicon.ico"/>
-        <link href="{$contextPath}/styles/main.css" type="text/css" rel="stylesheet"/>
+        <link href="servlet:/styles/main.css" type="text/css" rel="stylesheet"/>
         <xsl:apply-templates select="document/header/style"/>
         <xsl:apply-templates select="document/header/script"/>
       </head>
@@ -39,7 +37,7 @@
         <table border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
           <tr>
             <td width="*">The Apache Software Foundation is proud to present...</td>
-            <td width="40%" align="center"><img border="0" src="{$contextPath}/images/cocoon.gif"/></td>
+            <td width="40%" align="center"><img border="0" src="servlet:/images/cocoon.gif"/></td>
             <td width="30%" align="center">Version: <b>@version@</b></td>
           </tr>
         </table>

Modified: cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/simple-header.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/simple-header.xsl?view=diff&rev=538140&r1=538139&r2=538140
==============================================================================
--- cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/simple-header.xsl (original)
+++ cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/simple-header.xsl Tue May 15 04:42:32 2007
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:param name="contextPath"/>
   <xsl:param name="servletPath" select="string('/samples')"/>
   <xsl:param name="sitemapURI"/>
   <xsl:variable name="directory" select="substring-before($servletPath,$sitemapURI)"/>

Modified: cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=538140&r1=538139&r2=538140
==============================================================================
--- cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/sitemap.xmap Tue May 15 04:42:32 2007
@@ -19,9 +19,6 @@
   
   <map:pipelines>
     <map:pipeline>
-      <map:match pattern="**.cssX">
-        <map:read type="servletLinkRewriter" src="resources/{1}.css"/>
-      </map:match>
       <map:match pattern="**.css">
         <map:read src="resources/{1}.css"/>
       </map:match>