Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv24082/src/webapp/editors/repository
Modified Files:
asset.jsp assetupload.jsp 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: asset.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- asset.jsp 8 Dec 2008 03:56:08 -0000 1.13
+++ asset.jsp 9 Dec 2008 06:04:04 -0000 1.14
@@ -36,9 +36,6 @@
<script src="../repository/asset.js" language="JavaScript"
type="text/javascript"></script>
</cmscedit:head>
-
-
-
<div class="editor">
<div class="body">
<!-- check to see if we have workflow, this is done by looking
if the editors for the workflow are on the HD -->
@@ -47,7 +44,6 @@
<c:set var="hasWorkflow" value="true"/>
</mm:haspage>
-
<mm:node number="$parentchannel" jspvar="parentchannelnode">
<% UserRole role = RepositoryUtil.getRole(cloud,
parentchannelnode, false); %>
<p>
@@ -58,7 +54,7 @@
<%@ include file="assetupload.jsp" %>
<% if (role != null && SecurityUtil.isWriter(role)) { %>
<ul class="shortcuts">
- <li class="new" style="text-decoration:
none;"><fmt:message key="asset.new"/>
+ <li class="new" style="text-decoration: none;">
<form name="initForm" action="../WizardInitAction.do"
method="post" style="display:inline;text-decoration:none">
<input type="hidden" name="action" value="create"/>
<input type="hidden" name="creation"
value="<mm:write referid="parentchannel" />"/>
@@ -66,11 +62,6 @@
<input type="hidden" name="order"
value="${orderby}" />
<input type="hidden" name="direction"
value="${direction}"/>
<input type="hidden" name="offset"
value="${param.offset}"/>
- <select name="assettype" id="atype"
onchange="document.getElementById('assetType').value=this.value">
- <c:forEach var="type" items="${typesList}">
- <option
value="${type.value}">${type.label}</option>
- </c:forEach>
- </select>
<input type="submit" name="submitButton"
value="<fmt:message key="asset.create" />" class="button"/>
</form>
</li>
@@ -207,8 +198,6 @@
</div>
</c:if>
-
-
<c:if test="${!empty show}">
<div class="body">
<mm:import externid="elements" from="request"
required="true"/>
@@ -271,8 +260,6 @@
</mm:node>
</div>
-
-
</html:html>
</mm:cloud>
</mm:content>
\ No newline at end of file
Index: assetupload.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- assetupload.jsp 11 Nov 2008 05:56:54 -0000 1.4
+++ assetupload.jsp 9 Dec 2008 06:04:04 -0000 1.5
@@ -1,16 +1,11 @@
<%@ page import="com.finalist.util.http.BulkUploadUtil"%>
<script type="text/javascript">
function upload() {
-
if(document.getElementById("atype").options[document.getElementById("atype").options.selectedIndex].value=="urls"){
- document.getElementByName("uploadButton").disable=true;
- alert("Only attachments and images can be uploaded!");
- }
setTimeout('sayWait();',0);
}
function sayWait() {
document.getElementById("busy").style.visibility="visible";
- //document.getElementById("notbusy").style.visibility="hidden";
}
</script>
@@ -19,8 +14,13 @@
<input type="hidden" id="parentchannel" name="parentchannel"
value="${parentchannel}"/>
<table border="0">
<tr>
- <td><fmt:message key="asset.upload.explanation" /></td>
+ <td><fmt:message key="asset.upload.explanation" /></td><br/>
+ </tr>
+ <c:if test="${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>
@@ -32,29 +32,3 @@
</html:form>
<div id="busy"><fmt:message key="uploading.message.wait" /><br />
</div>
-<%
- // 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("uploadedAssets"));
- 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="assets.upload.error" /></p>
-<%
- }
-%>
\ No newline at end of file
Index: imageupload.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/imageupload.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- imageupload.jsp 2 Dec 2008 02:40:21 -0000 1.1
+++ imageupload.jsp 9 Dec 2008 06:04:04 -0000 1.2
@@ -8,10 +8,7 @@
<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() {
@@ -24,6 +21,16 @@
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>
@@ -32,11 +39,16 @@
<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="723"/>
+ <input type="hidden" id="parentchannel" name="parentchannel"
value="${param.channelid}"/>
<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>
@@ -53,32 +65,7 @@
<div id="busy">
<fmt:message key="uploading.message.wait"/><br />
</div>
-<%
- // 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>
+<c:if test="${param.exist =='0'}">
<table>
<tr class="listheader">
<th></th>
@@ -89,8 +76,7 @@
</tr>
<tbody class="hover">
<c:set var="useSwapStyle">true</c:set>
-
- <mm:listnodescontainer path="images" nodes="<%= uploadedNodes
%>">
+ <mm:listnodescontainer path="images"
nodes="${param.uploadedNodes}">
<mm:listnodes>
<mm:field name="description" escape="js-single-quotes"
jspvar="description">
@@ -106,7 +92,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=<%=uploadedNodes%>&numberOfUploadedNodes=<%=numberOfUploadedNodes%>&uploadAction=${param.uploadAction}</c:set>
+ <c:set
var="returnUrl">/editors/resources/imageupload.jsp?uploadedNodes=${param.uploadedNodes}&uploadAction=${param.uploadAction}</c:set>
<c:choose>
<c:when test="${param.uploadAction == 'select'}">
<a href="<mm:url page="SecondaryEditAction.do">
@@ -124,11 +110,10 @@
</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="<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: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="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>
@@ -141,11 +126,9 @@
<c:set var="useSwapStyle">${!useSwapStyle}</c:set>
</mm:listnodes>
</mm:listnodescontainer>
-
</tbody>
</table>
-<% } %>
-
+</c:if>
</div>
</div>
</mm:cloud>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
