You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/11/23 06:18:57 UTC
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
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 © @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>
-  
- 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>
Re: 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
Posted by Vadim Gritsenko <va...@reverycodes.com>.
On Jan 16, 2008, at 12:47 PM, Grzegorz Kossakowski wrote:
>> + <xsl:template match="/">
>> + <html>
>> + <xsl:apply-templates/>
>> + </html>
>> + </xsl:template>
>> +
>
> [..]
>
> Vadim, do you remember if there was any good reason for introduction
> of this template? It breaks
> AJAX-based samples and should be considered as bad practise in
> general.
No I don't think it had a good reason. Probably a remnant of something
else I was trying to do.
Vadim
Re: 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
Posted by Grzegorz Kossakowski <gk...@apache.org>.
vgritsenko@apache.org pisze:
> 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/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>
> +
[..]
Vadim, do you remember if there was any good reason for introduction of this template? It breaks
AJAX-based samples and should be considered as bad practise in general.
--
Grzegorz Kossakowski
Committer and PMC Member of Apache Cocoon
http://reflectingonthevicissitudes.wordpress.com/