Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory
james.mmbase.org:/tmp/cvs-serv4070/src/webapp/editors/newsletter/module
Modified Files:
newslettertermlist.jsp
Log Message:
CMSC-990,Redesign Newsletter: Subscribers & Terms tabs improve terms
management
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
See also: http://www.mmbase.org/jira/browse/CMSC-990
Index: newslettertermlist.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newslettertermlist.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- newslettertermlist.jsp 17 Jul 2008 03:04:50 -0000 1.1
+++ newslettertermlist.jsp 17 Jul 2008 06:26:39 -0000 1.2
@@ -8,7 +8,7 @@
<cmscedit:head title="newsletter.term.title">
<c:url var="actionUrl"
value="/editors/newsletter/module/NewsletterTermAction.do"/>
<c:url var="addUrl"
value="/editors/newsletter/module/NewsletterTermAction.do?method=addInit"/>
-<c:url var="userActionUrl" value="/editors/community/userAddInitAction.do"/>
+<c:url var="termUrl"
value="http://localhost/cmsc-community/editors/newsletter/NewsletterTermSearch.do?newsletterId=959"/>
<script src="../../repository/search.js" type="text/javascript"></script>
<script src="../../repository/content.js"
type="text/javascript"></script>
<script src="../../../js/prototype.js" type="text/javascript"></script>
@@ -31,7 +31,6 @@
url += "&id="+number+"&offset="+offset;
document.location = url;
}
-
}
function massDelete( confirmmessage) {
@@ -52,6 +51,7 @@
document.forms["termForm"].submit();
}
}
+
}
function postUpdate(originalRequest) {
@@ -68,8 +68,8 @@
</script>
</cmscedit:head>
<body>
- <mm:cloud jspvar="cloud" loginpage="../../editors/login.jsp">
-
+<mm:cloud jspvar="cloud" rank="basic user" loginpage="../../login.jsp">
+<mm:import externid="newsletterId"/>
<mm:import externid="action">search</mm:import><%-- either: search of select
--%>
<div class="tabs">
@@ -87,6 +87,7 @@
<html:form action="/editors/newsletter/module/NewsletterTermAction"
method="post">
<html:hidden property="method" value="list"/>
<html:hidden property="offset"/>
+ <mm:notpresent referid="newsletterId">
<table border="0">
<mm:hasrank minvalue="administrator">
<tr>
@@ -98,6 +99,7 @@
<td></td>
</tr>
</mm:hasrank>
+
<tr>
<td style="width: 80px"><fmt:message
key="newsletter.term.name" /></td>
<td><html:text style="width: 250px" property="name"/></td>
@@ -109,26 +111,42 @@
</td>
</tr>
</table>
+ </mm:notpresent>
</html:form>
</div>
-
+<mm:notpresent referid="newsletterId">
<div class="ruler_green"><div><fmt:message key="newsletter.term.search.result"
/></div></div>
+</mm:notpresent>
<div class="body">
+<mm:notpresent referid="newsletterId">
<form action="${actionUrl}" name="termForm">
<input type="hidden" name="method" value="delete"/>
<input type="hidden" name="deleteRequest" value=""/>
+</mm:notpresent>
+<mm:present referid="newsletterId">
+<form action="${termUrl}" name="termForm" method="post">
+<input type="hidden" name="newsletterId" value="${newsletterId}"/>
+</mm:present>
+
<mm:import jspvar="resultCount" vartype="Integer">${resultCount}</mm:import>
<mm:import externid="offset" jspvar="offset"
vartype="Integer">${offset}</mm:import>
<c:if test="${resultCount > 0}">
<[EMAIL PROTECTED] file="../../repository/searchpages.jsp" %>
+<mm:notpresent referid="newsletterId">
<c:if test="${fn:length(resultList) >1}">
<input type="button" class="button" value="<fmt:message
key="newsletter.term.action.delete" />" onclick="massDelete('<fmt:message
key="newsletter.term.delete.confirm" />')"/>
</c:if>
+</mm:notpresent>
+<mm:present referid="newsletterId">
+ <input type="submit" class="button" value="<fmt:message
key="newsletter.term.action.link" />" onclick="massDelete()"/>
+</mm:present>
<table>
<tr class="listheader">
<th> <input type="checkbox" name="selectall"
onclick="selectAll(this.checked, 'termForm', 'chk_');" value="on"/> </th>
<th><fmt:message key="newsletter.term.name.upper" /></th>
+ <mm:notpresent referid="newsletterId">
<th><fmt:message key="newsletter.term.action.upper" /></th>
+ </mm:notpresent>
</tr>
<tbody class="hover">
<c:set var="useSwapStyle">true</c:set>
@@ -136,26 +154,41 @@
<tr <c:if test="${useSwapStyle}">class="swap"</c:if>>
<td style="white-space:nowrap;">
<input type="checkbox" name="chk_<mm:field
name="number" />" id="chk_<mm:field name="number" />" value="<mm:field
name="number"/>">
+ <mm:notpresent referid="newsletterId">
<mm:hasrank
minvalue="administrator">
<a href="javascript:deleteInfo('<mm:field
name="number"/>','${offset}',${fn:length(resultList)})">
<img
src="../../gfx/icons/delete.png" title="<fmt:message
key="newsletter.term.action.delete" />"/></a>
</mm:hasrank>
+ </mm:notpresent>
</td>
- <td ><input type="text" name="key" id="name_<mm:field
name="number"/>" value="<mm:field name="name"/>"/>
+ <td >
+ <mm:notpresent referid="newsletterId">
+ <input type="text" name="key" id="name_<mm:field
name="number"/>" value="<mm:field name="name"/>"/>
+ </mm:notpresent>
+ <mm:present referid="newsletterId">
+ <mm:field name="name"/>
+ </mm:present>
</td>
+ <mm:notpresent referid="newsletterId">
<td>
<mm:hasrank minvalue="administrator">
<a href="javascript:update('<mm:field
name="number"/>')"><fmt:message key="newsletter.term.action.save" /></a>
</mm:hasrank>
</td>
+ </mm:notpresent>
</tr>
<c:set var="useSwapStyle">${!useSwapStyle}</c:set>
</mm:listnodes>
</tbody>
</table>
+ <mm:notpresent referid="newsletterId">
<c:if test="${fn:length(resultList) >1}">
<input type="button" class="button" value="<fmt:message
key="newsletter.term.action.delete" />" onclick="massDelete('<fmt:message
key="newsletter.term.delete.confirm" />')"/>
</c:if>
+ </mm:notpresent>
+ <mm:present referid="newsletterId">
+ <input type="submit" class="button" value="<fmt:message
key="newsletter.term.action.link" />" onclick="massDelete()"/>
+</mm:present>
</c:if>
</form>
</div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
