Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory james.mmbase.org:/tmp/cvs-serv9820
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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- newslettertermlist.jsp 18 Jul 2008 05:14:59 -0000 1.4
+++ newslettertermlist.jsp 18 Jul 2008 07:11:47 -0000 1.5
@@ -8,20 +8,21 @@
<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"/>
- <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>
- <script type="text/javascript">
- function update(number) {
+<c:url var="termUrl" value="/editors/newsletter/NewsletterTermSearch.do"/>
+<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>
+<script type="text/javascript">
+function update(number) {
var myAjax = new Ajax.Request(
'${actionUrl}',
{
parameters:"method=modify&id="+number+"&name="+document.getElementById("name_"+number).value,
onComplete: postUpdate
}
);
- }
+}
- function deleteInfo(number,offset,resultLength) {
+function deleteInfo(number,offset,resultLength) {
if(confirm('<fmt:message key="newsletter.term.delete.confirm" />')) {
if(resultLength == "1") {
offset = eval(offset -1);
@@ -30,9 +31,9 @@
url += "&id="+number+"&offset="+offset;
document.location = url;
}
- }
+}
- function massDelete( confirmmessage) {
+function massDelete( confirmmessage) {
if (confirmmessage) {
if (confirm(confirmmessage)) {
var checkboxs = document.getElementsByTagName("input");
@@ -51,9 +52,9 @@
}
}
- }
+}
- function postUpdate(originalRequest) {
+function postUpdate(originalRequest) {
alert(originalRequest.responseText)
var responseTxt = originalRequest.responseText;
if(responseTxt == "term.modify.success") {
@@ -62,27 +63,29 @@
else if(responseTxt == "term.exist") {
alert('<fmt:message key="newsletter.term.exist" />');
}
- }
+}
- </script>
+</script>
</cmscedit:head>
- <body>
+<body>
<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">
- <div class="tab_active">
- <div class="body">
+<div class="tab_active">
+<div class="body">
<div>
<a href="#"><fmt:message key="newsletter.term.title" /></a>
</div>
- </div>
- </div>
+</div>
+</div>
</div>
<div class="editor" style="height:500px">
- <html:form action="/editors/newsletter/module/NewsletterTermAction"
method="post">
- <html:hidden property="method" value="list"/>
+<html:form action="/editors/newsletter/module/NewsletterTermAction"
method="post">
+<html:hidden property="method" value="list"/>
<html:hidden property="offset"/>
+ <mm:notpresent referid="newsletterId">
<mm:hasrank minvalue="administrator">
<p>
<a href="${addUrl}" style="background:url(<cmsc:staticurl
page='/editors/gfx/icons/new.png'/>) left
no-repeat;padding-left:20px;"><fmt:message key="newsletter.term.add" />
@@ -103,25 +106,40 @@
</td>
</tr>
</table>
- </html:form>
+ </mm:notpresent>
+</html:form>
+<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" />')"/>
+<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>
@@ -129,41 +147,54 @@
<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 >
+ <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>
- <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>
- </c:if>
- </form>
+<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>
<c:if test="${resultCount == 0}">
- <fmt:message key="newsletter.term.noresult" />
+<fmt:message key="newsletter.term.noresult" />
</c:if>
<c:if test="${isAddSuccess != null}">
- <fmt:message key="newsletter.term.add.success" />
+<fmt:message key="newsletter.term.add.success" />
</c:if>
<c:if test="${resultCount > 0}">
- <[EMAIL PROTECTED] file="../../repository/searchpages.jsp" %>
+<[EMAIL PROTECTED] file="../../repository/searchpages.jsp" %>
</c:if>
</mm:cloud>
- </body>
+</body>
</html:html>
</mm:content>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
