Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory james.mmbase.org:/tmp/cvs-serv2858/webapp/editors/newsletter/module
Modified Files:
newslettertermadd.jsp 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: newslettertermadd.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newslettertermadd.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- newslettertermadd.jsp 18 Jul 2008 05:14:59 -0000 1.2
+++ newslettertermadd.jsp 22 Jul 2008 03:16:06 -0000 1.3
@@ -54,9 +54,9 @@
<tr>
<td> </td>
<td>
- <input type="submit" name="submitButton" onclick="add();"
+ <input type="button" name="submitButton" onclick="add();"
value="<fmt:message key="newsletter.term.action.save"
/>"/><c:forEach var="space" begin="1" end="10" step="1"> </c:forEach>
- <input type="submit" name="submitButton"
onclick="cancel();"
+ <input type="button" name="submitButton"
onclick="cancel();"
value="<fmt:message key="newsletter.term.action.cancel" />"/>
</td>
</tr>
Index: newslettertermlist.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newslettertermlist.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- newslettertermlist.jsp 21 Jul 2008 05:49:02 -0000 1.6
+++ newslettertermlist.jsp 22 Jul 2008 03:16:06 -0000 1.7
@@ -10,6 +10,7 @@
<c:url var="addUrl"
value="/editors/newsletter/module/NewsletterTermAction.do?method=addInit"/>
<c:url var="termUrl" value="/editors/newsletter/NewsletterTermsAddAction.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 src="../newsletter.js" type="text/javascript"></script>
<script type="text/javascript">
@@ -27,6 +28,9 @@
if(resultLength == "1") {
offset = eval(offset -1);
}
+ if(offset < 0) {
+ offset = 0;
+ }
var url = "${actionUrl}?method=delete";
url += "&id="+number+"&offset="+offset;
document.location = url;
@@ -34,7 +38,6 @@
}
function postUpdate(originalRequest) {
- alert(originalRequest.responseText)
var responseTxt = originalRequest.responseText;
if(responseTxt == "term.modify.success") {
alert('<fmt:message key="newsletter.term.update.success" />');
@@ -64,30 +67,29 @@
<html:form action="/editors/newsletter/module/NewsletterTermAction"
method="post">
<html:hidden property="method" value="list"/>
<html:hidden property="offset"/>
- <input type="hidden" name="newsletterId" value="${newsletterId}"/>
+ <input type="hidden" name="newsletter" value="${newsletterId}"/>
<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" />
</a>
</p>
-
</mm:hasrank>
+ </mm:notpresent>
<table border="0" style="padding-left:10px;">
-
<tr>
<td style="width: 80px"><fmt:message key="newsletter.term.name"
/></td>
<td><html:text size="20" property="name"/></td>
</tr>
<tr>
<td></td>
- <td><input type="submit" name="submitButton" onclick="setOffset(0);"
+ <td>
+ <input type="submit" name="submitButton" onclick="setOffset(0);"
value="<fmt:message key="newsletter.term.search" />"/>
</td>
</tr>
</table>
- </mm:notpresent>
+
</html:form>
<mm:notpresent referid="newsletterId">
<div class="ruler_green"><div><fmt:message key="newsletter.term.search.result"
/></div></div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
