You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by so...@apache.org on 2006/06/12 01:24:58 UTC
svn commit: r413547 [15/15] - in /lenya/branches/revolution/1.3.x: ./
src/java/org/apache/lenya/cms/cocoon/components/modules/input/
src/java/org/apache/lenya/cms/cocoon/components/source/
src/java/org/apache/lenya/cms/cocoon/components/source/impl/ sr...
Added: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/navigation/sitetree2nav.xsl
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/navigation/sitetree2nav.xsl?rev=413547&view=auto
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/navigation/sitetree2nav.xsl (added)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/navigation/sitetree2nav.xsl Sun Jun 11 16:24:48 2006
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<xsl:stylesheet
+ version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:tree="http://apache.org/cocoon/lenya/sitetree/1.0"
+ xmlns:nav="http://apache.org/cocoon/lenya/navigation/1.0"
+ exclude-result-prefixes="tree"
+ >
+
+<xsl:param name="url"/>
+<xsl:param name="chosenlanguage"/>
+<xsl:param name="defaultlanguage"/>
+<xsl:param name="root"/>
+
+<xsl:variable name="path-to-context"><xsl:call-template name="create-path-to-context"/></xsl:variable>
+<xsl:variable name="relroot" select="$path-to-context"/>
+
+<xsl:template name="create-path-to-context">
+ <xsl:param name="local-url" select="$url"/>
+ <xsl:if test="contains($local-url, '/')">
+ <xsl:text/>../<xsl:call-template name="create-path-to-context">
+ <xsl:with-param name="local-url" select="substring-after($local-url, '/')"/>
+ </xsl:call-template>
+ </xsl:if>
+</xsl:template>
+
+
+<xsl:template match="tree:site">
+
+ <nav:site url="{$relroot}{$url}" testroot="{$root}" testrelroot="{$relroot}" testurl="{$url}">
+ <xsl:copy-of select="@*"/>
+ <xsl:apply-templates/>
+ </nav:site>
+
+</xsl:template>
+
+
+<!--
+Resolves the existing language of a node, preferably
+the default language.
+-->
+<xsl:template name="resolve-existing-language">
+ <xsl:choose>
+ <xsl:when test="tree:label[lang($chosenlanguage)]"><xsl:value-of select="$chosenlanguage"/></xsl:when>
+ <xsl:when test="tree:label[lang($defaultlanguage)]"><xsl:value-of select="$defaultlanguage"/></xsl:when>
+ <xsl:otherwise><xsl:value-of select="tree:label/@xml:lang"/></xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+
+
+<!--
+Apply nodes recursively
+-->
+<xsl:template match="tree:node[not(@visible = 'false')]">
+
+ <!-- basic url of parent node -->
+ <xsl:param name="previous-url" select="''"/>
+
+ <xsl:variable name="existinglanguage">
+ <xsl:call-template name="resolve-existing-language"/>
+ </xsl:variable>
+
+ <nav:node>
+
+ <xsl:copy-of select="@id"/>
+ <xsl:copy-of select="@visibleinnav"/>
+ <xsl:copy-of select="@protected"/>
+
+ <!-- basic url - for all nodes -->
+
+ <xsl:variable name="basic-url">
+ <xsl:text/>
+ <xsl:choose>
+ <xsl:when test="@href">
+ <xsl:value-of select="@href"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$previous-url"/><xsl:value-of select="@id"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <xsl:variable name="language-suffix">
+ <xsl:text>_</xsl:text><xsl:value-of select="$existinglanguage"/>
+ </xsl:variable>
+
+ <!-- Always language -->
+ <xsl:variable name="canonical-language-suffix">
+ <xsl:if test="$existinglanguage != ''"><xsl:value-of select="$language-suffix"/></xsl:if>
+ </xsl:variable>
+
+ <!-- suffix - only when @href is not present -->
+
+ <xsl:variable name="suffix">
+ <xsl:if test="not(@href)">
+ <xsl:text>.</xsl:text>
+ <xsl:choose>
+ <xsl:when test="@suffix">
+ <xsl:value-of select="@suffix"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>html</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:if>
+ </xsl:variable>
+
+ <xsl:attribute name="suffix"><xsl:value-of select="$suffix"/></xsl:attribute>
+ <xsl:attribute name="basic-url"><xsl:value-of select="$previous-url"/><xsl:value-of select="@id"/></xsl:attribute>
+ <xsl:attribute name="language-suffix"><xsl:value-of select="$canonical-language-suffix"/></xsl:attribute>
+
+ <xsl:variable name="canonical-url">
+ <xsl:text/>
+ <xsl:value-of select="$basic-url"/><xsl:text/>
+ <xsl:value-of select="$canonical-language-suffix"/><xsl:text/>
+ <xsl:value-of select="$suffix"/><xsl:text/>
+ </xsl:variable>
+
+ <xsl:variable name="non-canonical-url">
+ <xsl:text/>
+ <xsl:value-of select="$basic-url"/><xsl:text/>
+ <xsl:value-of select="$language-suffix"/><xsl:text/>
+ <xsl:value-of select="$suffix"/><xsl:text/>
+ </xsl:variable>
+
+ <xsl:if test="$url = $canonical-url or $url = $non-canonical-url">
+ <xsl:attribute name="current">true</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="testurl"><xsl:value-of select="$url"/></xsl:attribute>
+ <xsl:attribute name="testcanurl"><xsl:value-of select="$canonical-url"/></xsl:attribute>
+ <xsl:attribute name="testnoncanurl"><xsl:value-of select="$non-canonical-url"/></xsl:attribute>
+
+ <xsl:attribute name="href">
+ <xsl:choose>
+ <xsl:when test="@href">
+ <xsl:value-of select="@href"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="concat($relroot, $canonical-url)"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+
+ <xsl:attribute name="fullhref">
+ <xsl:choose>
+ <xsl:when test="@href">
+ <xsl:value-of select="@href"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="concat($root, $canonical-url)"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+
+
+ <xsl:choose>
+ <xsl:when test="tree:label[lang($existinglanguage)]">
+ <xsl:apply-templates select="tree:label[lang($existinglanguage)]">
+ <xsl:with-param name="previous-url" select="concat($basic-url, '/')"/>
+ </xsl:apply-templates>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates select="tree:label[1]">
+ <xsl:with-param name="previous-url" select="concat($basic-url, '/')"/>
+ </xsl:apply-templates>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ <xsl:apply-templates select="tree:node">
+ <xsl:with-param name="previous-url" select="concat($basic-url, '/')"/>
+ </xsl:apply-templates>
+
+ </nav:node>
+</xsl:template>
+
+
+<xsl:template match="tree:label">
+ <nav:label>
+ <xsl:copy-of select="@*"/>
+ <xsl:apply-templates/>
+ </nav:label>
+</xsl:template>
+
+
+<xsl:template match="@*|node()" priority="-1">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+</xsl:template>
+
+
+</xsl:stylesheet>
Propchange: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/navigation/sitetree2nav.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Added: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/navigation/tabs.xsl
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/navigation/tabs.xsl?rev=413547&view=auto
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/navigation/tabs.xsl (added)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/navigation/tabs.xsl Sun Jun 11 16:24:48 2006
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Id: tabs.xsl 153668 2005-02-13 21:05:01Z roku $ -->
+
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:nav="http://apache.org/cocoon/lenya/navigation/1.0"
+ xmlns="http://www.w3.org/1999/xhtml"
+ exclude-result-prefixes="nav"
+ >
+
+
+<xsl:template match="nav:site">
+
+ <div id="tabs">
+
+ <xsl:call-template name="pre-separator"/>
+ <xsl:for-each select="nav:node">
+ <xsl:if test="position() > 1">
+ <xsl:call-template name="separator"/>
+ </xsl:if>
+
+ <xsl:choose>
+ <xsl:when test="descendant-or-self::nav:node[@current = 'true']">
+ <xsl:call-template name="tab-selected"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="tab"/>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ </xsl:for-each>
+ <xsl:call-template name="post-separator"/>
+ </div>
+</xsl:template>
+
+
+<xsl:template name="tab">
+ <span class="tab"><xsl:call-template name="label"/></span>
+</xsl:template>
+
+
+<xsl:template name="tab-selected">
+ <span class="tab-selected"><xsl:call-template name="label"/></span>
+</xsl:template>
+
+
+<xsl:template name="label">
+ <xsl:choose>
+ <xsl:when test="@current='true'"><xsl:apply-templates select="nav:label"/></xsl:when>
+ <xsl:otherwise><a href="{@href}"><xsl:apply-templates select="nav:label"/></a></xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="nav:label">
+ <xsl:value-of select="."/>
+</xsl:template>
+
+
+<xsl:template name="pre-separator">
+</xsl:template>
+
+
+<xsl:template name="separator">
+ <xsl:text> </xsl:text>
+</xsl:template>
+
+
+<xsl:template name="post-separator">
+</xsl:template>
+
+
+<xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+</xsl:template>
+
+
+</xsl:stylesheet>
Propchange: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/navigation/tabs.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Added: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/navigation/tabsall.xsl
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/navigation/tabsall.xsl?rev=413547&view=auto
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/navigation/tabsall.xsl (added)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/navigation/tabsall.xsl Sun Jun 11 16:24:48 2006
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:nav="http://apache.org/cocoon/lenya/navigation/1.0"
+ xmlns="http://www.w3.org/1999/xhtml"
+ exclude-result-prefixes="nav"
+ >
+
+<xsl:template match="/nav:site">
+ <div id="tabsall">
+ <div id="tabslevel">
+ <xsl:apply-templates select="nav:node" mode="tabslevel"/>
+ </div>
+ <xsl:apply-templates select="nav:node"/>
+ </div>
+</xsl:template>
+
+<xsl:template match="nav:node[descendant-or-self::nav:node[@current = 'true']]">
+ <div id="tabslevel">
+ <xsl:apply-templates select="nav:node" mode="tabslevel"/>
+ </div>
+ <xsl:apply-templates select="nav:node"/>
+</xsl:template>
+
+<xsl:template match="nav:node" mode="tabslevel">
+ <xsl:choose>
+ <xsl:when test="@current = 'true'">
+ <xsl:call-template name="tab-selected"/>
+ </xsl:when>
+ <xsl:when test="descendant-or-self::nav:node[@current = 'true']">
+ <xsl:call-template name="tablevel-selected"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="tab"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:text> </xsl:text>
+</xsl:template>
+
+<xsl:template match="nav:node" priority="-1"/>
+
+
+<xsl:template name="tab">
+ <span class="tabsall-tab"><xsl:call-template name="label"/></span>
+</xsl:template>
+
+<xsl:template name="tab-selected">
+ <span class="tabsall-selected"><xsl:call-template name="label"/></span>
+</xsl:template>
+<xsl:template name="tablevel-selected">
+ <span class="tabsall-levelselected"><xsl:call-template name="label"/></span>
+</xsl:template>
+
+<xsl:template name="label">
+ <xsl:choose>
+ <xsl:when test="@current='true'"><xsl:apply-templates select="nav:label"/></xsl:when>
+ <xsl:otherwise><a href="{@href}"><xsl:apply-templates select="nav:label"/></a></xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template match="nav:label">
+ <xsl:value-of select="."/>
+</xsl:template>
+
+<xsl:template match="@*|node()" priority="-2"/>
+
+</xsl:stylesheet>
Propchange: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/navigation/tabsall.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Added: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xhtml/module.xmap
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xhtml/module.xmap?rev=413547&view=auto
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xhtml/module.xmap (added)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xhtml/module.xmap Sun Jun 11 16:24:48 2006
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- XHTML Module -->
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+ <map:pipelines>
+ <map:pipeline>
+ <map:match pattern="**">
+ <map:match pattern="**.html">
+ <map:generate src="cocoon:/{1}.xml"/>
+ <map:serialize type="xml"/>
+ </map:match>
+ <!-- xhtml/{view|edit}/{area}/{docpath}_{language}.xml -->
+ <map:match pattern="*/*/*/**_*.xml">
+ <!-- Step: View Revision from Lenya 1.2 -->
+ <map:match type="step" pattern="view-revision">
+ <map:generate type="serverpages" src="module:///../../../../content/rc/view.xsp"/>
+ <map:transform src="module:///../../../../xslt/rc/toDoc.xsl"/>
+ <map:transform src="module:///xhtml.xsl">
+ <map:parameter name="rendertype" value="{2}"/>
+ <map:parameter name="nodeid" value="{page-envelope:document-node-id}"/>
+ <map:parameter name="language" value="{page-envelope:document-language}"/>
+ </map:transform>
+ <map:serialize type="xml"/>
+ </map:match>
+<!-- Revision: ?revision=live|edit|xxx -->
+ <map:select type="parameter">
+ <map:parameter name="parameter-selector-test" value="{request-param:revision}"/>
+ <map:when test="">
+ <map:generate src="content://{page-envelope:area}/{4}_{5}"/>
+ </map:when>
+ <map:otherwise>
+ <map:generate src="content://{page-envelope:area}/{4}_{5}!{request-param:revision}"/>
+ </map:otherwise>
+ </map:select>
+ <map:transform src="module:///xhtml.xsl">
+ <map:parameter name="rendertype" value="{2}"/>
+ <map:parameter name="nodeid" value="{page-envelope:document-node-id}"/>
+ <map:parameter name="language" value="{page-envelope:document-language}"/>
+ </map:transform>
+ <map:serialize type="xml"/>
+ </map:match>
+ </map:match>
+ </map:pipeline>
+ </map:pipelines>
+</map:sitemap>
Propchange: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xhtml/module.xmap
------------------------------------------------------------------------------
svn:eol-style = native
Added: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xhtml/xhtml.xsl
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xhtml/xhtml.xsl?rev=413547&view=auto
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xhtml/xhtml.xsl (added)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xhtml/xhtml.xsl Sun Jun 11 16:24:48 2006
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xhtml="http://www.w3.org/1999/xhtml"
+ xmlns:lenya="http://apache.org/cocoon/lenya/page-envelope/1.0"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ exclude-result-prefixes="xhtml lenya"
+ >
+
+<xsl:param name="rendertype" select="''"/>
+<xsl:param name="nodeid"/>
+
+<xsl:template match="/xhtml:html">
+<xhtml:html>
+ <xsl:copy-of select="lenya:meta"/>
+ <div id="body">
+ <xsl:if test="$rendertype = 'edit'">
+ <xsl:attribute name="bxe_xpath">/xhtml:html/xhtml:body</xsl:attribute>
+ </xsl:if>
+ <xsl:apply-templates select="xhtml:body/node()"/>
+ </div>
+</xhtml:html>
+</xsl:template>
+
+<xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+</xsl:template>
+
+ <xsl:template name="substring-after-last">
+ <xsl:param name="input"/>
+ <xsl:param name="substr"/>
+ <xsl:variable name="temp" select="substring-after($input, $substr)"/>
+ <xsl:choose>
+ <xsl:when test="$substr and contains($temp, $substr)">
+ <xsl:call-template name="substring-after-last">
+ <xsl:with-param name="input" select="$temp"/>
+ <xsl:with-param name="susbtr" select="$substr"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$temp"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+ <xsl:template match="lenya:asset">
+ <xsl:variable name="extent">
+ <xsl:value-of select="@size"/>
+ </xsl:variable>
+ <xsl:variable name="suffix">
+ <xsl:call-template name="substring-after-last">
+ <xsl:with-param name="input" select="@src"/>
+ <xsl:with-param name="substr">.</xsl:with-param>
+ </xsl:call-template>
+ </xsl:variable>
+ <div class="asset">
+ <xsl:text> </xsl:text>
+ <a href="{$nodeid}/{@src}">
+ <xsl:value-of select="text()"/>
+ </a>
+ (<xsl:value-of select="number($extent)"/>KB)
+ </div>
+ </xsl:template>
+
+ <!-- this template converts the object tag to img (for compatiblity with older browsers
+ for more, see http://www.xml.com/pub/a/2003/07/02/dive.html -->
+
+ <!-- TODO: Extract all object templates into a separate xslt,
+ since we have dublicated code in content2edit.xsl in kupu /roku -->
+ <xsl:template name="object2img">
+ <img border="0">
+ <xsl:attribute name="src">
+ <xsl:choose>
+ <xsl:when test="not(starts-with(@data, '/'))">
+ <xsl:value-of select="$nodeid"/>/<xsl:value-of select="@data"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="@data"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+
+ <xsl:attribute name="alt">
+ <!-- the overwritten title (stored in @name) has precedence over dc:title -->
+ <xsl:choose>
+ <xsl:when test="@name != ''">
+ <xsl:value-of select="@name"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="dc:metadata/dc:title"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <xsl:if test="string(@height)">
+ <xsl:attribute name="height">
+ <xsl:value-of select="@height"/>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="string(@width)">
+ <xsl:attribute name="width">
+ <xsl:value-of select="@width"/>
+ </xsl:attribute>
+ </xsl:if>
+ </img>
+ </xsl:template>
+
+ <xsl:template match="xhtml:object" priority="3">
+ <xsl:choose>
+ <xsl:when test="@href != ''">
+ <a href="{@href}">
+ <xsl:call-template name="object2img"/>
+ </a>
+ </xsl:when>
+ <xsl:when test="@type = 'application/x-shockwave-flash'">
+ <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">
+ <param name="movie" value="{$nodeid}/{@data}"/>
+ </object>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="object2img"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+ <xsl:template match="dc:metadata"/>
+
+</xsl:stylesheet>
Propchange: lenya/branches/revolution/1.3.x/src/webapp/lenya/modules/xhtml/xhtml.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/navigation.xmap
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/navigation.xmap?rev=413547&r1=413546&r2=413547&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/navigation.xmap (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/navigation.xmap Sun Jun 11 16:24:48 2006
@@ -76,7 +76,7 @@
<map:generate src="content/admin/sitetree.xml"/>
</map:when>
<map:otherwise>
- <map:generate type="sitetree">
+ <map:generate type="sitetree2">
<map:parameter name="area" value="{2}"/>
</map:generate>
</map:otherwise>
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/pubs/default/config/publication.xconf
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/pubs/default/config/publication.xconf?rev=413547&r1=413546&r2=413547&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/pubs/default/config/publication.xconf (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/pubs/default/config/publication.xconf Sun Jun 11 16:24:48 2006
@@ -26,6 +26,7 @@
<document-builder>org.apache.lenya.cms.publication.DefaultDocumentBuilder</document-builder>
<breadcrumb-prefix/>
+<!-- Set the content directory for Lenya 1.2 -->
<!-- NOTE: The configuration of content directories has NOT been fully tested yet and might lead to unexpected results. Use at own risk;-) -->
<!--
<content-dir area="authoring">content/authoring</content-dir>
@@ -35,6 +36,13 @@
<content-dir area="authoring">/home/USERNAME/data/default/authoring</content-dir>
<content-dir area="live">D:\tmp\default\live</content-dir>
-->
+
+<!-- Set the content directory for Lenya 1.3 -->
+<!-- SYNTAX: <content type="hierarchical|flat|jcr">content directory</content> -->
+<!-- The following line is the default if no content element is present. -->
+<content type="hierarchical">content</content>
+<!-- Use the following line after using the "flat" migration Module. -->
+<!-- <content type="flat">content</content> -->
<!--
For information about these settings, read
@@ -47,5 +55,17 @@
-->
<link-attribute xpath="//*[namespace-uri() = 'http://www.w3.org/1999/xhtml']/@href"/>
-
+
+<!-- Example Module parameters for Lenya 1.3
+<modules include="all">
+<inherit publication="template"/>
+<module name="live" external="true"/>
+<module name="xhtml" external="false"/>
+<module name="navigation" external="false"/>
+<module name="cache" external="false">
+ <variable name="cache-dir">module:///cache</variable>
+</module>
+</modules>
+-->
+
</publication>
Modified: lenya/branches/revolution/1.3.x/src/webapp/lenya/pubs/default/xslt/page2xhtml.xsl
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/lenya/pubs/default/xslt/page2xhtml.xsl?rev=413547&r1=413546&r2=413547&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/lenya/pubs/default/xslt/page2xhtml.xsl (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/lenya/pubs/default/xslt/page2xhtml.xsl Sun Jun 11 16:24:48 2006
@@ -79,7 +79,7 @@
<div id="main">
<xsl:apply-templates select="xhtml:div[@id = 'breadcrumb']"/>
<xsl:apply-templates select="xhtml:div[@id = 'search']"/>
- <xsl:apply-templates select="xhtml:div[@id = 'body']"/>
+ <xsl:apply-templates select="xhtml:html/xhtml:div[@id = 'body']"/>
</div>
</td>
</tr>
Modified: lenya/branches/revolution/1.3.x/src/webapp/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/webapp/sitemap.xmap?rev=413547&r1=413546&r2=413547&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/webapp/sitemap.xmap (original)
+++ lenya/branches/revolution/1.3.x/src/webapp/sitemap.xmap Sun Jun 11 16:24:48 2006
@@ -46,8 +46,12 @@
<!--
<map:generator label="content,data" logger="sitemap.generator.profiler" name="profiler" src="org.apache.cocoon.generation.ProfilerGenerator"/>
-->
- <map:generator name="sitetree" logger="sitemap.generator.sitetree" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.lenya.cms.cocoon.generation.SiteTreeGenerator"/>
- </map:generators>
+<!-- LENYA1.3 BEGIN -->
+ <map:generator name="sitetree" label="content,data" logger="sitemap.generator.sitetree" src="org.apache.lenya.cms.content.flat.SitetreeGenerator"/>
+<!-- From Lenya-1.2.x -->
+ <map:generator name="sitetree2" logger="sitemap.generator.sitetree" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.lenya.cms.cocoon.generation.SiteTreeGenerator"/>
+<!-- LENYA1.3 END -->
+</map:generators>
<!-- ========================================================================== -->
<!-- Transformers -->
@@ -127,6 +131,11 @@
<xslt-processor-role>xsltc</xslt-processor-role>
<check-includes>true</check-includes>
</map:transformer>
+
+<!-- Lenya 1.3 BEGIN -->
+ <map:transformer name="create-revision" logger="sitemap.transformer.create-revision" src="org.apache.lenya.cms.content.flat.CreateRevisionTransformer"/>
+<!-- Lenya 1.3 END -->
+
</map:transformers>
<!-- ========================================================================== -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org