Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
In directory james.mmbase.org:/tmp/cvs-serv15084/src/webapp/editors/resources
Modified Files:
imageupload.jsp
Log Message:
CMSC-681 Asset Maintenance asset tab style and i18n
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
See also: http://www.mmbase.org/jira/browse/CMSC-681
Index: imageupload.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imageupload.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- imageupload.jsp 17 Dec 2008 03:48:55 -0000 1.14
+++ imageupload.jsp 17 Dec 2008 06:39:08 -0000 1.15
@@ -46,6 +46,11 @@
<td style="color:red;"><fmt:message
key="asset.upload.existed" /></td>
</tr>
</c:if>
+ <c:if test="${param.uploadedNodes=='0' && param.exist ==
'0'}">
+ <tr>
+ <td style="color:red;"><fmt:message
key="image.upload.notimage" /></td>
+ </tr>
+ </c:if>
<tr>
<td><html:file property="file" /></td>
</tr>
@@ -62,7 +67,7 @@
<div id="busy">
<fmt:message key="uploading.message.wait"/><br />
</div>
-<c:if test="${param.exist =='0'}">
+<c:if test="${param.exist =='0' && param.uploadedNodes != 0}">
<table>
<tr class="listheader">
<th></th>
@@ -78,11 +83,6 @@
<mm:field name="description" escape="js-single-quotes"
jspvar="description">
<mm:field name="title" escape="js-single-quotes" jspvar="title">
-<%
- description = ((String)description).replaceAll("[\\n\\r\\t]+"," ");
- description = ((String)description).replaceAll("[\"]","@quot;");
- title = ((String)title).replaceAll("[\"]","@quot;");
-%>
<mm:import id="url">javascript:selectElement('<mm:field
name="number"/>', '<%=title%>','<mm:image />','<mm:field
name="width"/>','<mm:field name="height"/>', '<%=description%>');</mm:import>
</mm:field>
</mm:field>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
