Return-Path: 
 <cvs-return-32259-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 32689 invoked from network); 23 Nov 2007 05:19:18 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 23 Nov 2007 05:19:18 -0000
Received: (qmail 82590 invoked by uid 500); 23 Nov 2007 05:19:06 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 82534 invoked by uid 500); 23 Nov 2007 05:19:06 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 82523 invoked by uid 99); 23 Nov 2007 05:19:06 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Nov 2007 21:19:06 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Nov 2007 05:19:04 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id EC68F1A9832; Thu, 22 Nov 2007 21:18:57 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r597551 - in
 /cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html:
 complex-page2html.xsl simple-page2html.xsl
Date: Fri, 23 Nov 2007 05:18:57 -0000
To: cvs@cocoon.apache.org
From: vgritsenko@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071123051857.EC68F1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: vgritsenko
Date: Thu Nov 22 21:18:56 2007
New Revision: 597551

URL: http://svn.apache.org/viewvc?rev=597551&view=rev
Log:
update simple page style

Modified:
    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-page2html.xsl

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?rev=597551&r1=597550&r2=597551&view=diff
==============================================================================
--- 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 Thu Nov 22 21:18:56 2007
@@ -157,8 +157,10 @@
     </p>
   </xsl:template>
 
-  <xsl:template match="*|@*|node()|text()" priority="-1">
-    <xsl:copy><xsl:apply-templates select="*|@*|node()|text()"/></xsl:copy>
+  <xsl:template match="@*|node()" priority="-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
   </xsl:template>
 
 </xsl:stylesheet>

Modified: cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/simple-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/simple-page2html.xsl?rev=597551&r1=597550&r2=597551&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/simple-page2html.xsl (original)
+++ cocoon/trunk/blocks/cocoon-samples-style/cocoon-samples-style-default/src/main/resources/COB-INF/common/style/xsl/html/simple-page2html.xsl Thu Nov 22 21:18:56 2007
@@ -22,30 +22,59 @@
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
+  <xsl:param name="contextPath">servlet:/</xsl:param>
+
+  <xsl:template match="/">
+    <html>
+      <xsl:apply-templates/>
+    </html>
+  </xsl:template>
+
   <xsl:template match="page">
-   <html>
-     <head>
-       <title><xsl:value-of select="title"/></title>
-       <link href="servlet:/styles/main.css" rel="stylesheet" type="text/css" title="Default Style"/>
-       <!-- copy local CSS, if any -->
-       <xsl:copy-of select="style"/>
-     </head>
-     <body>
-       <xsl:call-template name="resources"/>
-       <xsl:apply-templates/>
-     </body>
-   </html>
+   <head>
+     <title>
+       <xsl:text>Apache Cocoon @version@</xsl:text>
+       <xsl:if test="title">
+         <xsl:text> | </xsl:text>
+         <xsl:value-of select="title"/>
+       </xsl:if>
+     </title>
+     <link rel="SHORTCUT ICON" href="{$contextPath}/icons/cocoon.ico"/>
+     <link href="{$contextPath}/styles/main.css" type="text/css" rel="stylesheet" title="Default Style"/>
+     <!-- copy local CSS, if any -->
+     <xsl:copy-of select="style"/>
+   </head>
+   <body>
+     <div id="top">
+       <div id="header">
+         <div class="projectlogo">
+           <a href="http://cocoon.apache.org/"><img class="logoImage" src="{$contextPath}/images/cocoon-logo.jpg" alt="Apache Cocoon" border="0"/></a>
+         </div>
+         <div class="grouplogo">
+           <p class="grouptitle">
+             <a href="http://cocoon.apache.org/">The Apache Cocoon Project</a>
+             <img src="{$contextPath}/images/apache-logo.jpg" alt="Cocoon Project Logo"/>
+           </p>
+         </div>
+       </div>
+       <div id="samplesBar">
+         <h1 class="samplesTitle"><xsl:value-of select="title"/></h1>
+         <xsl:call-template name="resources"/>
+       </div>
+       <div class="samplesBarClear"/>
+     </div>
+
+     <xsl:apply-templates/>
+
+     <p class="copyright">
+       Copyright &#169; @year@ <a href="http://www.apache.org/">The Apache Software Foundation</a>.
+       All rights reserved.
+     </p>
+   </body>
   </xsl:template>
 
   <xsl:template name="resources">
-    <div class="resources">
-      <a href="sitemap.xmap">Sitemap</a>
-      &#160;
-      Views:
-      <a href="?cocoon-view=content">Content</a>
-      <a href="?cocoon-view=pretty-content">Pretty Content</a>
-      <a href="?cocoon-view=links">Links</a>
-
+    <ul id="links">
       <xsl:for-each select="resources/resource">
         <xsl:variable name="href">
           <xsl:choose>
@@ -62,44 +91,67 @@
             </xsl:otherwise>
           </xsl:choose>
         </xsl:variable>
-        <a class="{@type}" href="{$href}">
-          <xsl:apply-templates/>
-        </a>
+        <li><a class="{@type}" href="{$href}"><xsl:apply-templates/></a></li>
       </xsl:for-each>
-    </div>
+      <li class="sep">See also:</li>
+      <li><a href="sitemap.xmap">Sitemap</a></li>
+      <li class="sep">Views:</li>
+      <li><a href="?cocoon-view=content">Content</a></li>
+      <li><a href="?cocoon-view=pretty-content">Pretty content</a></li>
+      <li><a href="?cocoon-view=links">Links</a></li>
+    </ul>
   </xsl:template>
 
+
   <xsl:template match="resources"/>
+  <xsl:template match="title"/>
 
-  
-  <xsl:template match="title">
-    <h2><xsl:apply-templates/></h2>
-  </xsl:template>
 
   <xsl:template match="content">
     <xsl:apply-templates/>
   </xsl:template>
 
+  <xsl:template match="content[row]">
+    <table width="100%">
+      <xsl:apply-templates/>
+    </table>
+  </xsl:template>
+
+  <xsl:template match="row">
+    <tr>
+      <xsl:apply-templates select="column"/>
+    </tr>
+  </xsl:template>
+
+  <xsl:template match="column">
+    <td valign="top">
+      <h4 class="samplesGroup"><xsl:value-of select="@title"/></h4>
+      <p class="samplesText"><xsl:apply-templates/></p>
+    </td>
+  </xsl:template>
+  
   <xsl:template match="para">
     <p><xsl:apply-templates/></p>
   </xsl:template>
 
+
   <xsl:template match="link">
     <a href="{@href}"><xsl:apply-templates/></a>
   </xsl:template>
 
+  <xsl:template match="anchor">
+    <a name="{@name}"><xsl:apply-templates/></a>
+  </xsl:template>
+
   <xsl:template match="error">
     <span class="error"><xsl:apply-templates/></span>
   </xsl:template>
 
 
-  <xsl:template match="@*|node()" priority="-2">
+  <xsl:template match="@*|node()" priority="-1">
     <xsl:copy>
       <xsl:apply-templates select="@*|node()"/>
     </xsl:copy>
   </xsl:template>
 
-  <xsl:template match="text()" priority="-1">
-    <xsl:value-of select="."/>
-  </xsl:template>
 </xsl:stylesheet>