You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/06/13 15:54:55 UTC
svn commit: r546877 - in /lenya/trunk/src/modules:
fckeditor/usecases/insertAsset.jx tinymce/usecases/insertAsset.jx
Author: andreas
Date: Wed Jun 13 06:54:54 2007
New Revision: 546877
URL: http://svn.apache.org/viewvc?view=rev&rev=546877
Log:
Removed context path from FCKeditor and TinyMCE usecases
Modified:
lenya/trunk/src/modules/fckeditor/usecases/insertAsset.jx
lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx
Modified: lenya/trunk/src/modules/fckeditor/usecases/insertAsset.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/fckeditor/usecases/insertAsset.jx?view=diff&rev=546877&r1=546876&r2=546877
==============================================================================
--- lenya/trunk/src/modules/fckeditor/usecases/insertAsset.jx (original)
+++ lenya/trunk/src/modules/fckeditor/usecases/insertAsset.jx Wed Jun 13 06:54:54 2007
@@ -24,7 +24,7 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" >
<page:head>
- <script src="${request.contextPath}/modules/fckeditor/javascript/insertAsset.js"/>
+ <script src="/modules/fckeditor/javascript/insertAsset.js"/>
</page:head>
<page:title>
@@ -49,7 +49,7 @@
<th style="background: none;"><i18n:text>Creation Date</i18n:text></th>
</tr>
<jx:forEach var="asset" items="${usecase.getParameter('assets')}">
- <jx:set var="originalUrl" value="${cocoon.request.getContextPath() + asset.getCanonicalWebappURL()}"/>
+ <jx:set var="originalUrl" value="${asset.getCanonicalWebappURL()}"/>
<jx:set var="lastDotIndex" value="${originalUrl.lastIndexOf('.')}"/>
<jx:set var="extension" value="${asset.getMetaData('http://apache.org/lenya/metadata/document/1.0').getFirstValue('extension')}"/>
<jx:set var="url" value="${originalUrl.substring(0, lastDotIndex).concat('.').concat(extension)}"/>
Modified: lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx?view=diff&rev=546877&r1=546876&r2=546877
==============================================================================
--- lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx (original)
+++ lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx Wed Jun 13 06:54:54 2007
@@ -24,7 +24,7 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1" >
<page:head>
- <script src="${request.contextPath}/modules/tinymce/javascript/insertAsset.js"/>
+ <script src="/modules/tinymce/javascript/insertAsset.js"/>
</page:head>
<page:title>
@@ -56,7 +56,7 @@
<jx:set var="mimeType" value="${asset.getMimeType()}"/>
<jx:if test="${mimeType.startsWith('image/')}">
<jx:set var="doc" value="${usecase.getParameter('document')}"/>
- <img src="${cocoon.request.getContextPath()}/${asset.getPublication().getId()}/${asset.getArea()}${asset.getPath()}.${asset.getMetaData('http://apache.org/lenya/metadata/document/1.0').getFirstValue('extension')}"
+ <img src="${/${asset.getPublication().getId()}/${asset.getArea()}${asset.getPath()}.${asset.getMetaData('http://apache.org/lenya/metadata/document/1.0').getFirstValue('extension')}"
style="height: 32px; vertical-align: middle;"/> 
</jx:if>
</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org