You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2004/10/30 21:19:54 UTC
svn commit: rev 56061 - in incubator/lenya/trunk/src/webapp/lenya: resources/i18n xslt/authoring xslt/bxe
Author: gregor
Date: Sat Oct 30 12:19:54 2004
New Revision: 56061
Modified:
incubator/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml
incubator/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml
incubator/lenya/trunk/src/webapp/lenya/xslt/authoring/asset-upload.xsl
incubator/lenya/trunk/src/webapp/lenya/xslt/authoring/asset.xsl
incubator/lenya/trunk/src/webapp/lenya/xslt/bxe/asset.xsl
incubator/lenya/trunk/src/webapp/lenya/xslt/bxe/image.xsl
Log:
made image upload work again
made title mandatory (now used for listing assets)
added note about lowercasing file extensions
added js validation of title
fixed missing translation in asset screen
Modified: incubator/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml (original)
+++ incubator/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml Sat Oct 30 12:19:54 2004
@@ -75,7 +75,8 @@
<message key="select-object">Select {0}</message>
<message key="Insert">Insert</message>
<message key="Insert File">Insert File</message>
- <message key="upload-with-invalid-extension">You tried to upload a file with an invalid extension. Valid extensions are{0}</message>
+ <message key="upload-with-invalid-extension">You tried to upload a file with an invalid extension. Valid extensions are{0}. Note that extensions need to be in lowercase.</message>
+ <message key="upload-with-missing-title">You tried to upload a file without a title.</message>
<message key="filename-format-exception">The file name of the file you are trying to upload either has no extension, or contains characters which are not allowed, such as spaces or umlauts.</message>
<message key="Creation Date">Creation Date</message>
<message key="File Size">File Size</message>
Modified: incubator/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml (original)
+++ incubator/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml Sat Oct 30 12:19:54 2004
@@ -75,7 +75,8 @@
<message key="select-object">{0} auswählen</message>
<message key="Insert">Einfügen</message>
<message key="Insert File">Datei einfügen</message>
- <message key="upload-with-invalid-extension">Es dürfen nur Dateien mit folgenden Endungen hochgeladen werden{0}</message>
+ <message key="upload-with-invalid-extension">Es dürfen nur Dateien mit folgenden Endungen hochgeladen werden{0}. Die Endung muss zudem klein geschrieben sein.</message>
+ <message key="upload-with-missing-title">Dateien müssen einen Titel haben.</message>
<message key="filename-format-exception">Der Name der gewählten Datei enthält Umlaute, Leerzeichen, unerlaubte Zeichen oder besitzt keine gültige Endung.</message>
<message key="Creation Date">Erstelldatum</message>
<message key="File Size">Dateigrösse</message>
Modified: incubator/lenya/trunk/src/webapp/lenya/xslt/authoring/asset-upload.xsl
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/xslt/authoring/asset-upload.xsl (original)
+++ incubator/lenya/trunk/src/webapp/lenya/xslt/authoring/asset-upload.xsl Sat Oct 30 12:19:54 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: asset-upload.xsl,v 1.3 2004/08/25 09:52:25 andreas Exp $ -->
+<!-- $Id$ -->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -37,7 +37,7 @@
<xsl:template match="/lenya-info:info">
<page:page>
- <page:title><i18n:text key="lenya.assetupload.title"/></page:title>
+ <page:title><i18n:text key="lenya.assetupload.subtitle"/></page:title>
<page:body>
<xsl:apply-templates select="lenya-info:assets"/>
</page:body>
@@ -83,7 +83,7 @@
</tr>
<tr><td> </td></tr>
<tr>
- <td class="lenya-form-caption"><i18n:text>Title</i18n:text>:</td><td><input class="lenya-form-element" type="text" name="properties.asset.title"/></td>
+ <td class="lenya-form-caption"><i18n:text>Title</i18n:text>*:</td><td><input class="lenya-form-element" type="text" name="properties.asset.title"/></td>
</tr>
<tr>
<td class="lenya-form-caption"><i18n:text>Creator</i18n:text>:</td><td><input class="lenya-form-element" type="text" name="properties.asset.creator" value="{/lenya-info:info/lenya-info:assets/lenya-info:creator}"/></td>
Modified: incubator/lenya/trunk/src/webapp/lenya/xslt/authoring/asset.xsl
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/xslt/authoring/asset.xsl (original)
+++ incubator/lenya/trunk/src/webapp/lenya/xslt/authoring/asset.xsl Sat Oct 30 12:19:54 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: asset.xsl,v 1.40 2004/08/25 09:51:44 andreas Exp $ -->
+<!-- $Id$ -->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -177,7 +177,7 @@
</tr>
<tr><td> </td></tr>
<tr>
- <td class="lenya-form-caption"><i18n:text>Title</i18n:text>:</td><td><input class="lenya-form-element" type="text" name="properties.asset.title"/></td>
+ <td class="lenya-form-caption"><i18n:text>Title</i18n:text>*:</td><td><input class="lenya-form-element" type="text" name="properties.asset.title"/></td>
</tr>
<tr>
<td class="lenya-form-caption"><i18n:text>Creator</i18n:text>:</td><td><input class="lenya-form-element" type="text" name="properties.asset.creator" value="{/lenya-info:info/lenya-info:assets/lenya-info:creator}"/></td>
Modified: incubator/lenya/trunk/src/webapp/lenya/xslt/bxe/asset.xsl
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/xslt/bxe/asset.xsl (original)
+++ incubator/lenya/trunk/src/webapp/lenya/xslt/bxe/asset.xsl Sat Oct 30 12:19:54 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: asset.xsl,v 1.13 2004/08/23 16:30:47 andreas Exp $ -->
+<!-- $Id$ -->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -49,6 +49,11 @@
var ext = '<xsl:value-of select="$extensions"/>';
var delimiter = ' ';
var thefile = fileinput["properties.asset.data"].value;
+ var title = fileinput["properties.asset.title"].value;
+ if (title == "") {
+ alert("<i18n:translate><i18n:text key="upload-with-missing-title"/></i18n:translate>");
+ return false;
+ }
var _tempArray = new Array();
_tempArray = ext.split(delimiter);
for(i in _tempArray)
Modified: incubator/lenya/trunk/src/webapp/lenya/xslt/bxe/image.xsl
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/xslt/bxe/image.xsl (original)
+++ incubator/lenya/trunk/src/webapp/lenya/xslt/bxe/image.xsl Sat Oct 30 12:19:54 2004
@@ -66,6 +66,11 @@
var ext = '<xsl:value-of select="$extensions"/>';
var delimiter = ' ';
var thefile = fileinput["properties.asset.data"].value;
+ var title = fileinput["properties.asset.title"].value;
+ if (title == "") {
+ alert("<i18n:translate><i18n:text key="upload-with-missing-title"/></i18n:translate>");
+ return false;
+ }
var _tempArray = new Array();
_tempArray = ext.split(delimiter);
for(i in _tempArray) {
@@ -73,7 +78,7 @@
return true;
}
} // file does not have one of the accepted extensions.
- alert("<i18n:translate><i18n:text key="upload-with-invalid-extension"/><i18n:param>:\n\n<xsl:value-of select="$extensions"/></i18n:param></i18n:translate>");
+ alert("<i18n:translate><i18n:text key="upload-with-invalid-extension"/><i18n:param>:\n\n<xsl:value-of select="$extensions"/>\n</i18n:param></i18n:translate>");
return false;
}
</script>
@@ -106,7 +111,7 @@
id="data"/><br/>(<i18n:text>No whitespace, no special characters</i18n:text>)</td>
</tr>
<tr>
- <td class="lenya-form-caption"><i18n:text>Title</i18n:text>:</td>
+ <td class="lenya-form-caption"><i18n:text>Title</i18n:text>*:</td>
<td>
<input class="lenya-form-element"
type="text"
@@ -163,7 +168,7 @@
<xsl:for-each select="lenya-info:asset">
<xsl:choose>
<xsl:when
- test="dc:format = 'image/jpeg' or dc:format = 'image/gif'">
+ test="dc:format = 'image/jpeg' or dc:format = 'image/gif' or dc:format = 'image/png'">
<tr>
<td
colspan="2">
@@ -180,7 +185,7 @@
</td>
<td>
<a
- href="javascript:insertImage('{dc:title}');">
+ href="javascript:insertImage('{dc:source}');">
<i18n:text>Insert</i18n:text></a>
</td>
</tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org