Author: raintang
Date: 2009-06-04 10:39:40 +0200 (Thu, 04 Jun 2009)
New Revision: 35690
Removed:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/imageupload.jsp
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentupload.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imageupload.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlcreate.jsp
Log:
CMSC-293 Unused portlet relations to a page
Deleted:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/imageupload.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/imageupload.jsp
2009-06-04 07:03:13 UTC (rev 35689)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/imageupload.jsp
2009-06-04 08:39:40 UTC (rev 35690)
@@ -1,154 +0,0 @@
-<%...@page language="java" contentType="text/html;charset=utf-8"
-%><%...@include file="globals.jsp" %><%...@page
import="com.finalist.util.http.BulkUploadUtil"
-%><%...@page import="java.util.List"
-%> <mm:content type="text/html" encoding="UTF-8" expires="0">
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html:html xhtml="true">
-<cmscedit:head title="images.upload.title">
- <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() {
- document.getElementById("busy").style.visibility="visible";
- document.getElementById("notbusy").style.visibility="hidden";
- }
-
-
- function showInfo(objectnumber) {
- openPopupWindow('imageinfo', '900', '500',
'imageinfo.jsp?objectnumber='+objectnumber);
- }
-
- var blockSelect = false;
- </script>
-</cmscedit:head>
-<body>
-<mm:cloud jspvar="cloud" loginpage="../../editors/login.jsp">
- <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"/>
- <table border="0">
- <tr>
- <td><fmt:message key="asset.upload.explanation" /></td>
- </tr>
- <tr>
- <td><html:file property="file" /></td>
- </tr>
- <tr>
- <td><html:submit property="uploadButton"
onclick="upload();">
- <fmt:message key='assets.upload.submit'
/></html:submit></td>
- </tr>
- </table>
- </html:form>
- </div>
- <div class="ruler_green"><div><fmt:message
key="images.upload.results" /></div></div>
-
- <div class="body">
- <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>
- <table>
- <tr class="listheader">
- <th></th>
- <th nowrap="true"><fmt:message key="imagesearch.titlecolumn"
/></th>
- <th><fmt:message key="imagesearch.filenamecolumn" /></th>
- <th><fmt:message key="imagesearch.mimetypecolumn" /></th>
- <th></th>
- </tr>
- <tbody class="hover">
- <c:set var="useSwapStyle">true</c:set>
-
- <mm:listnodescontainer path="images" nodes="<%= uploadedNodes
%>">
- <mm:listnodes>
-
- <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>
-
- <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: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="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>
- </td>
- <td onMouseDown="objClick(this);"><mm:field
name="title"/></td>
- <td onMouseDown="objClick(this);"><mm:field
name="filename"/></td>
- <td onMouseDown="objClick(this);"><mm:field
name="itype"/></td>
- <td onMouseDown="objClick(this);"><img src="<mm:image
template="s(100x100)"/>" alt="" /></td>
- </tr>
- <c:set var="useSwapStyle">${!useSwapStyle}</c:set>
- </mm:listnodes>
- </mm:listnodescontainer>
-
- </tbody>
- </table>
-<% } %>
-
- </div>
- </div>
-</mm:cloud>
-</body>
-</html:html>
-</mm:content>
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentupload.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentupload.jsp
2009-06-04 07:03:13 UTC (rev 35689)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentupload.jsp
2009-06-04 08:39:40 UTC (rev 35690)
@@ -13,7 +13,6 @@
function sayWait() {
document.getElementById("busy").style.visibility="visible";
- document.getElementById("notbusy").style.visibility="hidden";
}
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imageupload.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imageupload.jsp
2009-06-04 07:03:13 UTC (rev 35689)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imageupload.jsp
2009-06-04 08:39:40 UTC (rev 35690)
@@ -13,7 +13,6 @@
function sayWait() {
document.getElementById("busy").style.visibility="visible";
- document.getElementById("notbusy").style.visibility="hidden";
}
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlcreate.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlcreate.jsp
2009-06-04 07:03:13 UTC (rev 35689)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlcreate.jsp
2009-06-04 08:39:40 UTC (rev 35690)
@@ -24,7 +24,6 @@
function sayWait() {
document.getElementById("busy").style.visibility="visible";
- document.getElementById("notbusy").style.visibility="hidden";
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
