You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ch...@apache.org on 2006/12/07 00:24:33 UTC
svn commit: r483289 - in /lenya/trunk/src: modules/tinymce/config/menu.xsp
pubs/default/sitemap.xmap
Author: chestnut
Date: Wed Dec 6 15:24:31 2006
New Revision: 483289
URL: http://svn.apache.org/viewvc?view=rev&rev=483289
Log:
don't resolve uuid links if rendertype is edit
Modified:
lenya/trunk/src/modules/tinymce/config/menu.xsp
lenya/trunk/src/pubs/default/sitemap.xmap
Modified: lenya/trunk/src/modules/tinymce/config/menu.xsp
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/tinymce/config/menu.xsp?view=diff&rev=483289&r1=483288&r2=483289
==============================================================================
--- lenya/trunk/src/modules/tinymce/config/menu.xsp (original)
+++ lenya/trunk/src/modules/tinymce/config/menu.xsp Wed Dec 6 15:24:31 2006
@@ -34,7 +34,7 @@
String doctype = <input:get-attribute module="page-envelope" as="string" name="document-type"/>;
if ("xhtml".equals(doctype) || "homepage".equals(doctype)) {
<block info="false">
- <item wf:event="edit" uc:usecase="tinymce.edit" href="?"><i18n:text>With TinyMCE</i18n:text></item>
+ <item wf:event="edit" uc:usecase="tinymce.edit" href="?rendertype=edit"><i18n:text>With TinyMCE</i18n:text></item>
</block>
}
</xsp:logic>
Modified: lenya/trunk/src/pubs/default/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/sitemap.xmap?view=diff&rev=483289&r1=483288&r2=483289
==============================================================================
--- lenya/trunk/src/pubs/default/sitemap.xmap (original)
+++ lenya/trunk/src/pubs/default/sitemap.xmap Wed Dec 6 15:24:31 2006
@@ -243,7 +243,15 @@
<!-- Write to cache and serialize -->
<map:otherwise>
- <map:generate src="cocoon:/lenyabody-view/{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-type}{page-envelope:document-url}"/>
+ <map:select type="parameter">
+ <map:parameter name="parameter-selector-test" value="{request-param:rendertype}"/>
+ <map:when test="edit">
+ <map:generate src="cocoon:/lenyabody-edit/{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-type}{page-envelope:document-url}"/>
+ </map:when>
+ <map:otherwise>
+ <map:generate src="cocoon:/lenyabody-view/{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-type}{page-envelope:document-url}"/>
+ </map:otherwise>
+ </map:select>
<map:select type="browser">
<map:when test="mozilla5DISABLED">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org