Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
In directory james.mmbase.org:/tmp/cvs-serv7848/webapp/editors/resources
Modified Files:
imageupload.jsp
Log Message:
CMSC-681 Asset Maintenance
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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- imageupload.jsp 9 Dec 2008 06:15:27 -0000 1.12
+++ imageupload.jsp 12 Dec 2008 11:36:39 -0000 1.13
@@ -22,12 +22,9 @@
}
function unpublish(parentchannel, objectnumber) {
- var url = "AssetDeleteAction.do";
+ var url = "../repository/ImageDeleteAction.do";
url += "?channelnumber=" + parentchannel;
- url += "&action=unlink";
- url += "&returnurl=" + escape(document.location +
"&refreshchannel=true");
url += "&objectnumber=" + objectnumber;
-
document.location.href = url;
}
@@ -66,7 +63,7 @@
<fmt:message key="uploading.message.wait"/><br />
</div>
<c:if test="${param.exist =='0'}">
- <table>
+<table>
<tr class="listheader">
<th></th>
<th nowrap="true"><fmt:message key="imagesearch.titlecolumn"
/></th>
@@ -81,17 +78,18 @@
<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("[\\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>
<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 --%>
+ <td >
+<%-- use uploadedNodes and numberOfUploadedNodes in return url --%>
<c:set
var="returnUrl">/editors/resources/imageupload.jsp?uploadedNodes=${param.uploadedNodes}&uploadAction=${param.uploadAction}</c:set>
<c:choose>
<c:when test="${param.uploadAction == 'select'}">
@@ -108,15 +106,15 @@
</mm:url>">
</c:otherwise>
</c:choose>
- <img src="../gfx/icons/page_edit.png"
title="<fmt:message key="images.upload.edit"/>" alt="<fmt:message
key="images.upload.edit"/>"/></a>
-
+ <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>
-
+ alt="<fmt:message key="asset.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>
+ <img src="../gfx/icons/info.png"
title="<fmt:message key="images.upload.info"/>" alt="<fmt:message
key="images.upload.info"/>"/>
+ </a>
</td>
<td onMouseDown="objClick(this);"><mm:field
name="title"/></td>
<td onMouseDown="objClick(this);"><mm:field
name="filename"/></td>
@@ -127,7 +125,7 @@
</mm:listnodes>
</mm:listnodescontainer>
</tbody>
- </table>
+</table>
</c:if>
</div>
</div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
