Author: antonio
Date: Mon Nov 15 22:17:11 2004
New Revision: 75986
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/mail/samples/mail/sitemap.xmap
cocoon/branches/BRANCH_2_1_X/status.xml
Log:
Fix #32124: Webmail sample broken
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/mail/samples/mail/sitemap.xmap
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/mail/samples/mail/sitemap.xmap
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/mail/samples/mail/sitemap.xmap
Mon Nov 15 22:17:11 2004
@@ -214,7 +214,7 @@
<map:call resource="load-xsp-page">
<map:parameter name="sect" value="mid-col-2"/>
<map:parameter name="page" value="{1}"/>
- <map:parameter name="resource-exists" value="{resource-exists}"/>
+ <map:parameter name="resource-exists" value="true"/>
</map:call>
</map:when>
<map:otherwise>
@@ -245,6 +245,45 @@
</map:otherwise>
</map:select>
</map:match>
+
+ <map:match pattern="page-mail/*-top-col-1">
+ <map:select type="resource-exists">
+ <map:when test="docs/top-col-1/{1}.xml">
+ <map:call resource="load-page">
+ <map:parameter name="sect" value="top-col-1"/>
+ <map:parameter name="page" value="{1}"/>
+ <map:parameter name="resource-exists" value="true"/>
+ </map:call>
+ </map:when>
+ <map:otherwise>
+ <map:call resource="load-page">
+ <map:parameter name="sect" value="top-col-1"/>
+ <map:parameter name="page" value="index"/>
+ <map:parameter name="resource-exists" value="true"/>
+ </map:call>
+ </map:otherwise>
+ </map:select>
+ </map:match>
+
+ <map:match pattern="page-mail/*-bottom-col-1">
+ <map:select type="resource-exists">
+ <map:when test="docs/bottom-col-1/{1}.xml">
+ <map:call resource="load-page">
+ <map:parameter name="sect" value="bottom-col-1"/>
+ <map:parameter name="page" value="{1}"/>
+ <map:parameter name="resource-exists" value="true"/>
+ </map:call>
+ </map:when>
+ <map:otherwise>
+ <map:call resource="load-page">
+ <map:parameter name="sect" value="bottom-col-1"/>
+ <map:parameter name="page" value="index"/>
+ <map:parameter name="resource-exists" value="true"/>
+ </map:call>
+ </map:otherwise>
+ </map:select>
+ </map:match>
+
</map:pipeline>
<!-- general page section handling
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Mon Nov 15 22:17:11 2004
@@ -201,8 +201,11 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="AG" type="fix" fixes-bug="32124" due-to="Leo Leonid"
due-to-email="[EMAIL PROTECTED]">
+ Fix: Webmail sample broken
+ </action>
<action dev="AG" type="fix" fixes-bug="32214" due-to="Rick Tessner"
due-to-email="[EMAIL PROTECTED]">
- Context directory not required to be writable by the CLI
+ Fix: Context directory not required to be writable by the CLI
</action>
<action dev="CZ" type="fix" fixes-bug="32199">
Portal: If a coplet has an error, the error-uri has been called twice.
This is fixed now.
