[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources newsletter-log.properties newsletter-log_en.properties newsletter-log_zh.properties newsletter-module.properties newslet
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources In directory james.mmbase.org:/tmp/cvs-serv8617 Removed Files: newsletter-log.properties newsletter-log_en.properties newsletter-log_zh.properties newsletter-module.properties newsletter-module_en.properties newsletter-module_nl.properties Log Message: CMSC-746,There are a lot of difference language resource files, some be merged to a few big ones. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources See also: http://www.mmbase.org/jira/browse/CMSC-746 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources portlets-newslettercontent_zh.properties portlets-newslettersubscription_zh.properties newsletter.properties newsletter_
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources In directory james.mmbase.org:/tmp/cvs-serv8502/resources Modified Files: newsletter.properties newsletter_nl.properties newsletter_zh.properties Added Files: portlets-newslettercontent_zh.properties portlets-newslettersubscription_zh.properties Log Message: CMSC-746,There are a lot of difference language resource files, some be merged to a few big ones. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources See also: http://www.mmbase.org/jira/browse/CMSC-746 portlets-newslettercontent_zh.properties is new portlets-newslettersubscription_zh.properties is new Index: newsletter.properties === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties,v retrieving revision 1.18 retrieving revision 1.19 diff -u -b -r1.18 -r1.19 --- newsletter.properties 22 May 2008 10:32:08 - 1.18 +++ newsletter.properties 23 May 2008 03:34:20 - 1.19 @@ -86,3 +86,90 @@ site.newsletter.switchtohtml = Switch to HTML site.newsletter.switchtowap = Switch to Wap site.newsletter.switchtoplain = Switch to Plain Text \ No newline at end of file + +##Newsletter Log +newsletterlog.newsletter.log = NEWSLETTER LOG +newsletterlog.newsletter = NEWSLETTER: +newsletterlog.from = FROM: +newsletterlog.to = TO: +newsletterlog.summary = SUMMARY +newsletterlog.detail = DETAIL +newsletterlog.doc=... +newsletterlog.showMessages = Messages +newsletterlog.submit = submit +newsletterlog.reset = reset + +newsletterlog.summary.newsletter = NEWSLETTER +newsletterlog.summary.removed = REMOVED +newsletterlog.summary.subscribe = SUBSCRIBE +newsletterlog.summary.unsubscribe = UNSUBSCRIBE +newsletterlog.summary.bounces = BOUNCES +newsletterlog.summary.result = RESULT + +newsletterlog.detail.newsletter = NEWSLETTER +newsletterlog.detail.logdate = LOGDATE +newsletterlog.detail.removed = REMOVED +newsletterlog.detail.subscribe = SUBSCRIBE +newsletterlog.detail.unsubcribe = UNSUBCRIBE +newsletterlog.detail.bounces = BOUNCES + +newsletterlog.summary.statistic = STATISTIC + + +#Newsletter Module +index.title = Newsletter management + +index.link.newsletteroverview = Show an overview of all newsletters with their subscriptions +index.link.subscriptionoverview = Show an overview of all subscribers with their subscriptions +index.link.exportall = Export all subscription data +index.link.import = Import subscription data +index.link.newsletterstatistic = Newsletter Log + +error.no_items = There are no items available to display +error.unknown_action = The specified action cannot be performed because it has not been implemented + +globalstats.title = Global newsletter statistics +globalstats.total.newsletters = Total number of newsletters +globalstats.total.terms = Total number of additional terms +globalstats.total.publications = Total number of publications +globalstats.total.subscriptions = Total number of subscriptions +globalstats.total.sentsubscriptions = Total number of sent subscriptions +globalstats.total.unsubscribeselect = Unsubscribe subscriptions + +newsletteroverview.title = Newsletter subscription overview +newsletteroverview.newsletter = Newsletter +newsletteroverview.numberofthemes = Terms +newsletteroverview.numberofpublications = Publications +newsletteroverview.numberofsubscriptions = Subscriptions + +newsletteroverview.link.deleteallsubscriptions = Delete all subscriptions for the selected newsletters + +newsletterdetail.title = Newsletter subscribers overview +newsletterdetail.username = Username +newsletterdetail.numberofthemes = Terms + +subscriptionoverview.title = Subscriber overview +subscriptionoverview.username = Username +subscriptionoverview.status = Status +subscriptionoverview.mimetype = MIME type +subscriptionoverview.numberofnewsletters = Newsletters +subscriptionoverview.numberofthemes = Terms + +subscriptiondetail.title = Subscription details for user +subscriptiondetail.username = Username +subscriptiondetail.fullname = Fullname +subscriptiondetail.emailaddress = Email address +subscriptiondetail.status = Subscription status +subscriptiondetail.mimetype = Preferred Mime-type + +subscriptiondetail.link.update = Save changes +subscriptiondetail.link.pause = Pause all subscriptions for this user +subscriptiondetail.link.resume = Resume all subscriptions for this user +subscriptiondetail.link.unsubscribe = Unsubscribe this user from all newsletters and themes +subscriptiondetail.link.exportselect = Export subscription data +subscriptiondetail.link.terminate = Terminate this users newsletter account + +confirm_noselect = You have to select at least one item +confirm.unsubscribe.newsletter = Are you sure to unsubscribe all subscriptions from selected newsletter? + +datafile.import.success = Import Success
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF struts-newsletter.xml struts-newsletter_search.xml struts-newslettermodule.xml struts-newsletterpublication.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF In directory james.mmbase.org:/tmp/cvs-serv8502/src/webapp/WEB-INF Modified Files: struts-newsletter.xml Removed Files: struts-newsletter_search.xml struts-newslettermodule.xml struts-newsletterpublication.xml struts-newsletterstatistic.xml Log Message: CMSC-746,There are a lot of difference language resource files, some be merged to a few big ones. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF See also: http://www.mmbase.org/jira/browse/CMSC-746 Index: struts-newsletter.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/struts-newsletter.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- struts-newsletter.xml 20 May 2008 08:48:43 - 1.9 +++ struts-newsletter.xml 23 May 2008 03:34:20 - 1.10 @@ -9,9 +9,14 @@ + + + + + @@ -59,7 +64,6 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module globals.jsp
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory
james.mmbase.org:/tmp/cvs-serv8502/src/webapp/editors/newsletter/module
Modified Files:
globals.jsp
Log Message:
CMSC-746,There are a lot of difference language resource files, some be merged
to a few big ones.
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-746
Index: globals.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/globals.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- globals.jsp 5 May 2008 02:40:11 - 1.3
+++ globals.jsp 23 May 2008 03:34:20 - 1.4
@@ -3,7 +3,7 @@
<[EMAIL PROTECTED] language="java" contentType="text/html;charset=utf-8"%>
-
+
<%=PropertiesUtil.getProperty("repository.search.results.per.page")%>
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter showNewsletters.jsp
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter In directory james.mmbase.org:/tmp/cvs-serv8502/src/webapp/editors/newsletter Modified Files: showNewsletters.jsp Log Message: CMSC-746,There are a lot of difference language resource files, some be merged to a few big ones. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter See also: http://www.mmbase.org/jira/browse/CMSC-746 Index: showNewsletters.jsp === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/showNewsletters.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- showNewsletters.jsp 20 May 2008 05:29:01 - 1.6 +++ showNewsletters.jsp 23 May 2008 03:34:20 - 1.7 @@ -8,7 +8,7 @@ <[EMAIL PROTECTED] uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt"%> <[EMAIL PROTECTED] uri="http://jsptags.com/tags/navigation/pager"; prefix="pg"%> - + http://www.w3.org/1999/xhtml"; lang="en" xml:lang="en"> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css main.css
Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css
In directory james.mmbase.org:/tmp/cvs-serv6945
Modified Files:
main.css
Log Message:
CMSC-746,In the modules menu the Newsletter Management add an icon
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css
See also: http://www.mmbase.org/jira/browse/CMSC-746
Index: main.css
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css/main.css,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- main.css20 May 2008 13:56:26 - 1.26
+++ main.css23 May 2008 02:05:03 - 1.27
@@ -316,7 +316,7 @@
ul.shortcuts li.messageoftheday{ background-image:
url('../gfx/icons/messageoftheday.png');}
ul.shortcuts li.admindashboard { background-image:
url('../gfx/icons/admindashboard.png');}
ul.shortcuts li.openoffice {
background-image: url('../gfx/icons/down.png');}
-ul.shortcuts li.newsletter {
background-image: url('../gfx/icons/newsletter.png');}
+ul.shortcuts li.newsletter {
background-image: url('../gfx/icons/mail.png');}
div.side_block div.body
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/editors/evenementen evenementen.jsp
Update of /var/cvs/contributions/natmm/templates/editors/evenementen
In directory james.mmbase.org:/tmp/cvs-serv26756/templates/editors/evenementen
Modified Files:
evenementen.jsp
Log Message:
NMCMS-494
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen
See also: http://www.mmbase.org/jira/browse/NMCMS-494
Index: evenementen.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/editors/evenementen/evenementen.jsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- evenementen.jsp 6 May 2008 14:40:50 - 1.17
+++ evenementen.jsp 22 May 2008 14:56:30 - 1.18
@@ -347,7 +347,7 @@
// the search query much check for participant constraints
if(isValidEvent &&
(!aanmelderNaamId.equals("")||!aanmelderPostcodeId.equals("")||!aanmelderNummerId.equals("")))
{
isValidEvent = false;
-%><%
+%><%
if(!aanmelderNaamId.equals("")) {
%>" /><%
}
@@ -437,6 +437,17 @@
document.EvenementForm.command.value = clickedButton.value;
}
+ function disableExtraSearch() {
+ document.EvenementForm.aanmelder_naam.disabled=true;
+ document.EvenementForm.aanmelder_postcode.disabled=true;
+ document.EvenementForm.aanmelder_nummer.disabled=true;
+
+ document.EvenementForm.aanmelder_naam.style.backgroundColor="#cc";
+
document.EvenementForm.aanmelder_postcode.style.backgroundColor="#cc";
+ document.EvenementForm.aanmelder_nummer.style.backgroundColor="#cc";
+ }
+
+
<% if(actionId.indexOf("print")>-1) { %>
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl NewsletterPublicationServiceImpl.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
In directory
james.mmbase.org:/tmp/cvs-serv23183/src/java/com/finalist/newsletter/services/impl
Modified Files:
NewsletterPublicationServiceImpl.java
Log Message:
CMSC-811 ,Newsletter:Create a newsletter publication
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
See also: http://www.mmbase.org/jira/browse/CMSC-811
Index: NewsletterPublicationServiceImpl.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterPublicationServiceImpl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- NewsletterPublicationServiceImpl.java 20 May 2008 09:49:52 -
1.16
+++ NewsletterPublicationServiceImpl.java 22 May 2008 10:35:34 -
1.17
@@ -1,6 +1,7 @@
package com.finalist.newsletter.services.impl;
import com.finalist.cmsc.services.community.person.Person;
+import com.finalist.newsletter.NewsletterSendFailException;
import com.finalist.newsletter.cao.NewsLetterStatisticCAO;
import com.finalist.newsletter.cao.NewsletterCAO;
import com.finalist.newsletter.cao.NewsletterPublicationCAO;
@@ -15,8 +16,11 @@
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
public class NewsletterPublicationServiceImpl implements
NewsletterPublicationService {
@@ -75,10 +79,12 @@
*
* @param publicationId The id of the publication to be sent out
*/
- public void deliver(int publicationId) {
+ public Map> deliver(int publicationId) {
int newsletterId = publicationCAO.getNewsletterId(publicationId);
-
+ List sendSuccess = new ArrayList();
+ List sendFails = new ArrayList() ;
+ Map> sendResults = new
HashMap>();
List subscriptions =
subscriptionCAO.getSubscription(newsletterId);
log.debug("deliver publication " + publicationId + " which has " +
subscriptions.size() + " subscriptions");
@@ -89,11 +95,21 @@
Person subscripber =
CommunityModuleAdapter.getUserById(subscription.getSubscriberId());
subscription.setEmail(subscripber.getEmail());
subscription.setTerms(terms);
+ try {
publisher.deliver(publication, subscription);
+sendSuccess.add(subscription.getSubscriberId());
}
-
+ catch (NewsletterSendFailException e) {
+sendFails.add(subscription.getSubscriberId());
+log.error(e.getMessage());
+ }
+ }
+ sendResults.put(SEND_SUCCESS, sendSuccess);
+ sendResults.put(SEND_FAIL, sendFails);
publicationCAO.setStatus(publicationId, STATUS.DELIVERED);
+ publicationCAO.renamePublicationTitle(publicationId);
+ return sendResults;
}
public int countAllPublications() {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services NewsletterPublicationService.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services
In directory
james.mmbase.org:/tmp/cvs-serv23183/src/java/com/finalist/newsletter/services
Modified Files:
NewsletterPublicationService.java
Log Message:
CMSC-811 ,Newsletter:Create a newsletter publication
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services
See also: http://www.mmbase.org/jira/browse/CMSC-811
Index: NewsletterPublicationService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/NewsletterPublicationService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NewsletterPublicationService.java 5 May 2008 02:40:11 - 1.5
+++ NewsletterPublicationService.java 22 May 2008 10:35:34 - 1.6
@@ -1,12 +1,16 @@
package com.finalist.newsletter.services;
-import com.finalist.newsletter.domain.Publication;
-import com.finalist.newsletter.domain.Term;
+import java.util.List;
+import java.util.Map;
-import java.util.Set;
+import com.finalist.newsletter.domain.Publication;
public interface NewsletterPublicationService {
+
+ public static final String SEND_SUCCESS = "sendSucess";
+ public static final String SEND_FAIL = "sendFail";
+
public void deliverAllPublication();
public void deliver(int publicationId, String email, String mimeType);
@@ -15,7 +19,7 @@
public void setStatus(int publciationId, Publication.STATUS status);
- public void deliver(int publidcation);
+ public Map> deliver(int publidcation);
public int countAllPublications();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletterpublication edit_newsletterpublication.xml load_newsletterpublication.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletterpublication In directory james.mmbase.org:/tmp/cvs-serv23183/src/webapp/editors/config/newsletterpublication Modified Files: edit_newsletterpublication.xml load_newsletterpublication.xml Log Message: CMSC-811 ,Newsletter:Create a newsletter publication See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletterpublication See also: http://www.mmbase.org/jira/browse/CMSC-811 Index: edit_newsletterpublication.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletterpublication/edit_newsletterpublication.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -b -r1.8 -r1.9 --- edit_newsletterpublication.xml 4 May 2008 12:02:12 - 1.8 +++ edit_newsletterpublication.xml 22 May 2008 10:35:34 - 1.9 @@ -30,18 +30,6 @@ Inleiding æè¦ - - In menu - In menu - èåä¸ - - - - Secure - Beveiligd - å®å ¨ - - Index: load_newsletterpublication.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletterpublication/load_newsletterpublication.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- load_newsletterpublication.xml 4 May 2008 12:02:12 - 1.6 +++ load_newsletterpublication.xml 22 May 2008 10:35:34 - 1.7 @@ -12,8 +12,6 @@ - - ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter sendresults.jsp
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter In directory james.mmbase.org:/tmp/cvs-serv23183/src/webapp/editors/newsletter Modified Files: sendresults.jsp Log Message: CMSC-811 ,Newsletter:Create a newsletter publication See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter See also: http://www.mmbase.org/jira/browse/CMSC-811 Index: sendresults.jsp === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/sendresults.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- sendresults.jsp 30 Apr 2008 07:30:10 - 1.2 +++ sendresults.jsp 22 May 2008 10:35:34 - 1.3 @@ -20,10 +20,32 @@ + - + + + + + + + + + + + + + + + + + + + + + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl NewsletterPublicationCAOImpl.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
In directory
james.mmbase.org:/tmp/cvs-serv23183/src/java/com/finalist/newsletter/cao/impl
Modified Files:
NewsletterPublicationCAOImpl.java
Log Message:
CMSC-811 ,Newsletter:Create a newsletter publication
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
See also: http://www.mmbase.org/jira/browse/CMSC-811
Index: NewsletterPublicationCAOImpl.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterPublicationCAOImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- NewsletterPublicationCAOImpl.java 15 May 2008 06:33:49 - 1.11
+++ NewsletterPublicationCAOImpl.java 22 May 2008 10:35:34 - 1.12
@@ -1,6 +1,7 @@
package com.finalist.newsletter.cao.impl;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -31,6 +32,7 @@
import com.finalist.portlets.newsletter.NewsletterContentPortlet;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.mmbase.bridge.*;
import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.storage.search.Constraint;
@@ -173,4 +175,23 @@
}
return termSet;
}
+
+ public void renamePublicationTitle(int publicationId) {
+
+ String now = DateFormatUtils.format(new Date(), "dd-MM- hh:mm");
+ Node publicationNode = cloud.getNode(publicationId);
+ String oldTitle = publicationNode.getStringValue("title");
+ String newTile = oldTitle;
+ String dateTime = "";
+ if(oldTitle.length() > 18) {
+ dateTime = oldTitle.substring(oldTitle.length()-16);
+ }
+ if(dateTime.indexOf("-") > 0 && dateTime.indexOf(":") > 0){
+ newTile = oldTitle.substring(0,oldTitle.length()-18);
+ }
+
+ publicationNode.setStringValue("title", newTile+" "+now);
+ publicationNode.commit();
+
+ }
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao NewsletterPublicationCAO.java
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao In directory james.mmbase.org:/tmp/cvs-serv23183/src/java/com/finalist/newsletter/cao Modified Files: NewsletterPublicationCAO.java Log Message: CMSC-811 ,Newsletter:Create a newsletter publication See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao See also: http://www.mmbase.org/jira/browse/CMSC-811 Index: NewsletterPublicationCAO.java === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterPublicationCAO.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- NewsletterPublicationCAO.java 5 May 2008 10:26:59 - 1.7 +++ NewsletterPublicationCAO.java 22 May 2008 10:35:34 - 1.8 @@ -22,4 +22,6 @@ public List getPublicationsByNewsletter(int id, Publication.STATUS status); public Set getTermsByPublication(int publicationId); + + public void renamePublicationTitle(int publicationId); } ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms NewsletterPublicationPublish.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv23183/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterPublicationPublish.java
Log Message:
CMSC-811 ,Newsletter:Create a newsletter publication
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
See also: http://www.mmbase.org/jira/browse/CMSC-811
Index: NewsletterPublicationPublish.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationPublish.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- NewsletterPublicationPublish.java 20 May 2008 06:44:11 - 1.14
+++ NewsletterPublicationPublish.java 22 May 2008 10:35:34 - 1.15
@@ -9,6 +9,9 @@
*/
package com.finalist.newsletter.forms;
+import java.util.List;
+import java.util.Map;
+
import com.finalist.cmsc.navigation.NavigationUtil;
import com.finalist.cmsc.navigation.ServerUtil;
import com.finalist.cmsc.security.SecurityUtil;
@@ -48,7 +51,7 @@
request.setAttribute("isPaused", true);
return mapping.findForward(SUCCESS);
}
-
+ Map> sendResults = null;
Node publicationNode = cloud.getNode(number);
if (isSendAction(request)) {
@@ -61,12 +64,17 @@
}
if (ServerUtil.isSingle()) {
-publicationService.deliver(number);
+sendResults = publicationService.deliver(number);
publicationService.setStatus(number, Publication.STATUS.DELIVERED);
NewsletterUtil.logPubliction(number, HANDLE.POST);
+request.setAttribute("isSingle", true);
+request.setAttribute("sendResults", sendResults);
+request.setAttribute("sendSuccess",
sendResults.get(NewsletterPublicationService.SEND_SUCCESS).size());
+request.setAttribute("sendFail",
sendResults.get(NewsletterPublicationService.SEND_FAIL).size());
}
else {
publicationService.setStatus(number, Publication.STATUS.READY);
+request.setAttribute("isPublish", true);
Publish.publish(publicationNode);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources newsletter.properties
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
In directory james.mmbase.org:/tmp/cvs-serv23085/resources
Modified Files:
newsletter.properties
Log Message:
CMSC-810 ,In menu and secure are of no use.
header and tab start with lower case in English and only the header in Dutch.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
See also: http://www.mmbase.org/jira/browse/CMSC-810
Index: newsletter.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- newsletter.properties 15 May 2008 06:33:48 - 1.17
+++ newsletter.properties 22 May 2008 10:32:08 - 1.18
@@ -38,7 +38,9 @@
confirm_resend.no = No
sendsuccess.title = Send results
-sendsuccess.subtitle = The publication has been sent successfully
+sendsuccess.subtitle = The publication has been sent. {0} users it was sent ,
success : {1} , failure : {2}
+sendsuccess.publish.subtitle = The publication has been published successfully
+sendsuccess.test.subtitle = The publication has been sent successfully
newsletter.ispaused = The Newsletter is paused
testinput.title = Send test e-mail
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter edit_newsletter.xml load_newsletter.xml newsletter.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter In directory james.mmbase.org:/tmp/cvs-serv23085/src/webapp/editors/config/newsletter Modified Files: edit_newsletter.xml load_newsletter.xml newsletter.xml Log Message: CMSC-810 ,In menu and secure are of no use. header and tab start with lower case in English and only the header in Dutch. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter See also: http://www.mmbase.org/jira/browse/CMSC-810 Index: edit_newsletter.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/edit_newsletter.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -b -r1.15 -r1.16 --- edit_newsletter.xml 20 May 2008 16:41:02 - 1.15 +++ edit_newsletter.xml 22 May 2008 10:32:08 - 1.16 @@ -2,7 +2,7 @@ http://www.mmbase.org/dtd/wizard-schema_1_0.dtd";> Nieuwsbrief - newsletter + Newsletter é®ä»¶ Title @@ -68,18 +68,6 @@ æåæªæ¢ - - In menu - In menu - èåä¸ - - - - Secure - Beveiligd - å®å ¨ - - Send when empty Verstuur als leeg Index: load_newsletter.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/load_newsletter.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -b -r1.12 -r1.13 --- load_newsletter.xml 29 Apr 2008 01:37:04 - 1.12 +++ load_newsletter.xml 22 May 2008 10:32:08 - 1.13 @@ -16,8 +16,6 @@ - - Index: newsletter.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletter/newsletter.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- newsletter.xml 16 Apr 2008 03:37:23 - 1.2 +++ newsletter.xml 22 May 2008 10:32:08 - 1.3 @@ -2,7 +2,7 @@ http://www.mmbase.org/dtd/wizard-schema_1_0.dtd";> nieuwsbrief - newsletter + Newsletter é®ä»¶ ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/config/applications newsletter.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications In directory james.mmbase.org:/tmp/cvs-serv23085/config/applications Modified Files: newsletter.xml Log Message: CMSC-810 ,In menu and secure are of no use. header and tab start with lower case in English and only the header in Dutch. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications See also: http://www.mmbase.org/jira/browse/CMSC-810 Index: newsletter.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -u -b -r1.21 -r1.22 --- newsletter.xml 4 May 2008 12:02:12 - 1.21 +++ newsletter.xml 22 May 2008 10:32:08 - 1.22 @@ -11,32 +11,18 @@ - newsletter - newslettertheme - newsletterpublication - newsletterpublicationtheme - subscriptionrecord - newsletterdailylog - - - - - - - - @@ -44,12 +30,6 @@ - - - - - - ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module Kopie van report_subscriber_subscriptions.jsp
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module In directory james.mmbase.org:/tmp/cvs-serv22806/src/webapp/editors/newsletter/module Removed Files: Kopie van report_subscriber_subscriptions.jsp Log Message: CCMSC-746,*Taken from Jacobjob's email. There is no README.txt in the portlets-newsletter sub-project. Please create a good one. modify the application xml add default data for the views and portletdefs. 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/CCMSC-746 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newslettertheme article_related_newslettertheme.xml load_newslettertheme.xml search_newsletter_related_n
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newslettertheme In directory james.mmbase.org:/tmp/cvs-serv22806/src/webapp/editors/config/newslettertheme Removed Files: article_related_newslettertheme.xml load_newslettertheme.xml search_newsletter_related_newslettertheme.xml search_newslettertheme.xml Log Message: CCMSC-746,*Taken from Jacobjob's email. There is no README.txt in the portlets-newsletter sub-project. Please create a good one. modify the application xml add default data for the views and portletdefs. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newslettertheme See also: http://www.mmbase.org/jira/browse/CCMSC-746 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter README.txt
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter In directory james.mmbase.org:/tmp/cvs-serv22806 Added Files: README.txt Log Message: CCMSC-746,*Taken from Jacobjob's email. There is no README.txt in the portlets-newsletter sub-project. Please create a good one. modify the application xml add default data for the views and portletdefs. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter See also: http://www.mmbase.org/jira/browse/CCMSC-746 README.txt is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders newsletterpublicationtheme.xml newslettertheme.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders In directory james.mmbase.org:/tmp/cvs-serv22806/config/applications/newsletter/builders Removed Files: newsletterpublicationtheme.xml newslettertheme.xml Log Message: CCMSC-746,*Taken from Jacobjob's email. There is no README.txt in the portlets-newsletter sub-project. Please create a good one. modify the application xml add default data for the views and portletdefs. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders See also: http://www.mmbase.org/jira/browse/CCMSC-746 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources newsletter-log_en.properties newsletter-module_en.properties newsletter_en.properties portlets-newslettercontent_en.prop
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources In directory james.mmbase.org:/tmp/cvs-serv22806/resources Added Files: newsletter-log_en.properties newsletter-module_en.properties newsletter_en.properties portlets-newslettercontent_en.properties portlets-newslettersubscription_en.properties Log Message: CCMSC-746,*Taken from Jacobjob's email. There is no README.txt in the portlets-newsletter sub-project. Please create a good one. modify the application xml add default data for the views and portletdefs. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources See also: http://www.mmbase.org/jira/browse/CCMSC-746 newsletter-log_en.properties is new newsletter-module_en.properties is new newsletter_en.properties is new portlets-newslettercontent_en.properties is new portlets-newslettersubscription_en.properties is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter portletdefinition.xml view.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter In directory james.mmbase.org:/tmp/cvs-serv22806/config/applications/newsletter Added Files: portletdefinition.xml view.xml Log Message: CCMSC-746,*Taken from Jacobjob's email. There is no README.txt in the portlets-newsletter sub-project. Please create a good one. modify the application xml add default data for the views and portletdefs. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter See also: http://www.mmbase.org/jira/browse/CCMSC-746 portletdefinition.xml is new view.xml is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-jforum README.txt
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-jforum In directory james.mmbase.org:/tmp/cvs-serv22336/portlets-jforum Removed Files: Tag: b1_4 README.txt Log Message: CMSC-916 - No JForum in 1.4 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-jforum See also: http://www.mmbase.org/jira/browse/CMSC-916 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/includes/form result.jsp table.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/includes/form In directory james.mmbase.org:/tmp/cvs-serv22290/templates/natmm/includes/form Modified Files: result.jsp table.jsp Log Message: NMCMS-46 last commit was wrong issue number. See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes/form See also: http://www.mmbase.org/jira/browse/NMCMS-46 Index: result.jsp === RCS file: /var/cvs/contributions/natmm/templates/natmm/includes/form/result.jsp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -b -r1.19 -r1.20 Index: table.jsp === RCS file: /var/cvs/contributions/natmm/templates/natmm/includes/form/table.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/includes/form result.jsp table.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/includes/form
In directory james.mmbase.org:/tmp/cvs-serv21990/templates/natmm/includes/form
Modified Files:
result.jsp table.jsp
Log Message:
NMCMS-399
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes/form
See also: http://www.mmbase.org/jira/browse/NMCMS-399
Index: result.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/natmm/includes/form/result.jsp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- result.jsp 5 May 2008 11:49:41 - 1.18
+++ result.jsp 22 May 2008 09:42:03 - 1.19
@@ -37,6 +37,7 @@
Vector okMessage = new Vector();
Vector emailAddress = new Vector();
Vector formResponse = new Vector();
+ String thisFormNumber = "";
boolean isValidAnswer = true;
@@ -58,7 +59,7 @@
<%
-String thisFormNumber = thisForm.getStringValue("number");
+thisFormNumber = thisForm.getStringValue("number");
if(!thisForm.getStringValue("titel_fra").equals("")) {
okTitle.add(thisForm.getStringValue("titel_fra"));
} else {
@@ -114,6 +115,9 @@
if(formulierveld_type.equals("6")) { // *** date ***
String answerValue = getResponseVal("q" + thisFormNumber +
"_" + formulierveld_number + "_day",postingStr);
+ // save in session
+ session.setAttribute("q" + thisFormNumber + "_" +
formulierveld_number + "_day", answerValue);
+
if(answerValue==null) { answerValue = ""; }
if(answerValue.equals("")) {
responseText += noAnswer;
@@ -125,6 +129,9 @@
responseText += answerValue;
}
answerValue = getResponseVal("q" + thisFormNumber + "_" +
formulierveld_number + "_month",postingStr);
+ // save in session
+ session.setAttribute("q" + thisFormNumber + "_" +
formulierveld_number + "_month", answerValue);
+
if(answerValue==null) { answerValue = ""; }
if(answerValue.equals("")) {
responseText += ", " + noAnswer;
@@ -136,6 +143,9 @@
responseText += "-" + answerValue;
}
answerValue = getResponseVal("q" + thisFormNumber + "_" +
formulierveld_number + "_year",postingStr);
+ // save in session
+ session.setAttribute("q" + thisFormNumber + "_" +
formulierveld_number + "_year", answerValue);
+
if(answerValue==null) { answerValue = ""; }
if(answerValue.equals("")) {
responseText += ", " + noAnswer;
@@ -152,6 +162,9 @@
%><%
String answerValue = getResponseVal("q" +
thisFormNumber + "_" + formulierveld_number + "_" +
formulierveldantwoord_number,postingStr);
+// save in session
+session.setAttribute("q" + thisFormNumber + "_" +
formulierveld_number + "_" + formulierveldantwoord_number, answerValue);
+
if(answerValue==null) { answerValue = ""; }
if(!answerValue.equals("")) {
if (hasSelected){
@@ -163,6 +176,9 @@
%><%
String answer_else_Value = getResponseVal("q" +
thisFormNumber + "_" + formulierveld_number + "_else",postingStr);
+ // save in session
+ session.setAttribute("q" + thisFormNumber + "_" +
formulierveld_number + "_else", answer_else_Value);
+
if(answer_else_Value==null) { answer_else_Value = ""; }
if (!answer_else_Value.equals("")){
if (hasSelected){
@@ -181,6 +197,9 @@
} else { // *** textarea, textline, dropdown, radio buttons ***
String answerValue = getResponseVal("q" + thisFormNumber +
"_" + formulierveld_number,postingStr);
+ // save in session
+ session.setAttribute("q" + thisFormNumber + "_" +
formulierveld_number, answerValue);
+
if(answerValue==null) { answerValue = ""; }
if(answerValue.equals("")) {
responseText += noAnswer;
@@ -206,6 +225,14 @@
<%
if(isValidAnswer)
{
+ // remove form values from the session because the form will be send
+ java.util.Enumeration e = session.getAttributeNames();
+
+ while (e.hasMoreElements()){
+ String sessionAttrName = (String) e.nextElement();
+ if (sessionAttrName.startsWith("q" + thisFormNumber))
session.removeAttribute(sessionAttrNam
[MMBASE CVS] contributions/CMSContainer .classpath
Update of /var/cvs/contributions/CMSContainer In directory james.mmbase.org:/tmp/cvs-serv21387 Modified Files: Tag: b1_4 .classpath Log Message: Removed mmbase-email jar from classpath, doesn't seem to be needed and doesn't get downloaded. See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer Index: .classpath === RCS file: /var/cvs/contributions/CMSContainer/.classpath,v retrieving revision 1.11.2.4 retrieving revision 1.11.2.5 diff -u -b -r1.11.2.4 -r1.11.2.5 --- .classpath 2 May 2008 12:00:49 - 1.11.2.4 +++ .classpath 22 May 2008 09:04:41 - 1.11.2.5 @@ -109,11 +109,6 @@ http://www.mmbase.org/development/api/1.8/"/> - - - http://www.mmbase.org/development/api/1.8/"/> - - http://www.mmbase.org/development/api/1.8/"/> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
