Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory
james.mmbase.org:/tmp/cvs-serv18989/src/webapp/editors/newsletter/module
Modified Files:
report_publication_edit.jsp report_publication_statistic.jsp
report_publication_subscribers.jsp
report_publication_terms.jsp
Removed Files:
report_term_list.jsp
Log Message:
CMSC-990 replace subscriber parts : showing,paging with ui tags
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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- report_publication_edit.jsp 24 Jul 2008 09:04:16 -0000 1.1
+++ report_publication_edit.jsp 27 Jul 2008 07:38:09 -0000 1.2
@@ -1,5 +1,6 @@
<[EMAIL PROTECTED] file="globals.jsp"
-%><%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
+%><%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc"
+%><%@ taglib prefix="edit" tagdir="/WEB-INF/tags/edit" %>
<mm:content type="text/html" encoding="UTF-8" expires="0">
<html:html>
<cmscedit:head title="index.title">
@@ -7,42 +8,20 @@
</cmscedit:head>
<body>
- <div class="tabs">
- <div class="tab_active">
- <div class="body">
- <div>
- <a href="#"><fmt:message
key="newsletter.publication.tabs.edit"/></a>
- </div>
- </div>
- </div>
- <div class="tab">
- <div class="body">
- <div>
- <a
href="NewsletterPublicationStatisticSearch.do?newsletterId=${requestScope.newsletterId}">
- <fmt:message key="newsletter.publication.tabs.statistics"/>
- </a>
- </div>
- </div>
- </div>
- <div class="tab">
- <div class="body">
- <div>
- <a
href="NewsletterPublicationSubscriberSearch.do?newsletterId=${requestScope.newsletterId}">
- <fmt:message key="newsletter.publication.tabs.subscribers"/>
- </a>
- </div>
- </div>
- </div>
- <div class="tab">
- <div class="body">
- <div>
- <a
href="NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId}">
- <fmt:message key="newsletter.publication.tabs.terms"/>
- </a>
- </div>
- </div>
- </div>
- </div>
+ <edit:ui-tabs>
+ <edit:ui-tab key="newsletter.publication.tabs.edit" active="true">
+ #
+ </edit:ui-tab>
+ <edit:ui-tab key="newsletter.publication.tabs.statistics">
+
NewsletterPublicationStatisticSearch.do?newsletterId=${requestScope.newsletterId}
+ </edit:ui-tab>
+ <edit:ui-tab key="newsletter.publication.tabs.subscribers">
+
NewsletterPublicationSubscriberSearch.do?newsletterId=${requestScope.newsletterId}
+ </edit:ui-tab>
+ <edit:ui-tab key="newsletter.publication.tabs.terms">
+ NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId}
+ </edit:ui-tab>
+ </edit:ui-tabs>
<div class="editor">
<div style="padding-left:10px;">
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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- report_publication_statistic.jsp 24 Jul 2008 09:04:16 -0000 1.3
+++ report_publication_statistic.jsp 27 Jul 2008 07:38:09 -0000 1.4
@@ -1,49 +1,26 @@
<[EMAIL PROTECTED] file="globals.jsp"
-%><%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
+%><%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc"
+%><%@ taglib prefix="edit" tagdir="/WEB-INF/tags/edit" %>
<mm:content type="text/html" encoding="UTF-8" expires="0">
<html:html>
<cmscedit:head title="index.title">
<script src="../repository/search.js" type="text/javascript"></script>
</cmscedit:head>
<body>
- <div class="tabs">
- <div class="tab">
- <div class="body">
- <div>
- <a
href="NewsletterPublicationManagement.do?newsletterId=${requestScope.newsletterId}">
- <fmt:message key="newsletter.publication.tabs.edit"/>
- </a>
- </div>
- </div>
- </div>
- <div class="tab_active">
- <div class="body">
- <div>
- <a href="#">
- <fmt:message key="newsletter.publication.tabs.statistics"/>
- </a>
- </div>
- </div>
- </div>
- <div class="tab">
- <div class="body">
- <div>
- <a
href="NewsletterPublicationSubscriberSearch.do?newsletterId=${requestScope.newsletterId}">
- <fmt:message key="newsletter.publication.tabs.subscribers"/>
- </a>
- </div>
- </div>
- </div>
- <div class="tab">
- <div class="body">
- <div>
- <a
href="NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId}">
- <fmt:message key="newsletter.publication.tabs.terms"/>
- </a>
- </div>
- </div>
- </div>
- </div>
+ <edit:ui-tabs>
+ <edit:ui-tab key="newsletter.publication.tabs.edit" >
+
NewsletterPublicationManagement.do?newsletterId=${requestScope.newsletterId}
+ </edit:ui-tab>
+ <edit:ui-tab key="newsletter.publication.tabs.statistics" active="true">
+ #
+ </edit:ui-tab>
+ <edit:ui-tab key="newsletter.publication.tabs.subscribers">
+
NewsletterPublicationSubscriberSearch.do?newsletterId=${requestScope.newsletterId}
+ </edit:ui-tab>
+ <edit:ui-tab key="newsletter.publication.tabs.terms">
+ NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId}
+ </edit:ui-tab>
+ </edit:ui-tabs>
<div class="editor">
<br/>
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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- report_publication_subscribers.jsp 24 Jul 2008 09:04:16 -0000 1.3
+++ report_publication_subscribers.jsp 27 Jul 2008 07:38:09 -0000 1.4
@@ -1,49 +1,27 @@
<[EMAIL PROTECTED] file="globals.jsp"
-%><%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
+%><%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc"
+%><%@ taglib prefix="edit" tagdir="/WEB-INF/tags/edit" %>
+
<mm:content type="text/html" encoding="UTF-8" expires="0">
<html>
<cmscedit:head title="index.title">
<script src="../repository/search.js" type="text/javascript"></script>
</cmscedit:head>
<body>
- <div class="tabs">
- <div class="tab">
- <div class="body">
- <div>
- <a
href="NewsletterPublicationManagement.do?newsletterId=${requestScope.newsletterId}">
- <fmt:message key="newsletter.publication.tabs.edit"/>
- </a>
- </div>
- </div>
- </div>
- <div class="tab">
- <div class="body">
- <div>
- <a
href="NewsletterPublicationStatisticSearch.do?newsletterId=${requestScope.newsletterId}">
- <fmt:message key="newsletter.publication.tabs.statistics"/>
- </a>
- </div>
- </div>
- </div>
- <div class="tab_active">
- <div class="body">
- <div>
- <a href="#">
- <fmt:message key="newsletter.publication.tabs.subscribers"/>
- </a>
- </div>
- </div>
- </div>
- <div class="tab">
- <div class="body">
- <div>
- <a
href="NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId}">
- <fmt:message key="newsletter.publication.tabs.terms"/>
- </a>
- </div>
- </div>
- </div>
- </div>
+ <edit:ui-tabs>
+ <edit:ui-tab key="newsletter.publication.tabs.edit" >
+
NewsletterPublicationManagement.do?newsletterId=${requestScope.newsletterId}
+ </edit:ui-tab>
+ <edit:ui-tab key="newsletter.publication.tabs.statistics">
+
NewsletterPublicationStatisticSearch.do?newsletterId=${requestScope.newsletterId}
+ </edit:ui-tab>
+ <edit:ui-tab key="newsletter.publication.tabs.subscribers"
active="true">
+ #
+ </edit:ui-tab>
+ <edit:ui-tab key="newsletter.publication.tabs.terms">
+ NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId}
+ </edit:ui-tab>
+ </edit:ui-tabs>
<div class="editor">
<div style="padding-left:10px;">
@@ -60,12 +38,9 @@
</div>
<div style="padding-left:10px;">
- <html:form
action="editors/newsletter/NewsletterPublicationSubscriberSearch.do?newsletterId=${requestScope.newsletterId}">
+ <html:form
action="editors/newsletter/NewsletterPublicationSubscriberSearch.do">
<input type="hidden" name="method" value="subScriberSearch"/>
<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="50%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="25%"><fmt:message
key="newsletter.publication.result.fullname"/></td>
@@ -96,40 +71,27 @@
<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>
- <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="20%"><a
href="javascript:orderBy('fullname');"><fmt:message
key="newsletter.publication.result.fullname"/></a></th>
- <th width="20%"><a
href="javascript:orderBy('username');"><fmt:message
key="newsletter.publication.result.username"/></a></th>
- <th width="20%"><a
href="javascript:orderBy('email');"><fmt:message
key="newsletter.publication.result.email"/></a></th>
- <th width="20%"><fmt:message
key="newsletter.publication.result.newsletter"/></th>
- <th width="15%"><fmt:message
key="newsletter.publication.result.terms"/></th>
- </thead>
- <c:forEach items="${results}" var="result">
- <tr>
- <td>
+ <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>
- </td>
- <td>${result.fullname}</td>
- <td>${result.username}</td>
- <td>${result.email}</td>
- <td>${result.newsletters}</td>
- <td>${result.terms}</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.fullname"
sort="fullname" width="20%">
+ ${result.fullname}
+ </edit:ui-tcolumn>
+ <edit:ui-tcolumn titlekey="newsletter.publication.result.username"
sort="username" width="20%">
+ ${result.username}
+ </edit:ui-tcolumn>
+ <edit:ui-tcolumn titlekey="newsletter.publication.result.email"
sort="email" width="20%">
+ ${result.email}
+ </edit:ui-tcolumn>
+ <edit:ui-tcolumn
titlekey="newsletter.publication.result.newsletter" width="20%">
+ ${result.newsletters}
+ </edit:ui-tcolumn>
+ <edit:ui-tcolumn titlekey="newsletter.publication.result.terms"
width="20%">
+ ${result.terms}
+ </edit:ui-tcolumn>
+ </edit:ui-table>
</div>
</div>
</div>
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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- report_publication_terms.jsp 24 Jul 2008 09:04:16 -0000 1.3
+++ report_publication_terms.jsp 27 Jul 2008 07:38:09 -0000 1.4
@@ -1,5 +1,6 @@
<[EMAIL PROTECTED] file="globals.jsp"
-%><%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %>
+%><%@ taglib uri="http://finalist.com/cmsc"; prefix="cmsc"
+%><%@ taglib prefix="edit" tagdir="/WEB-INF/tags/edit" %>
<mm:content type="text/html" encoding="UTF-8" expires="0">
<html>
<cmscedit:head title="index.title">
@@ -7,44 +8,20 @@
</cmscedit:head>
<body>
- <div class="tabs">
- <div class="tab">
- <div class="body">
- <div>
- <a
href="NewsletterPublicationManagement.do?newsletterId=${requestScope.newsletterId}">
- <fmt:message key="newsletter.publication.tabs.edit"/>
- </a>
- </div>
- </div>
- </div>
- <div class="tab">
- <div class="body">
- <div>
- <a
href="NewsletterPublicationStatisticSearch.do?newsletterId=${requestScope.newsletterId}">
- <fmt:message key="newsletter.publication.tabs.statistics"/>
- </a>
- </div>
- </div>
- </div>
- <div class="tab">
- <div class="body">
- <div>
- <a
href="NewsletterPublicationSubscriberSearch.do?newsletterId=${requestScope.newsletterId}">
- <fmt:message key="newsletter.publication.tabs.subscribers"/>
- </a>
- </div>
- </div>
- </div>
- <div class="tab_active">
- <div class="body">
- <div>
- <a
href="NewsletterTermSearch.do?newsletterId=${requestScope.newsletterId}">
- <fmt:message key="newsletter.publication.tabs.terms"/>
- </a>
- </div>
- </div>
- </div>
- </div>
+ <edit:ui-tabs>
+ <edit:ui-tab key="newsletter.publication.tabs.edit" >
+
NewsletterPublicationManagement.do?newsletterId=${requestScope.newsletterId}
+ </edit:ui-tab>
+ <edit:ui-tab key="newsletter.publication.tabs.statistics" >
+
NewsletterPublicationStatisticSearch.do?newsletterId=${requestScope.newsletterId}
+ </edit:ui-tab>
+ <edit:ui-tab key="newsletter.publication.tabs.subscribers">
+
NewsletterPublicationSubscriberSearch.do?newsletterId=${requestScope.newsletterId}
+ </edit:ui-tab>
+ <edit:ui-tab key="newsletter.publication.tabs.terms" active="true">
+ #
+ </edit:ui-tab>
+ </edit:ui-tabs>
<div class="editor">
<div style="padding-left:10px;">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
