You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ed...@apache.org on 2005/04/19 16:05:20 UTC
svn commit: r161890 - in lenya/branches/BRANCH_1_2_X/src:
java/org/apache/lenya/cms/cocoon/acting/UploadAction.java
webapp/lenya/pubs/default/usecase-bxeng.xmap
webapp/lenya/xslt/authoring/asset-upload.xsl
Author: edith
Date: Tue Apr 19 07:05:19 2005
New Revision: 161890
URL: http://svn.apache.org/viewcvs?view=rev&rev=161890
Log:
Thanks to Simon Litwan: changes in UploadAction.java, uscase-bxeng.xmap and asset-upload.xsl for error notification after fileupload
Modified:
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/UploadAction.java
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/usecase-bxeng.xmap
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/authoring/asset-upload.xsl
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/UploadAction.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/UploadAction.java?view=diff&r1=161889&r2=161890
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/UploadAction.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/UploadAction.java Tue Apr 19 07:05:19 2005
@@ -69,7 +69,7 @@
public static final String CONTENT_PREFIX = "content";
- public static final String FILE_NAME_REGEXP = "[-a-zA-Z0-9_. ]+";
+ public static final String FILE_NAME_REGEXP = "[-a-zA-Z0-9_.]+";
// optional parameters for meta data according to dublin core
public static final String[] DUBLIN_CORE_PARAMETERS = { "title", "creator", "subject",
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/usecase-bxeng.xmap
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/usecase-bxeng.xmap?view=diff&r1=161889&r2=161890
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/usecase-bxeng.xmap (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/usecase-bxeng.xmap Tue Apr 19 07:05:19 2005
@@ -138,20 +138,24 @@
<map:act type="upload">
<map:redirect-to uri="{request:requestURI}?lenya.usecase=bxeng&lenya.step=asset-upload-show"/>
</map:act>
- <map:call resource="cms-screen">
- <map:parameter name="serverpage" value="info/assets.xsp"/>
- <map:parameter name="stylesheet" value="bxeng/asset.xsl"/>
- </map:call>
+ <map:generate src="../../content/info/assets.xsp" type="serverpages"/>
+ <map:transform src="../../xslt/bxeng/asset.xsl">
+ <map:parameter name="use-request-parameters" value="true"/>
+ <map:parameter name="error" value="true"/>
+ </map:transform>
+ <map:call resource="style-cms-page"/>
</map:match>
<map:match type="step" pattern="image-upload">
<map:act type="upload">
<map:redirect-to uri="{request:requestURI}?lenya.usecase=bxeng&lenya.step=image-upload-show"/>
</map:act>
- <map:call resource="cms-screen">
- <map:parameter name="serverpage" value="info/assets.xsp"/>
- <map:parameter name="stylesheet" value="bxeng/image.xsl"/>
- </map:call>
+ <map:generate src="../../content/info/assets.xsp" type="serverpages"/>
+ <map:transform src="../../xslt/bxeng/image.xsl">
+ <map:parameter name="use-request-parameters" value="true"/>
+ <map:parameter name="error" value="true"/>
+ </map:transform>
+ <map:call resource="style-cms-page"/>
</map:match>
<map:match pattern="link-show" type="step">
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/authoring/asset-upload.xsl
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/authoring/asset-upload.xsl?view=diff&r1=161889&r2=161890
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/authoring/asset-upload.xsl (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/authoring/asset-upload.xsl Tue Apr 19 07:05:19 2005
@@ -74,7 +74,7 @@
<xsl:if test="$error = 'true'">
<tr>
<td colspan="2" class="lenya-form-caption">
- <span class="lenya-form-message-error"><i18n key="filename-format-exception"/></span>
+ <span class="lenya-form-message-error"><i18n:text key="filename-format-exception"/></span>
</td>
</tr>
</xsl:if>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org