Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
In directory james.mmbase.org:/tmp/cvs-serv28516/resources
Modified Files:
attachmentsearch.jsp attachmentupload.jsp delete.jsp
imagesearch.jsp imageupload.jsp urlsearch.jsp
Log Message:
CMSC-899,Check and improve all lists according to guideline
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
See also: http://www.mmbase.org/jira/browse/CMSC-899
Index: attachmentsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentsearch.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- attachmentsearch.jsp 17 Sep 2008 06:04:33 -0000 1.8
+++ attachmentsearch.jsp 19 Sep 2008 02:25:02 -0000 1.9
@@ -1,8 +1,8 @@
-<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8"%>
-<[EMAIL PROTECTED] file="globals.jsp" %>
-<[EMAIL PROTECTED] import="java.util.Iterator,
- com.finalist.cmsc.mmbase.PropertiesUtil"%>
-<mm:content type="text/html" encoding="UTF-8" expires="0">
+<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8"
+%><[EMAIL PROTECTED] file="globals.jsp"
+%><[EMAIL PROTECTED] import="java.util.Iterator,
+ com.finalist.cmsc.mmbase.PropertiesUtil"
+%><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="attachments.title">
Index: attachmentupload.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentupload.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- attachmentupload.jsp 8 Jul 2008 14:41:47 -0000 1.9
+++ attachmentupload.jsp 19 Sep 2008 02:25:02 -0000 1.10
@@ -1,7 +1,7 @@
-<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8"%>
-<[EMAIL PROTECTED] file="globals.jsp" %>
-<[EMAIL PROTECTED] import="com.finalist.util.http.BulkUploadUtil"%>
-<mm:content type="text/html" encoding="UTF-8" expires="0">
+<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8"
+%><[EMAIL PROTECTED] file="globals.jsp"
+%><[EMAIL PROTECTED] import="com.finalist.util.http.BulkUploadUtil"
+%><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="attachments.upload.title">
@@ -136,6 +136,13 @@
</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>
Index: delete.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/delete.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- delete.jsp 5 Sep 2007 09:45:22 -0000 1.1
+++ delete.jsp 19 Sep 2008 02:25:02 -0000 1.2
@@ -1,6 +1,6 @@
-<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8"%>
-<[EMAIL PROTECTED] file="globals.jsp" %>
-<mm:content type="text/html" encoding="UTF-8" expires="0">
+<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8"
+%><[EMAIL PROTECTED] file="globals.jsp"
+%><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="Delete">
@@ -10,20 +10,24 @@
</cmscedit:head>
<mm:import externid="objectnumber" required="true"/>
+<mm:import externid="object_type" jspvar="object_type" required="true"/>
<mm:cloud jspvar="cloud" rank="basic user" loginpage="../login.jsp">
<body>
-
<mm:node referid="objectnumber">
<mm:nodeinfo type="type" jspvar="nodeType" write="false" />
<cmscedit:sideblock title="secondarydelete.${nodeType}.title"
titleClass="side_block_green">
<p><c:choose>
<c:when test="${nodeType eq 'images'}">
- <c:set var="object_type" value="images"
scope="request"/>
+ <c:set var="object_type" scope="request">
+ <c:out value="${(object_type != '' && object_type ==
'imagesupload')?'imagesupload':'images' }"/>
+ </c:set>
<fmt:message key="secondarydelete.field.title" />:
<b><mm:field name="title"/></b><br/>
<fmt:message
key="secondarydelete.field.filename" />: <b><mm:field name="filename"/></b>
</c:when>
<c:when test="${nodeType eq 'attachments'}">
- <c:set var="object_type" value="attachments"
scope="request"/>
+ <c:set var="object_type" scope="request">
+ <c:out value="${(object_type != '' && object_type ==
'attachmentsupload')?'attachmentsupload':'attachments' }"/>
+ </c:set>
<fmt:message key="secondarydelete.field.title" />:
<b><mm:field name="title"/></b><br/>
<fmt:message
key="secondarydelete.field.filename" />: <b><mm:field name="filename"/></b>
</c:when>
Index: imagesearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imagesearch.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- imagesearch.jsp 17 Sep 2008 06:04:33 -0000 1.7
+++ imagesearch.jsp 19 Sep 2008 02:25:02 -0000 1.8
@@ -1,8 +1,8 @@
-<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8"%>
-<[EMAIL PROTECTED] file="globals.jsp" %>
-<[EMAIL PROTECTED] import="java.util.Iterator,
- com.finalist.cmsc.mmbase.PropertiesUtil"%>
-<mm:content type="text/html" encoding="UTF-8" expires="0">
+<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8"
+%><[EMAIL PROTECTED] file="globals.jsp"
+%><[EMAIL PROTECTED] import="java.util.Iterator,
+ com.finalist.cmsc.mmbase.PropertiesUtil"
+%><mm:content type="text/html" encoding="UTF-8" expires="0">
<mm:import externid="mode" id="mode">search</mm:import>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
<html:html xhtml="true">
Index: imageupload.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imageupload.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- imageupload.jsp 8 Jul 2008 14:41:47 -0000 1.8
+++ imageupload.jsp 19 Sep 2008 02:25:02 -0000 1.9
@@ -1,8 +1,7 @@
-<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8"%>
-<[EMAIL PROTECTED] file="globals.jsp" %>
-<[EMAIL PROTECTED] import="com.finalist.util.http.BulkUploadUtil"%>
-<[EMAIL PROTECTED] import="java.util.List"%>
-<mm:content type="text/html" encoding="UTF-8" expires="0">
+<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8"
+%><[EMAIL PROTECTED] file="globals.jsp" %><[EMAIL PROTECTED]
import="com.finalist.util.http.BulkUploadUtil"
+%><[EMAIL PROTECTED] 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">
@@ -142,6 +141,13 @@
</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>
Index: urlsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/urlsearch.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- urlsearch.jsp 17 Sep 2008 06:04:33 -0000 1.9
+++ urlsearch.jsp 19 Sep 2008 02:25:02 -0000 1.10
@@ -1,7 +1,7 @@
-<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8"%>
-<[EMAIL PROTECTED] file="globals.jsp"%>
-<[EMAIL PROTECTED]
import="java.util.Iterator,com.finalist.cmsc.mmbase.PropertiesUtil"%>
-<mm:content type="text/html" encoding="UTF-8" expires="0">
+<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8"
+%><[EMAIL PROTECTED] file="globals.jsp"
+%><[EMAIL PROTECTED]
import="java.util.Iterator,com.finalist.cmsc.mmbase.PropertiesUtil"
+%><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="urls.title">
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
