Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv22141
Modified Files:
asset.jsp assetupload.jsp
Added Files:
asset.js
Log Message:
CMSC-681,Asset Maintenance model change info button
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
asset.js is new
Index: asset.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- asset.jsp 27 Oct 2008 06:34:17 -0000 1.3
+++ asset.jsp 3 Nov 2008 02:37:39 -0000 1.4
@@ -95,6 +95,9 @@
<th></th>
</tr>
</thead>
+
+<script src="../repository/asset.js" language="JavaScript"
type="text/javascript"></script>
+
<tbody class="hover">
<mm:listnodes referid="elements" jspvar="node">
<mm:field name="number" write="false" id="number" vartype="String"/>
@@ -118,9 +121,8 @@
<a href="<cmsc:contenturl number="${number}"/>" target="_blank"><img
src="../gfx/icons/preview.png"
alt="<fmt:message key="asset.preview.title" />"
title="<fmt:message key="asset.preview.title" />"/></a>
- <a href="javascript:info('<mm:field name="number" />')"><img
src="../gfx/icons/info.png" width="16" height="16"
-
title="<fmt:message key="asset.info" />"
-
alt="<fmt:message key="asset.info" />"/></a>
+ <a href="javascript:showInfo('<mm:nodeinfo type="guitype"/>', '<mm:field
name="number" />');">
+ <img src="../gfx/icons/info.png"
title="<fmt:message key="asset.info"/>" alt="<fmt:message
key="asset.info"/>"/></a>
<mm:haspage page="/editors/versioning">
<c:url value="/editors/versioning/ShowVersions.do" var="showVersions">
<c:param name="nodenumber"><mm:field name="number"/></c:param>
Index: assetupload.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetupload.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- assetupload.jsp 23 Oct 2008 11:44:00 -0000 1.1
+++ assetupload.jsp 3 Nov 2008 02:37:39 -0000 1.2
@@ -1,7 +1,6 @@
-<%@ page import="com.finalist.util.http.BulkUploadUtil"
-%>
- <script src="../repository/search.js" type="text/javascript"></script>
- <script type="text/javascript">
+<%@ page import="com.finalist.util.http.BulkUploadUtil"%>
+<script src="../repository/search.js" type="text/javascript"></script>
+<script type="text/javascript">
function upload() {
var f=document.forms[0];
f.submit();
@@ -13,42 +12,40 @@
document.getElementById("busy").style.visibility="visible";
document.getElementById("notbusy").style.visibility="hidden";
}
-
- function showInfo(objectnumber) {
- openPopupWindow('attachmentinfo', '500', '500',
'attachmentinfo.jsp?objectnumber='+objectnumber);
- }
</script>
-<!--////////////////////////////////////-->
-
- <form action="" enctype="multipart/form-data" method="post">
- <input type="hidden" name="uploadAction"
value="${param.uploadAction}"/>
- <table border="0">
+<form action="" enctype="multipart/form-data" method="post"><input
+ type="hidden" name="uploadAction" value="${param.uploadAction}" />
+<table border="0">
<tr>
- <td><fmt:message key="attachments.upload.explanation"
/></td>
+ <td><fmt:message key="asset.upload.explanation" /></td>
</tr>
<tr>
- <td><input type="file" name="zipfile"/></td>
+ <td><input type="file" name="zipfile" /></td>
</tr>
<tr>
<td><input type="button" name="uploadButton"
onclick="upload();"
- value="<fmt:message
key="attachments.upload.submit" />"/></td>
+ value="<fmt:message key="assets.upload.submit" />"
/></td>
</tr>
- </table>
- </form>
- <div id="busy">
- <fmt:message key="uploading.message.wait"/><br />
- </div>
+</table>
+</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
// TODO move this to a struts action there are some issue with HttpUpload
// in combination with struts which have to be investigated first
+ String assetType = "attachments";
+ //assetType = get value from the submitted form as the asset type
+ //if(assetType == null){
+ //assetType = "attachments";
+ //}
String uploadedNodes = "";
int numberOfUploadedNodes = -1;
if ("post".equalsIgnoreCase(request.getMethod())) {
- NodeManager manager = cloud.getNodeManager("attachments");
+ NodeManager manager = cloud.getNodeManager(assetType);
List<Integer> nodes = BulkUploadUtil.uploadAndStore(manager, request);
uploadedNodes = BulkUploadUtil.convertToCommaSeparated(nodes);
numberOfUploadedNodes = nodes.size();
@@ -61,73 +58,10 @@
}
}
%>
-<% if (numberOfUploadedNodes == 0) { %>
- <p><fmt:message key="attachments.upload.error"/></p>
-<% } else if (numberOfUploadedNodes > 0) { %>
- <p id="notbusy"><fmt:message key="attachments.upload.result">
- <fmt:param value="<%= numberOfUploadedNodes %>"/>
- </fmt:message>
- </p>
- <table>
- <tr class="listheader">
- <th></th>
- <th nowrap="true"><fmt:message
key="attachmentsearch.titlecolumn" /></th>
- <th><fmt:message key="attachmentsearch.filenamecolumn" /></th>
- </tr>
- <tbody class="hover">
- <c:set var="useSwapStyle">true</c:set>
-
- <mm:listnodescontainer path="attachments" nodes="<%=
uploadedNodes %>">
- <mm:listnodes>
-
- <mm:field name="title" escape="js-single-quotes" jspvar="title">
- <mm:attachment escape="js-single-quotes" jspvar="attachment">
- <%
- title = ((String)title).replaceAll("[\"]","@quot;");
- attachment =
((String)attachment).replaceAll("[\"]","@quot;");
- %>
- <mm:import id="url">javascript:selectElement('<mm:field
name="number"/>', '<%=title%>', '<%=attachment%>');</mm:import>
- </mm:attachment>
- </mm:field>
- <tr <c:if test="${useSwapStyle}">class="swap"</c:if>
href="<mm:write referid="url"/>">
- <td>
- <%-- use uploadedNodes and numberOfUploadedNodes in
return url --%>
-
- <c:set
var="returnUrl">/editors/resources/attachmentupload.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">
- <mm:param name="action"
value="init"/>
- <mm:param name="number"><mm:field
name="number" /></mm:param>
- <mm:param name="returnUrl"
value="${returnUrl}"/>
- </mm:url>" onclick="blockSelect = true">
- </c:when>
- <c:otherwise>
- <a href="<mm:url page="../WizardInitAction.do">
- <mm:param
name="objectnumber"><mm:field name="number" /></mm:param>
- <mm:param name="returnurl"
value="${returnUrl}" />
- </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>
-
- <a href="<mm:url
page="DeleteSecondaryContentAction.do" >
- <mm:param name="objectnumber"><mm:field
name="number" /></mm:param>
- <mm:param name="object_type"
value="attachmentsupload" />
- </mm:url>">
- <img src="../gfx/icons/delete.png" alt="<fmt:message
key="attachmentsearch.icon.delete" />" title="<fmt:message
key="attachmentsearch.icon.delete" />"/></a>
-
- <a href="javascript:showInfo(<mm:field name="number"
/>)">
- <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>
- </tr>
- <c:set var="useSwapStyle">${!useSwapStyle}</c:set>
- </mm:listnodes>
- </mm:listnodescontainer>
-
- </tbody>
- </table>
-<% } %>
-<!--//////////////////////////////-->
\ No newline at end of file
+<%
+ if (numberOfUploadedNodes == 0) {
+%>
+<p><fmt:message key="assets.upload.error" /></p>
+<%
+ }
+%>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
