Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory james.mmbase.org:/tmp/cvs-serv9993/webapp/editors/newsletter/module
Modified Files:
report_publication_edit.jsp report_publication_search.jsp
report_publication_statistic.jsp
report_publication_subscribers.jsp
report_publication_terms.jsp
Log Message:
CMSC-990 change all part using ui tag
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: 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- report_publication_edit.jsp 27 Jul 2008 07:38:09 -0000 1.2
+++ report_publication_edit.jsp 28 Jul 2008 14:46:13 -0000 1.3
@@ -47,60 +47,28 @@
<div class="editor">
<div class="ruler_green"><div> <fmt:message
key="newsletter.publication.result"/> </div></div>
<div class="body">
- <mm:import externid="results" jspvar="nodeList" vartype="List" />
- <mm:import externid="resultCount" jspvar="resultCount"
vartype="Integer"/>
- <mm:import externid="offset" jspvar="offset" vartype="Integer"/>
- <c:if test="${resultCount > 0}">
- <[EMAIL PROTECTED] file="../../repository/searchpages.jsp" %>
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <thead>
- <th width="15%"> </th>
- <th width="20%">
- <a href="javascript:orderBy('title');">
- <fmt:message
key="newsletter.publication.result.title"/>
- </a>
- </th>
- <th width="20%">
- <a href="javascript:orderBy('subject');">
- <fmt:message
key="newsletter.publication.result.subject"/>
- </a>
- </th>
- <th width="15%">
- <a href="javascript:orderBy('lastmodifier');">
- <fmt:message
key="newsletter.publication.result.lastmodifier"/>
- </a>
- </th>
- <th width="30%">
- <a href="javascript:orderBy('lastmodifieddate');">
- <fmt:message
key="newsletter.publication.result.modificationdate"/>
- </a>
- </th>
- </thead>
- <c:forEach items="${results}" var="result">
- <tr>
- <td width="15%">
+ <edit:ui-table items="${results}" var="result" size="${resultCount}"
requestURI="/editors/newsletter/NewsletterPublicationManagement.do">
+ <edit:ui-tcolumn title="" width="15%">
<a
href="../site/NavigatorPanel.do?nodeId=${result.id}"><img src="<cmsc:staticurl
page='/editors/gfx/icons/edit.gif'/>" width="16" height="16"
title="<fmt:message key='newsletter.icons.title.editproperty'/>"></a>
<a
href="../newsletter/NewsletterPublicationEdit.do?number=${result.id}&parent=${requestScope.newsletterId}&forward=publicationedit"><img
src="<cmsc:staticurl page='/editors/gfx/icons/edit_defaults.png'/>" width="16"
height="16" title="<fmt:message key='site.newsletterpublication.edit'/>"></a>
<a
href="../newsletter/NewsletterPublicationDelete.do?number=${result.id}&parent=${requestScope.newsletterId}&forward=publicationedit"><img
src="<cmsc:staticurl page='/editors/gfx/icons/delete.png'/>" width="16"
height="16" title="<fmt:message key='site.newsletterpublication.remove'/>"></a>
<a
href="../newsletter/NewsletterPublicationTest.do?number=${result.id}&forward=publicationedit&newsletterId=${requestScope.newsletterId}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/type/email_go.png'/>" width="16"
height="16" title="<fmt:message key='newsletter.icons.title.sendemail'/>"></a>
<a
href="../newsletter/NewsletterPublicationPublish.do?number=${result.id}&forward=publicationedit&newsletterId=${requestScope.newsletterId}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/type/email_error.png'/>"
width="16" height="16" title="<fmt:message
key='newsletter.icons.title.sendpublication'/>"></a>
<a
href="../usermanagement/pagerights.jsp?number=${result.id}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/rights.png'/>" width="16"
height="16" title="<fmt:message key='newsletter.icons.title.userright'/>"></a>
- </td>
- <td width="20%" >${result.title}</td>
- <td width="20%" >${result.subject}</td>
- <td width="15%" >${result.lastmodifier}</td>
- <td width="30%" >${result.lastmodifieddate}</td>
- </tr>
- </c:forEach>
- </table>
- </c:if>
-
- <c:if test="${resultCount == 0}">
- <fmt:message key="newsletter.publication.noresult"/>
- </c:if>
- <c:if test="${resultCount > 0}">
- <[EMAIL PROTECTED] file="../../repository/searchpages.jsp" %>
- </c:if>
+ </edit:ui-tcolumn>
+ <edit:ui-tcolumn titlekey="newsletter.publication.result.title"
sort="title" width="25%">
+ ${result.title}
+ </edit:ui-tcolumn>
+ <edit:ui-tcolumn titlekey="newsletter.publication.result.subject"
sort="subject" width="20%">
+ ${result.subject}
+ </edit:ui-tcolumn>
+ <edit:ui-tcolumn
titlekey="newsletter.publication.result.lastmodifier" sort="lastmodifier"
width="20%">
+ ${result.lastmodifier}
+ </edit:ui-tcolumn>
+ <edit:ui-tcolumn
titlekey="newsletter.publication.result.modificationdate"
sort="lastmodifieddate" width="20%">
+ ${result.lastmodifieddate}
+ </edit:ui-tcolumn>
+ </edit:ui-table>
</div>
</div>
</body>
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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- report_publication_search.jsp 24 Jul 2008 09:04:16 -0000 1.2
+++ report_publication_search.jsp 28 Jul 2008 14:46:13 -0000 1.3
@@ -1,7 +1,4 @@
<input type="hidden" name="newsletterId" value="${requestScope.newsletterId}"/>
-<input type="hidden" name="order" value="${requestScope.order}"/>
-<input type="hidden" name="direction" value="${requestScope.direction}"/>
-<input type="hidden" name="offset" value="0"/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="5%"><fmt:message
key="newsletter.publication.search.title"/></td>
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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- report_publication_statistic.jsp 27 Jul 2008 07:38:09 -0000 1.4
+++ report_publication_statistic.jsp 28 Jul 2008 14:46:13 -0000 1.5
@@ -35,64 +35,28 @@
<div class="editor">
<div class="ruler_green"><div> <fmt:message
key="newsletter.publication.result"/> </div></div>
<div class="body">
- <mm:import externid="results" jspvar="nodeList" vartype="List" />
- <mm:import externid="resultCount" jspvar="resultCount"
vartype="Integer"/>
- <mm:import externid="offset" jspvar="offset" vartype="Integer"/>
- <c:if test="${resultCount > 0}">
- <[EMAIL PROTECTED] file="../../repository/searchpages.jsp" %>
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <thead>
- <th width="5%"> </th>
- <th width="15%">
- <a href="javascript:orderBy('title');" >
- <fmt:message
key="newsletter.publication.result.publication"/>
- </a>
- </th>
- <th width="15%">
- <a href="javascript:orderBy('publishdate');" >
- <fmt:message key="newsletter.publication.result.sentat"/>
- </a>
- </th>
- <th width="15%">
- <a href="javascript:orderBy('subscriptions');" >
- <fmt:message
key="newsletter.publication.result.subscriptions"/>
- </a>
- </th>
- <th width="15%">
- <fmt:message
key="newsletter.publication.result.sentsuccess"/>
- </th>
- <th width="35%">
- <a href="javascript:orderBy('bounced');" >
- <fmt:message
key="newsletter.publication.result.bounced"/>
- </a>
- </th>
- </thead>
- <c:forEach items="${results}" var="result">
- <tr>
- <td width="5%">
- <a
href="../newsletter/NewsletterPublicationDelete.do?number=${result.id}&parent=${requestScope.newsletterId}&forward=newsletterstatistics">
- <img src="<cmsc:staticurl
page='/editors/gfx/icons/delete.png'/>" width="16" height="16"
title="<fmt:message key='site.newsletterpublication.remove'/>"/>
- </a>
- </td>
- <td width="15%" >
+ <edit:ui-table items="${results}" var="result" size="${resultCount}"
requestURI="/editors/newsletter/NewsletterPublicationStatisticSearch.do">
+ <edit:ui-tcolumn title="" width="5%">
+ <a
href="../newsletter/NewsletterPublicationDelete.do?number=${result.id}&parent=${requestScope.newsletterId}&forward=newsletterstatistics"><img
src="<cmsc:staticurl page='/editors/gfx/icons/delete.png'/>" width="16"
height="16" title="<fmt:message key='site.newsletterpublication.remove'/>"/></a>
+ </edit:ui-tcolumn>
+ <edit:ui-tcolumn
titlekey="newsletter.publication.result.publication" sort="title" width="15%">
<a
href="../newsletter/NewsletterPublicationEdit.do?number=${result.id}&parent=${requestScope.newsletterId}&forward=newsletterstatistics"
title="<fmt:message key='site.newsletterpublication.edit'/>">
${result.title}
</a>
- </td>
- <td width="15%" >${result.sendtime}</td>
- <td width="15%" >${result.subscriptions}</td>
- <td width="15%" >${result.sendsuccessful}</td>
- <td width="35%">${result.bounced}</td>
- </tr>
- </c:forEach>
- </table>
- </c:if>
- <c:if test="${resultCount == 0}">
- <fmt:message key="newsletter.publication.noresult"/>
- </c:if>
- <c:if test="${resultCount > 0}">
- <[EMAIL PROTECTED] file="../../repository/searchpages.jsp" %>
- </c:if>
+ </edit:ui-tcolumn>
+ <edit:ui-tcolumn titlekey="newsletter.publication.result.sentat"
sort="publishdate" width="15%">
+ ${result.sendtime}
+ </edit:ui-tcolumn>
+ <edit:ui-tcolumn
titlekey="newsletter.publication.result.subscriptions" sort="subscriptions"
width="15%">
+ ${result.subscriptions}
+ </edit:ui-tcolumn>
+ <edit:ui-tcolumn
titlekey="newsletter.publication.result.sentsuccess" width="15%">
+ ${result.sendsuccessful}
+ </edit:ui-tcolumn>
+ <edit:ui-tcolumn titlekey="newsletter.publication.result.bounced"
sort="bounced" width="35%">
+ ${result.bounced}
+ </edit:ui-tcolumn>
+ </edit:ui-table>
</div>
</div>
</body>
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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- report_publication_subscribers.jsp 27 Jul 2008 07:38:09 -0000 1.4
+++ report_publication_subscribers.jsp 28 Jul 2008 14:46:13 -0000 1.5
@@ -26,7 +26,7 @@
<div class="editor">
<div style="padding-left:10px;">
<p>
- <a href="#" style=" padding-left:20px; background:
url(<cmsc:staticurl page='/editors/gfx/icons/type/email_add.png'/>) left center
no-repeat" title="<fmt:message
key='newsletter.publication.link.newsubscriber'/>">
+ <a
href="../community/SearchConditionalUser.do?newsletterId=${requestScope.newsletterId}&method=subscribeNewsletters"
style=" padding-left:20px; background: url(<cmsc:staticurl
page='/editors/gfx/icons/type/email_add.png'/>) left center no-repeat"
title="<fmt:message key='newsletter.publication.link.newsubscriber'/>">
<fmt:message key="newsletter.publication.link.newsubscriber"/>
</a>
</p>
@@ -74,7 +74,7 @@
<edit:ui-table items="${results}" var="result" size="${resultCount}"
requestURI="/editors/newsletter/NewsletterPublicationSubscriberSearch.do">
<edit:ui-tcolumn title="" width="5%">
<a
href="../community/userAddInitAction.do?authid=${result.id}&newsletterId=${requestScope.newsletterId}&forward=newslettersubscribers"><img
src="<cmsc:staticurl page='/editors/gfx/icons/edit_defaults.png'/>" width="16"
height="16" title="<fmt:message key='newsletter.icons.title.edituser'/>"/></a>
- <a
href="NewsletterNewsletterSubscriberDelete.do?newsletterId=${requestScope.newsletterId}&authid=${result.id}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/delete.png'/>" width="16"
height="16" title="<fmt:message
key='newsletter.icons.title.user.unsubscribe'/>"/></a>
+ <a
href="NewsletterSubscriberDelete.do?newsletterId=${requestScope.newsletterId}&authid=${result.id}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/delete.png'/>" width="16"
height="16" title="<fmt:message
key='newsletter.icons.title.user.unsubscribe'/>"/></a>
</edit:ui-tcolumn>
<edit:ui-tcolumn titlekey="newsletter.publication.result.fullname"
sort="fullname" width="20%">
${result.fullname}
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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- report_publication_terms.jsp 27 Jul 2008 07:38:09 -0000 1.4
+++ report_publication_terms.jsp 28 Jul 2008 14:46:13 -0000 1.5
@@ -41,9 +41,6 @@
<td>
<input type="submit" value="Search"/>
<input type="hidden" name="newsletterId"
value="${requestScope.newsletterId}"/>
- <input type="hidden" name="order"
value="${requestScope.order}"/>
- <input type="hidden" name="direction"
value="${requestScope.direction}"/>
- <input type="hidden" name="offset" value="0"/>
</td>
</tr>
</table>
@@ -52,33 +49,19 @@
</div>
</div>
- <div class="editor" style="height:455px">
- <div class="ruler_green"><div> <fmt:message
key="newsletter.publication.result"/> </div></div>
+ <div class="editor">
+ <div class="ruler_green">
+ <div> <fmt:message
key="newsletter.publication.result"/> </div>
+ </div>
<div class="body">
- <mm:import externid="results" jspvar="nodeList" vartype="List" />
- <mm:import externid="resultCount" jspvar="resultCount"
vartype="Integer">0</mm:import>
- <mm:import externid="offset" jspvar="offset" vartype="Integer"/>
- <c:if test="${resultCount > 0}">
- <[EMAIL PROTECTED] file="../../repository/searchpages.jsp" %>
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <thead>
- <th width="5%"> </th>
- <th scope="95%"><a
href="javascript:orderBy('name');"><fmt:message
key="newsletter.publication.search.link.name"/></a></th>
- </thead>
- <c:forEach items="${results}" var="result">
- <tr>
- <td><a
href="../../editors/newsletter/NewsletterTermDelete.do?newsletterId=${requestScope.newsletterId}&termId=${result.id}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/delete.png'/>" width="16"
height="16" title="<fmt:message
key='newsletter.icons.title.term.unlink'/>"></a></td>
- <td>${result.name}</td>
- </tr>
- </c:forEach>
- </table>
- </c:if>
- <c:if test="${resultCount == 0}">
- <fmt:message key="newsletter.publication.noresult"/>
- </c:if>
- <c:if test="${resultCount > 0}">
- <[EMAIL PROTECTED] file="../../repository/searchpages.jsp" %>
- </c:if>
+ <edit:ui-table items="${results}" var="result" size="${resultCount}"
requestURI="/editors/newsletter/NewsletterTermSearch.do">
+ <edit:ui-tcolumn title="" width="5%">
+ <a
href="../../editors/newsletter/NewsletterTermDelete.do?newsletterId=${requestScope.newsletterId}&termId=${result.id}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/delete.png'/>" width="16"
height="16" title="<fmt:message key='newsletter.icons.title.term.unlink'/>"></a>
+ </edit:ui-tcolumn>
+ <edit:ui-tcolumn
titlekey="newsletter.publication.search.link.name" sort="name" width="95%">
+ ${result.name}
+ </edit:ui-tcolumn>
+ </edit:ui-table>
</div>
</div>
</body>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
