Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv24401/repository
Modified Files:
imageupload.jsp
Log Message:
CMSC-681 Asset Maintenance
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-681
Index: imageupload.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/imageupload.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- imageupload.jsp 9 Dec 2008 06:04:04 -0000 1.2
+++ imageupload.jsp 9 Dec 2008 06:15:27 -0000 1.3
@@ -8,7 +8,10 @@
<script src="../repository/search.js" type="text/javascript"></script>
<script type="text/javascript">
function upload() {
+ var f=document.forms[0];
+ f.submit();
setTimeout('sayWait();',0);
+
}
function sayWait() {
@@ -21,16 +24,6 @@
openPopupWindow('imageinfo', '900', '500',
'imageinfo.jsp?objectnumber='+objectnumber);
}
- function unpublish(parentchannel, objectnumber) {
- var url = "AssetDeleteAction.do";
- url += "?channelnumber=" + parentchannel;
- url += "&action=unlink";
- url += "&returnurl=" + escape(document.location +
"&refreshchannel=true");
- url += "&objectnumber=" + objectnumber;
-
- document.location.href = url;
- }
-
var blockSelect = false;
</script>
</cmscedit:head>
@@ -39,16 +32,11 @@
<div class="editor" style="height:500px">
<div class="body">
<html:form action="/editors/repository/ImageUploadAction.do"
enctype="multipart/form-data" method="post">
- <input type="hidden" id="parentchannel" name="parentchannel"
value="${param.channelid}"/>
+ <input type="hidden" id="parentchannel" name="parentchannel"
value="723"/>
<table border="0">
<tr>
<td><fmt:message key="asset.upload.explanation" /></td>
</tr>
- <c:if test="${param.exist=='1'}">
- <tr>
- <td style="color:red;"><fmt:message
key="asset.upload.existed" /></td>
- </tr>
- </c:if>
<tr>
<td><html:file property="file" /></td>
</tr>
@@ -65,7 +53,32 @@
<div id="busy">
<fmt:message key="uploading.message.wait"/><br />
</div>
-<c:if test="${param.exist =='0'}">
+<%
+ // retrieve list op node id's from either the recent upload
+ // or from the request url to enable a return url
+ // in combination with struts which have to be investigated first
+ String uploadedNodes = "";
+ int numberOfUploadedNodes = -1;
+ if ("post".equalsIgnoreCase(request.getMethod())) {
+ List<Integer> nodes =
(ArrayList<Integer>)(request.getAttribute("uploadedImages"));
+ uploadedNodes = BulkUploadUtil.convertToCommaSeparated(nodes);
+ numberOfUploadedNodes = nodes.size();
+ } else {
+ if (request.getParameter("uploadedNodes") != null) {
+ uploadedNodes = request.getParameter("uploadedNodes");
+ }
+ if (request.getParameter("numberOfUploadedNodes") != null) {
+ numberOfUploadedNodes =
Integer.parseInt(request.getParameter("numberOfUploadedNodes"));
+ }
+ }
+%>
+<% if (numberOfUploadedNodes == 0) { %>
+ <p><fmt:message key="images.upload.error"/></p>
+<% } else if (numberOfUploadedNodes > 0) { %>
+ <p id="notbusy"><fmt:message key="images.upload.result">
+ <fmt:param value="<%= numberOfUploadedNodes %>"/>
+ </fmt:message>
+ </p>
<table>
<tr class="listheader">
<th></th>
@@ -76,7 +89,8 @@
</tr>
<tbody class="hover">
<c:set var="useSwapStyle">true</c:set>
- <mm:listnodescontainer path="images"
nodes="${param.uploadedNodes}">
+
+ <mm:listnodescontainer path="images" nodes="<%= uploadedNodes
%>">
<mm:listnodes>
<mm:field name="description" escape="js-single-quotes"
jspvar="description">
@@ -92,7 +106,7 @@
<tr <c:if test="${useSwapStyle}">class="swap"</c:if>
href="<mm:write referid="url"/>">
<td onclick="if(!blockSelect) {objClick(this);}
blockSelect=false;">
<%-- use uploadedNodes and numberOfUploadedNodes in
return url --%>
- <c:set
var="returnUrl">/editors/resources/imageupload.jsp?uploadedNodes=${param.uploadedNodes}&uploadAction=${param.uploadAction}</c:set>
+ <c:set
var="returnUrl">/editors/resources/imageupload.jsp?uploadedNodes=<%=uploadedNodes%>&numberOfUploadedNodes=<%=numberOfUploadedNodes%>&uploadAction=${param.uploadAction}</c:set>
<c:choose>
<c:when test="${param.uploadAction == 'select'}">
<a href="<mm:url page="SecondaryEditAction.do">
@@ -110,10 +124,11 @@
</c:choose>
<img src="../gfx/icons/page_edit.png"
title="<fmt:message key="images.upload.edit"/>" alt="<fmt:message
key="images.upload.edit"/>"/></a>
- <a
href="javascript:unpublish('${param.channelid}','${param.uploadedNodes}');"
- title="<fmt:message key="asset.delete" />"><img
src="../gfx/icons/delete.png" width="16" height="16"
- title="<fmt:message
key="asset.delete" />"
- alt="<fmt:message
key="asset.delete" />"/></a>
+ <a href="<mm:url
page="DeleteSecondaryContentAction.do" >
+ <mm:param
name="objectnumber"><mm:field name="number" /></mm:param>
+ <mm:param
name="object_type" value="imagesupload" />
+ </mm:url>">
+ <img src="../gfx/icons/delete.png"
alt="<fmt:message key="imagesearch.icon.delete" />" title="<fmt:message
key="imagesearch.icon.delete" />"/></a>
<a href="javascript:showInfo(<mm:field name="number"
/>);" onclick="blockSelect = true;">
<img src="../gfx/icons/info.png"
title="<fmt:message key="images.upload.info"/>" alt="<fmt:message
key="images.upload.info"/>"/></a>
@@ -126,9 +141,11 @@
<c:set var="useSwapStyle">${!useSwapStyle}</c:set>
</mm:listnodes>
</mm:listnodescontainer>
+
</tbody>
</table>
-</c:if>
+<% } %>
+
</div>
</div>
</mm:cloud>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
