Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory
james.mmbase.org:/tmp/cvs-serv25864/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
Modified Files:
newslettertermadd.jsp newslettertermlist.jsp
report_newsletter_list.jsp report_newsletter_subscriptions.jsp
report_publication_edit.jsp report_publication_search.jsp
report_publication_statistic.jsp
report_publication_subscribers.jsp
report_publication_terms.jsp report_subscriber_list.jsp
report_subscriber_subscriptions.jsp
Log Message:
CMSC-899 change list style of newsletter &&workflow
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-899
Index: newslettertermadd.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newslettertermadd.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- newslettertermadd.jsp 22 Jul 2008 03:16:06 -0000 1.3
+++ newslettertermadd.jsp 5 Sep 2008 06:24:50 -0000 1.4
@@ -21,9 +21,7 @@
</cmscedit:head>
<body>
<mm:cloud jspvar="cloud" loginpage="../../editors/login.jsp">
-
-<mm:import externid="action">search</mm:import><%-- either: search of select
--%>
-
+ <mm:import externid="action">search</mm:import><%-- either: search of
select --%>
<div class="tabs">
<div class="tab_active">
<div class="body">
@@ -34,16 +32,15 @@
</div>
</div>
- <div class="editor" style="height:500px;padding-left:10px;">
- <div style="height:20px"></div>
+ <div class="editor">
+ <div class="body">
<html:form action="/editors/newsletter/module/NewsletterTermAction"
method="post">
<html:hidden property="method" value="add"/>
<html:hidden property="offset" value="0"/>
<table border="0" >
-
<tr>
- <td><fmt:message key="newsletter.term.name" /></td>
- <td><html:text style="width: 250px" property="name"/>
+ <td width="110px"><fmt:message key="newsletter.term.name"
/></td>
+ <td><html:text style="width: 150px" property="name"/>
<logic:messagesPresent message="true">
<html:messages id="msg" message="true" bundle="newsletter">
<bean:write name="msg"/> <br/>
@@ -54,16 +51,16 @@
<tr>
<td> </td>
<td>
- <input type="button" name="submitButton" onclick="add();"
+ <input type="submit" 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="button" name="submitButton"
onclick="cancel();"
+ <input type="submit" name="submitButton"
onclick="cancel();"
value="<fmt:message key="newsletter.term.action.cancel" />"/>
</td>
</tr>
</table>
-
</html:form>
</div>
+ </div>
</mm:cloud>
</body>
Index: newslettertermlist.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/newslettertermlist.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- newslettertermlist.jsp 31 Jul 2008 10:56:31 -0000 1.10
+++ newslettertermlist.jsp 5 Sep 2008 06:24:50 -0000 1.11
@@ -65,6 +65,7 @@
</div>
</div>
<div class="editor" style="height:500px">
+<div class="body">
<html:form action="/editors/newsletter/module/NewsletterTermAction"
method="post">
<html:hidden property="method" value="list"/>
<input type="hidden" name="id" id="id" value=""/>
@@ -81,19 +82,18 @@
</mm:notpresent>
<table border="0" style="padding-left:10px;">
<tr>
- <td style="width: 80px"><fmt:message key="newsletter.term.name"
/></td>
+ <td style="width: 110px"><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);"
- value="<fmt:message key="newsletter.term.search" />"/>
+ <input type="submit" name="submitButton" onclick="setOffset(0);"
value="<fmt:message key="newsletter.term.search" />"/>
</td>
</tr>
</table>
-
</html:form>
+</div>
<div class="ruler_green"><div><fmt:message key="newsletter.term.search.result"
/></div></div>
<div class="body">
<mm:notpresent referid="newsletterId" >
Index: report_newsletter_list.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_list.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- report_newsletter_list.jsp 12 Aug 2008 11:00:44 -0000 1.8
+++ report_newsletter_list.jsp 5 Sep 2008 06:24:50 -0000 1.9
@@ -18,11 +18,11 @@
<input type="hidden" name="action" value="newsletterOverview"/>
<table border="0">
<tr>
- <td style="width:100px;"><fmt:message
key="newspubform.title"/></td>
- <td><input type="text" name="title" value="${param.title}"
style="width: 200px"/></td>
+ <td style="width:110px;"><fmt:message
key="newspubform.title"/></td>
+ <td><input type="text" name="title" value="${param.title}"
style="width: 150px"/></td>
</tr>
<tr>
- <td style="width:100px;"></td>
+ <td></td>
<td><input type="submit" name="submitButton"
value="<fmt:message key='newspubform.submit'/>"/></td>
</tr>
</table>
Index: report_newsletter_subscriptions.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_subscriptions.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- report_newsletter_subscriptions.jsp 12 Aug 2008 11:00:44 -0000 1.9
+++ report_newsletter_subscriptions.jsp 5 Sep 2008 06:24:50 -0000 1.10
@@ -20,7 +20,7 @@
<input type="hidden" name="newsletterId"
value="${param.newsletterId}"/>
<table>
<tr>
- <td style="width: 100px"><fmt:message
key="subscriptiondetail.fullname"/></td>
+ <td style="width: 110px"><fmt:message
key="subscriptiondetail.fullname"/></td>
<td><input type="text" name="name" value="${param.name}"
style="width: 200px"/></td>
</tr>
<tr>
Index: report_publication_edit.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- report_publication_edit.jsp 5 Aug 2008 10:53:12 -0000 1.5
+++ report_publication_edit.jsp 5 Sep 2008 06:24:50 -0000 1.6
@@ -25,7 +25,7 @@
</edit:ui-tabs>
<div class="editor">
- <div style="padding-left:10px;">
+ <div class="body">
<p>
<a class="addemail"
href="../newsletter/NewsletterPublicationCreate.do?parent=${requestScope.newsletterId}©content=false&forward=newslettermanage"
title="<fmt:message key='site.newsletterpublication.new.blank'/>">
<fmt:message key="site.newsletterpublication.new.blank"/>
@@ -36,8 +36,7 @@
<fmt:message key="site.newsletterpublication.new.withcontent"/>
</a>
</p>
- </div>
- <div style="padding-left:10px;">
+
<html:form
action="editors/newsletter/NewsletterPublicationManagement.do">
<input type="hidden" name="method" value="searchPublication"/>
<[EMAIL PROTECTED] file="report_publication_search.jsp"%>
Index: report_publication_search.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_search.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- report_publication_search.jsp 28 Jul 2008 14:46:13 -0000 1.3
+++ report_publication_search.jsp 5 Sep 2008 06:24:50 -0000 1.4
@@ -1,10 +1,10 @@
<input type="hidden" name="newsletterId" value="${requestScope.newsletterId}"/>
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
+<table border="0" cellspacing="0" cellpadding="0">
<tr>
- <td width="5%"><fmt:message
key="newsletter.publication.search.title"/></td>
- <td width="10%"><html:text property="title" size="30"/></td>
- <td width="10%" align="center"><fmt:message
key="newsletter.publication.search.fromperiod"/>:</td>
- <td width="75%">
+ <td width="110px"><fmt:message
key="newsletter.publication.search.title"/></td>
+ <td width="150px"><html:text property="title" size="30"/></td>
+ <td width="100px" align="center"><fmt:message
key="newsletter.publication.search.fromperiod"/>:</td>
+ <td>
<html:select property="period">
<html:option value="0"
key="newsletter.publication.search.period.all" bundle="newsletter"/>
<html:option value="1"
key="newsletter.publication.search.period.lastday" bundle="newsletter"/>
Index: report_publication_statistic.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_statistic.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- report_publication_statistic.jsp 12 Aug 2008 11:00:44 -0000 1.6
+++ report_publication_statistic.jsp 5 Sep 2008 06:24:50 -0000 1.7
@@ -23,8 +23,7 @@
</edit:ui-tabs>
<div class="editor">
- <br/>
- <div class="body" style="padding-left:10px;">
+ <div class="body">
<html:form
action="editors/newsletter/NewsletterPublicationStatisticSearch.do">
<input type="hidden" name="method"
value="searchPublicationStatistic"/>
<[EMAIL PROTECTED] file="report_publication_search.jsp"%>
Index: report_publication_subscribers.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- report_publication_subscribers.jsp 5 Aug 2008 10:53:12 -0000 1.7
+++ report_publication_subscribers.jsp 5 Sep 2008 06:24:50 -0000 1.8
@@ -25,35 +25,35 @@
</edit:ui-tabs>
<div class="editor">
- <div style="padding-left:10px;">
- <p>
+ <div class="body">
+ <div style="padding-left:10px">
<c:url var="newsubscriberlink"
value="/editors/community/SearchConditionalUser.do">
<c:param name="newsletterId" value="${requestScope.newsletterId}"/>
<c:param name="method" value="searchCandidateSubscriber"/>
</c:url>
+ <c:url var="newuserlink"
value="/editors/community/userAddInitAction.do">
+ <c:param name="newsletterId"
value="${requestScope.newsletterId}"/>
+ <c:param name="forward" value="newslettersubscription"/>
+ </c:url>
+ <p>
<a class="addemail" href="${newsubscriberlink}" title="<fmt:message
key='newsletter.publication.link.newsubscriber'/>">
<fmt:message key="newsletter.publication.link.newsubscriber"/>
</a>
</p>
<p>
- <c:url var="newuserlink"
value="/editors/community/userAddInitAction.do">
- <c:param name="newsletterId" value="${requestScope.newsletterId}"/>
- <c:param name="forward" value="newslettersubscription"/>
- </c:url>
<a class="addemail" href="${newuserlink}" title="<fmt:message
key='newsletter.publication.link.newuser'/>">
<fmt:message key="newsletter.publication.link.newuser"/>
</a>
</p>
</div>
- <div style="padding-left:10px;">
<html:form
action="editors/newsletter/NewsletterPublicationSubscriberSearch.do">
<input type="hidden" name="method" value="subScriberSearch"/>
<input type="hidden" name="newsletterId"
value="${requestScope.newsletterId}"/>
- <table width="50%" border="0" cellspacing="0" cellpadding="0">
+ <table border="0" cellspacing="0" cellpadding="0">
<tr>
- <td width="25%"><fmt:message
key="newsletter.publication.result.fullname"/></td>
- <td width="75%">
+ <td width="110px"><fmt:message
key="newsletter.publication.result.fullname"/></td>
+ <td>
<html:text property="fullname" size="30"/>
</td>
</tr>
Index: report_publication_terms.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_terms.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- report_publication_terms.jsp 1 Aug 2008 11:07:56 -0000 1.6
+++ report_publication_terms.jsp 5 Sep 2008 06:24:50 -0000 1.7
@@ -26,19 +26,20 @@
<div class="editor">
<div style="padding-left:10px;">
- <p>
+
+ </div>
+
+ <div class="body">
+ <div style="padding-left:10px">
<a class="addemail"
href="module/NewsletterTermAction.do?method=list&newsletterId=${requestScope.newsletterId}"
title="<fmt:message key='newsletter.publication.search.linkterm'/>">
<fmt:message key="newsletter.publication.search.linkterm"/>
</a>
- </p>
</div>
-
- <div style="padding-left:10px;">
<form method="post"
action="NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId}">
<table width="50%" border="0" cellspacing="0" cellpadding="0">
<tr>
- <td><fmt:message
key="newsletter.publication.search.link.name"/></td>
- <td><input type="text" name="name" size="30"/></td>
+ <td width="110px"><fmt:message
key="newsletter.publication.search.link.name"/></td>
+ <td width="150px"><input type="text" name="name" size="30"
width="150px"/></td>
<td>
<input type="submit" value="Search"/>
<input type="hidden" name="newsletterId"
value="${requestScope.newsletterId}"/>
Index: report_subscriber_list.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_subscriber_list.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- report_subscriber_list.jsp 12 Aug 2008 11:00:44 -0000 1.8
+++ report_subscriber_list.jsp 5 Sep 2008 06:24:50 -0000 1.9
@@ -19,12 +19,12 @@
<input type="hidden" name="action" value="listSubscribers"/>
<table>
<tr>
- <td style="width:100px;"><fmt:message
key="subscriptiondetail.fullname"/></td>
- <td><input type="text" name="name" value="${param.name}"
style="width: 200px"/></td>
+ <td style="width:110px;"><fmt:message
key="subscriptiondetail.fullname"/></td>
+ <td><input type="text" name="name" value="${param.name}"
style="width: 150px"/></td>
</tr>
<tr>
<td><fmt:message key="subscriptiondetail.emailaddress"/></td>
- <td><input type="text" name="email" value="${param.email}"
style="width: 200px"/></td>
+ <td><input type="text" name="email" value="${param.email}"
style="width: 150px"/></td>
</tr>
<tr>
<td></td>
Index: report_subscriber_subscriptions.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_subscriber_subscriptions.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- report_subscriber_subscriptions.jsp 12 Aug 2008 11:00:44 -0000 1.7
+++ report_subscriber_subscriptions.jsp 5 Sep 2008 06:24:50 -0000 1.8
@@ -21,8 +21,8 @@
<input type="hidden" name="subsriberId"
value="${requestScope.subsriberId}"/>
<table border="0">
<tr>
- <td style="width: 100px"><fmt:message
key="newspubform.title"/></td>
- <td><input type="text" name="title"
value="${param.title}" style="width: 200px"/></td>
+ <td style="width: 110px"><fmt:message
key="newspubform.title"/></td>
+ <td><input type="text" name="title"
value="${param.title}" style="width: 150px"/></td>
</tr>
<tr>
<td></td>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
