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/04/17 15:15:35 UTC
svn commit: r529591 - in /lenya/trunk/src/modules/resource:
config/menus/resource.xsp resources/i18n/cmsui.xml
resources/i18n/cmsui_de.xml usecases/upload-resource.jx
Author: andreas
Date: Tue Apr 17 06:15:34 2007
New Revision: 529591
URL: http://svn.apache.org/viewvc?view=rev&rev=529591
Log:
Improved i18n and layout of resource upload usecase
Modified:
lenya/trunk/src/modules/resource/config/menus/resource.xsp
lenya/trunk/src/modules/resource/resources/i18n/cmsui.xml
lenya/trunk/src/modules/resource/resources/i18n/cmsui_de.xml
lenya/trunk/src/modules/resource/usecases/upload-resource.jx
Modified: lenya/trunk/src/modules/resource/config/menus/resource.xsp
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/resource/config/menus/resource.xsp?view=diff&rev=529591&r1=529590&r2=529591
==============================================================================
--- lenya/trunk/src/modules/resource/config/menus/resource.xsp (original)
+++ lenya/trunk/src/modules/resource/config/menus/resource.xsp Tue Apr 17 06:15:34 2007
@@ -50,7 +50,7 @@
String doctype = <input:get-attribute module="page-envelope" as="string" name="document-type"/>;
if ("resource".equals(doctype)) {
<block areas="authoring">
- <item wf:event="edit" uc:usecase="resource.upload" href="?"><i18n:text>Upload Resource</i18n:text></item>
+ <item wf:event="edit" uc:usecase="resource.upload" href="?"><i18n:text>Upload File</i18n:text></item>
</block>
}
</xsp:logic>
Modified: lenya/trunk/src/modules/resource/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/resource/resources/i18n/cmsui.xml?view=diff&rev=529591&r1=529590&r2=529591
==============================================================================
--- lenya/trunk/src/modules/resource/resources/i18n/cmsui.xml (original)
+++ lenya/trunk/src/modules/resource/resources/i18n/cmsui.xml Tue Apr 17 06:15:34 2007
@@ -45,5 +45,8 @@
<message key="Content">Content</message>
<message key="Size">Size</message>
<message key="MimeType">Mime Type</message>
+ <message key="Upload File">Upload File</message>
+ <message key="Warning">Warning</message>
+ <message key="document-will-be-overwritten">The existing document will be overwritten!</message>
</catalogue>
Modified: lenya/trunk/src/modules/resource/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/resource/resources/i18n/cmsui_de.xml?view=diff&rev=529591&r1=529590&r2=529591
==============================================================================
--- lenya/trunk/src/modules/resource/resources/i18n/cmsui_de.xml (original)
+++ lenya/trunk/src/modules/resource/resources/i18n/cmsui_de.xml Tue Apr 17 06:15:34 2007
@@ -22,8 +22,8 @@
<message key="Insert Image">Bild einfügen</message>
<message key="Insert Asset">Anlage einfügen</message>
- <message key="Asset Upload">Analge hochladen</message>
- <message key="Insert a new Image">Neues bild einfügen</message>
+ <message key="Asset Upload">Anlage hochladen</message>
+ <message key="Insert a new Image">Neues Bild einfügen</message>
<message key="Upload an Asset">Anlage hochladen</message>
<message key="upload-size-exceeded">Die Datei ist zu groà ({0}).</message>
<message key="upload-enter-title">Bitte geben Sie einen Titel ein.</message>
@@ -48,6 +48,9 @@
<message key="Content">Inhalt</message>
<message key="Size">GröÃe</message>
<message key="MimeType">Mime-Type</message>
+ <message key="Upload File">Datei hochladen</message>
+ <message key="Warning">Warnung</message>
+ <message key="document-will-be-overwritten">Das existierende Dokument wird überschrieben!</message>
</catalogue>
Modified: lenya/trunk/src/modules/resource/usecases/upload-resource.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/resource/usecases/upload-resource.jx?view=diff&rev=529591&r1=529590&r2=529591
==============================================================================
--- lenya/trunk/src/modules/resource/usecases/upload-resource.jx (original)
+++ lenya/trunk/src/modules/resource/usecases/upload-resource.jx Tue Apr 17 06:15:34 2007
@@ -24,12 +24,13 @@
xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
<page:title>
- <i18n:text>Upload Resource</i18n:text>
+ <i18n:text>Upload File</i18n:text>
</page:title>
<page:body>
+ <div class="lenya-box">
<div class="lenya-box-title">
- <i18n:text>Upload Resource</i18n:text>
+ <i18n:text>Upload File</i18n:text>
</div>
<div class="lenya-box-body">
<form method="POST" enctype="multipart/form-data" id="form-upload">
@@ -42,14 +43,14 @@
</td>
</tr>
<tr>
- <td colspan="2">
- <strong><i18n:text>WARNING:</i18n:text> <i18n:text>The existing document will be overwritten!</i18n:text></strong>
+ <td colspan="2" style="padding-bottom: 2em;">
+ <strong><i18n:text>Warning</i18n:text>:</strong> <i18n:text>document-will-be-overwritten</i18n:text>
</td>
</tr>
<tr>
<td class="lenya-entry-caption"><label for="file">
- <i18n:text>File</i18n:text> *</label></td>
- <td><input type="file" name="file" class="lenya-form-element"/></td>
+ <i18n:text>File</i18n:text>: *</label></td>
+ <td><input type="file" name="file" class="lenya-form-element" size="50"/></td>
</tr>
<tr>
<td class="lenya-entry-caption">*
@@ -59,12 +60,13 @@
<tr>
<td/>
<td>
- <input i18n:attr="value" name="submit" type="submit"
- value="Upload Resource"/>
+ <input i18n:attr="value" name="submit" type="submit" value="Upload File"/>
+ <input i18n:attr="value" name="cancel" type="submit" value="Cancel"/>
</td>
</tr>
</table>
</form>
+ </div>
</div>
</page:body>
</page:page>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org