November 2012 - Pollen-commits - mailman.cloud.codelutin.com

r3755 - trunk/pollen-ui-struts2/src/main/webapp/js
by tchemit＠users.chorem.org 21 Nov '12

21 Nov '12

Author: tchemit Date: 2012-11-21 02:38:41 +0100 (Wed, 21 Nov 2012) New Revision: 3755 Url: http://chorem.org/repositories/revision/pollen/3755 Log: refs #846: Use nice text rich editor for description in forms (improve the editor toolbar) Modified: trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js Modified: trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js 2012-11-21 01:35:49 UTC (rev 3754) +++ trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js 2012-11-21 01:38:41 UTC (rev 3755) @@ -29,7 +29,7 @@ // [ 'Find', 'Replace', '-', 'SelectAll', 'RemoveFormat'], ['Styles', 'Format'], ['Bold', 'Italic', 'Strike', 'Underline','Strike','Subscript','Superscript'], - ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', 'Blockquote', 'TextColor','BGColor',], + ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', 'Blockquote', 'TextColor','BGColor'], // '/', ['Table', 'HorizontalRule', 'Smiley', 'SpecialChar'/*, 'PageBreak'*/, 'Link', 'Unlink', 'Anchor' ]

1 0

r3754 - trunk/pollen-ui-struts2/src/main/webapp/js
by tchemit＠users.chorem.org 21 Nov '12

21 Nov '12

Author: tchemit Date: 2012-11-21 02:35:49 +0100 (Wed, 21 Nov 2012) New Revision: 3754 Url: http://chorem.org/repositories/revision/pollen/3754 Log: refs #846: Use nice text rich editor for description in forms (improve the editor toolbar) Modified: trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js Modified: trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js 2012-11-21 01:29:30 UTC (rev 3753) +++ trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js 2012-11-21 01:35:49 UTC (rev 3754) @@ -29,10 +29,10 @@ // [ 'Find', 'Replace', '-', 'SelectAll', 'RemoveFormat'], ['Styles', 'Format'], ['Bold', 'Italic', 'Strike', 'Underline','Strike','Subscript','Superscript'], - ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', 'Blockquote'], + ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', 'Blockquote', 'TextColor','BGColor',], // '/', - ['Table', 'HorizontalRule', 'Smiley', 'SpecialChar'/*, 'PageBreak'*/], - ['Link', 'Unlink', 'Anchor'] + ['Table', 'HorizontalRule', 'Smiley', 'SpecialChar'/*, 'PageBreak'*/, 'Link', 'Unlink', 'Anchor' ] + ]; }; \ No newline at end of file

1 0

r3753 - trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/converters
by tchemit＠users.chorem.org 21 Nov '12

21 Nov '12

Author: tchemit Date: 2012-11-21 02:29:30 +0100 (Wed, 21 Nov 2012) New Revision: 3753 Url: http://chorem.org/repositories/revision/pollen/3753 Log: xif deprecated import Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/converters/BooleanIntegerConverterTest.java Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/converters/BooleanIntegerConverterTest.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/converters/BooleanIntegerConverterTest.java 2012-11-21 01:28:03 UTC (rev 3752) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/converters/BooleanIntegerConverterTest.java 2012-11-21 01:29:30 UTC (rev 3753) @@ -22,7 +22,7 @@ */ package org.chorem.pollen.ui.converters; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; /**

1 0

r3752 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors
by tchemit＠users.chorem.org 21 Nov '12

21 Nov '12

Author: tchemit Date: 2012-11-21 02:28:03 +0100 (Wed, 21 Nov 2012) New Revision: 3752 Url: http://chorem.org/repositories/revision/pollen/3752 Log: fixes #856: Updates to struts 2.3.7 (fix compil) Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java 2012-11-21 01:18:28 UTC (rev 3751) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java 2012-11-21 01:28:03 UTC (rev 3752) @@ -136,7 +136,7 @@ String acceptedFileName = null; - if (acceptFile(action, files[0], fileName[0], contentType[0], inputName, validation, ac.getLocale())) { + if (acceptFile(action, files[0], fileName[0], contentType[0], inputName, validation)) { acceptedFile = files[0]; acceptedContentType = contentType[0]; @@ -187,14 +187,8 @@ private String getTextMessage(Object action, String messageKey, Object[] args, Locale locale) { if (args == null || args.length == 0) { - if (action != null && useActionMessageBundle) { - return LocalizedTextUtil.findText(action.getClass(), messageKey, locale); - } return LocalizedTextUtil.findText(this.getClass(), messageKey, locale); } else { - if (action != null && useActionMessageBundle) { - return LocalizedTextUtil.findText(action.getClass(), messageKey, locale, DEFAULT_MESSAGE, args); - } return LocalizedTextUtil.findText(this.getClass(), messageKey, locale, DEFAULT_MESSAGE, args); } }

1 0

r3751 - trunk
by tchemit＠users.chorem.org 21 Nov '12

21 Nov '12

Author: tchemit Date: 2012-11-21 02:18:28 +0100 (Wed, 21 Nov 2012) New Revision: 3751 Url: http://chorem.org/repositories/revision/pollen/3751 Log: fixes 856: Updates to struts 2.3.7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-21 01:18:16 UTC (rev 3750) +++ trunk/pom.xml 2012-11-21 01:18:28 UTC (rev 3751) @@ -156,7 +156,7 @@ <nuitonUtilsVersion>2.6.4</nuitonUtilsVersion> <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <struts2Version>2.3.4.1</struts2Version> + <struts2Version>2.3.7</struts2Version> <jqueryPluginVersion>3.4.0</jqueryPluginVersion> <shiroVersion>1.2.1</shiroVersion> <slf4jVersion>1.7.2</slf4jVersion>

1 0

r3750 - trunk/pollen-ui-struts2
by tchemit＠users.chorem.org 21 Nov '12

21 Nov '12

Author: tchemit Date: 2012-11-21 02:18:16 +0100 (Wed, 21 Nov 2012) New Revision: 3750 Url: http://chorem.org/repositories/revision/pollen/3750 Log: refs #846: Use nice text rich editor for description in forms (fix jsp compilation for jetty) Modified: trunk/pollen-ui-struts2/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-11-21 01:05:19 UTC (rev 3749) +++ trunk/pollen-ui-struts2/pom.xml 2012-11-21 01:18:16 UTC (rev 3750) @@ -464,6 +464,11 @@ <version>${struts2Version}</version> </dependency> <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> + <dependency> <groupId>com.jgeppert.struts2.jquery</groupId> <artifactId>struts2-jquery-plugin</artifactId> <version>${jqueryPluginVersion}</version> @@ -474,9 +479,9 @@ <version>${jqueryPluginVersion}</version> </dependency> <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-sitemesh-plugin</artifactId> - <version>${struts2Version}</version> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-richtext-plugin</artifactId> + <version>${jqueryPluginVersion}</version> </dependency> </dependencies> </plugin>

1 0

r3749 - in trunk/pollen-ui-struts2/src/main/webapp: WEB-INF/jsp/poll js
by tchemit＠users.chorem.org 21 Nov '12

21 Nov '12

Author: tchemit Date: 2012-11-21 02:05:19 +0100 (Wed, 21 Nov 2012) New Revision: 3749 Url: http://chorem.org/repositories/revision/pollen/3749 Log: fixes #159: [Poll] Impossible de mettre de code html dans la description du sondage fixes #85: [Comment] Permettre l'ajout de liens dans les commentaires refs #846: Use nice text rich editor for description in forms Added: trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollInformation.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-11-20 23:59:00 UTC (rev 3748) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-11-21 01:05:19 UTC (rev 3749) @@ -121,8 +121,12 @@ <s:textfield key="poll.title" label="%{getText('pollen.common.title')}" required="true" size="80"/> + <s:url var="configUrl" value='/js/ckeditor.config.js'/> + <sjr:ckeditor key="poll.description" rows="10" cols="80" width="800" - label="%{getText('pollen.common.description')}" /> + toolbar="PollenToolbar" customConfig="%{configUrl}" + editorLocal="%{safeLanguage}" + label="%{getText('pollen.common.description')}" /> <%--s:textarea key="poll.description" rows="3" cols="54" label="%{getText('pollen.common.description')}"/--%> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollInformation.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollInformation.jsp 2012-11-20 23:59:00 UTC (rev 3748) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollInformation.jsp 2012-11-21 01:05:19 UTC (rev 3749) @@ -23,8 +23,9 @@ <%@ page contentType="text/html" language="java" %> <%@ taglib prefix="s" uri="/struts-tags" %> <div id="pollInformationTop"> - <div style="white-space:pre-wrap; text-align: start;"> - <s:property value="poll.description"/> + <%--<div style="white-space:pre-wrap; text-align: start;">--%> + <div> + <s:property value="poll.description" escapeHtml="false"/> </div> <fieldset> <legend><s:text name="pollen.common.aboutPoll"/></legend> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-11-20 23:59:00 UTC (rev 3748) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-11-21 01:05:19 UTC (rev 3749) @@ -397,17 +397,13 @@ validate="true"> <s:textfield key="commentAuthor" required="true" size="78" label="%{getText('pollen.common.commentAuthor')}"/> - <sjr:ckeditor - key="commentText" - required="true" - value="" - rows="3" - cols="54" - width="500" + + <s:url var="configUrl" value='/js/ckeditor.config.js'/> + <sjr:ckeditor key="commentText" required="true" + value="" rows="3" cols="54" width="500" label="%{getText('pollen.common.commentText')}" - toolbar="Basic" - editorLocal="fr" - /> + toolbar="PollenToolbar" customConfig="%{configUrl}" + editorLocal="%{safeLanguage}" /> <div class="cleanBoth"> <s:submit action="addComment/%{pollUri}" key="pollen.action.addComment" align="center"/> Added: trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js (rev 0) +++ trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js 2012-11-21 01:05:19 UTC (rev 3749) @@ -0,0 +1,38 @@ +/* + * #%L + * Pollen :: UI (struts2) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +CKEDITOR.editorConfig = function (config) { + config.toolbar = 'PollenToolbar'; + + config.toolbar_PollenToolbar = + [ +// ['Cut', 'Copy', 'Paste', 'PasteText', /*'PasteFromWord'*/, '-', 'Undo', 'Redo', '-', 'Scayt'], +// [ 'Find', 'Replace', '-', 'SelectAll', 'RemoveFormat'], + ['Styles', 'Format'], + ['Bold', 'Italic', 'Strike', 'Underline','Strike','Subscript','Superscript'], + ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', 'Blockquote'], +// '/', + ['Table', 'HorizontalRule', 'Smiley', 'SpecialChar'/*, 'PageBreak'*/], + ['Link', 'Unlink', 'Anchor'] + ]; + +}; \ No newline at end of file Property changes on: trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r3748 - trunk/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting
by tchemit＠users.chorem.org 20 Nov '12

20 Nov '12

Author: tchemit Date: 2012-11-21 00:59:00 +0100 (Wed, 21 Nov 2012) New Revision: 3748 Url: http://chorem.org/repositories/revision/pollen/3748 Log: refs #855: Coomb vote type does not work if there is some null vote (avoid NPE but must recheck results now) Modified: trunk/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java Modified: trunk/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java =================================================================== --- trunk/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java 2012-11-20 23:58:38 UTC (rev 3747) +++ trunk/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java 2012-11-20 23:59:00 UTC (rev 3748) @@ -30,6 +30,7 @@ import org.chorem.pollen.votecounting.model.VoteCountingResult; import org.chorem.pollen.votecounting.model.Voter; +import java.math.BigDecimal; import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -77,10 +78,10 @@ } protected void round(Map<Voter, List<Set<String>>> topRankChoices, - Set<String> idsToExclude, - Set<String> idsToInclude, - Map<String, ChoiceScore> resultByChoice, - double totalWeight) { + Set<String> idsToExclude, + Set<String> idsToInclude, + Map<String, ChoiceScore> resultByChoice, + double totalWeight) { List<ChoiceScore> results = applyScores(topRankChoices, idsToExclude, @@ -90,8 +91,8 @@ if (!results.isEmpty()) { // get best score - double max = - results.get(results.size() - 1).getScoreValue().doubleValue(); + BigDecimal scoreValue = results.get(results.size() - 1).getScoreValue(); + double max = scoreValue == null ? 0 : scoreValue.doubleValue(); if (max < totalWeight) { @@ -117,9 +118,9 @@ } protected List<ChoiceScore> applyScores(Map<Voter, List<Set<String>>> topRankChoices, - Set<String> idsToExclude, - Set<String> idsToInclude, - Map<String, ChoiceScore> resultByChoice) { + Set<String> idsToExclude, + Set<String> idsToInclude, + Map<String, ChoiceScore> resultByChoice) { if (CollectionUtils.isNotEmpty(idsToExclude)) { @@ -188,8 +189,8 @@ } protected void guessChoiceIdsToRemove(Set<String> idsToInclude, - Set<String> idsToExclude, - Map<Voter, List<Set<String>>> results) { + Set<String> idsToExclude, + Map<Voter, List<Set<String>>> results) { // pour chaque choix restant on calcule son score lorsqu'il est le dernier @@ -222,13 +223,15 @@ // puis revers (pour avoir les meilleurs scores au début) Collections.reverse(scores); - double maxScore = scores.get(0).getScoreValue().doubleValue(); + BigDecimal firstScoreValue = scores.get(0).getScoreValue(); + double maxScore = firstScoreValue == null ? 0 : firstScoreValue.doubleValue(); idsToExclude.clear(); for (ChoiceScore choiceScore : scores) { - if (maxScore == choiceScore.getScoreValue().doubleValue()) { + BigDecimal scoreValue = choiceScore.getScoreValue(); + if (maxScore == (scoreValue == null ? 0 : scoreValue.doubleValue())) { idsToExclude.add(choiceScore.getChoiceId()); } else {

1 0

r3747 - trunk/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting
by tchemit＠users.chorem.org 20 Nov '12

20 Nov '12

Author: tchemit Date: 2012-11-21 00:58:38 +0100 (Wed, 21 Nov 2012) New Revision: 3747 Url: http://chorem.org/repositories/revision/pollen/3747 Log: refs #854: Instantoff vote type does not work if there is some null vote (avoid NPE but must recheck results now) Modified: trunk/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java Modified: trunk/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java =================================================================== --- trunk/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java 2012-11-20 23:58:03 UTC (rev 3746) +++ trunk/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java 2012-11-20 23:58:38 UTC (rev 3747) @@ -29,6 +29,7 @@ import org.chorem.pollen.votecounting.model.VoteCountingResult; import org.chorem.pollen.votecounting.model.Voter; +import java.math.BigDecimal; import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -63,7 +64,7 @@ Set<String> choiceIdsToExclude = Sets.newHashSet(); Set<String> choiceIdsToKeep = Sets.newHashSet(scores.keySet()); - //FIXME Must use round of elemination to order scores + //FIXME Must use round of elimination to order scores round(topRankChoices, choiceIdsToExclude, choiceIdsToKeep, @@ -76,10 +77,10 @@ } protected void round(Map<Voter, List<Set<String>>> topRankChoices, - Set<String> idsToExclude, - Set<String> idsToInclude, - Map<String, ChoiceScore> resultByChoice, - double totalWeight) { + Set<String> idsToExclude, + Set<String> idsToInclude, + Map<String, ChoiceScore> resultByChoice, + double totalWeight) { List<ChoiceScore> results = applyScores(topRankChoices, idsToExclude, @@ -89,8 +90,8 @@ if (!results.isEmpty()) { // get best score - double max = - results.get(results.size() - 1).getScoreValue().doubleValue(); + BigDecimal scoreValue = results.get(results.size() - 1).getScoreValue(); + double max = scoreValue == null ? 0 : scoreValue.doubleValue(); if (max < totalWeight) { @@ -117,9 +118,9 @@ } protected List<ChoiceScore> applyScores(Map<Voter, List<Set<String>>> topRankChoices, - Set<String> idsToExclude, - Set<String> idsToInclude, - Map<String, ChoiceScore> resultByChoice) { + Set<String> idsToExclude, + Set<String> idsToInclude, + Map<String, ChoiceScore> resultByChoice) { if (CollectionUtils.isNotEmpty(idsToExclude)) { @@ -188,7 +189,7 @@ } protected void guessChoiceIdsToRemove(Set<String> idsToExclude, - List<ChoiceScore> results) { + List<ChoiceScore> results) { double min = results.get(0).getScoreValue().doubleValue(); @@ -196,7 +197,8 @@ for (ChoiceScore choiceScore : results) { - if (min == choiceScore.getScoreValue().doubleValue()) { + BigDecimal scoreValue = choiceScore.getScoreValue(); + if (min == (scoreValue==null?0:scoreValue.doubleValue())) { idsToExclude.add(choiceScore.getChoiceId()); } else {

1 0

r3746 - trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence
by tchemit＠users.chorem.org 20 Nov '12

20 Nov '12

Author: tchemit Date: 2012-11-21 00:58:03 +0100 (Wed, 21 Nov 2012) New Revision: 3746 Url: http://chorem.org/repositories/revision/pollen/3746 Log: fixes #851: Empty vote leads to an HTTP 500 Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java 2012-11-20 22:34:18 UTC (rev 3745) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java 2012-11-20 23:58:03 UTC (rev 3746) @@ -120,13 +120,14 @@ return result; } - protected static void fillSimpleVoter(VoterBuilder builder, Vote vote) { builder.newVoter(vote.getPollAccount().getAccountId(), vote.getWeight()); - for (VoteToChoice voteToChoice : vote.getChoiceVoteToChoice()) { - builder.addVoteForChoice( - voteToChoice.getChoice().getTopiaId(), - Double.valueOf(voteToChoice.getVoteValue())); + if (!vote.isChoiceVoteToChoiceEmpty()) { + for (VoteToChoice voteToChoice : vote.getChoiceVoteToChoice()) { + builder.addVoteForChoice( + voteToChoice.getChoice().getTopiaId(), + Double.valueOf(voteToChoice.getVoteValue())); + } } }

1 0

r3745 - trunk
by tchemit＠users.chorem.org 20 Nov '12

20 Nov '12

Author: tchemit Date: 2012-11-20 23:34:18 +0100 (Tue, 20 Nov 2012) New Revision: 3745 Url: http://chorem.org/repositories/revision/pollen/3745 Log: fixes #839: Updates to eugene 2.5.6 fixes #838: Updates to nuiton-utils 2.6.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-16 16:05:39 UTC (rev 3744) +++ trunk/pom.xml 2012-11-20 22:34:18 UTC (rev 3745) @@ -149,11 +149,11 @@  <topiaVersion>2.7.1-SNAPSHOT</topiaVersion> - <eugenePluginVersion>2.5.6-SNAPSHOT</eugenePluginVersion> + <eugenePluginVersion>2.5.6</eugenePluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonWebVersion>1.12-beta-1</nuitonWebVersion> - <nuitonUtilsVersion>2.6.4-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.4</nuitonUtilsVersion> <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.4.1</struts2Version>

1 0

r3744 - trunk
by tchemit＠users.chorem.org 16 Nov '12

16 Nov '12

Author: tchemit Date: 2012-11-16 17:05:39 +0100 (Fri, 16 Nov 2012) New Revision: 3744 Url: http://chorem.org/repositories/revision/pollen/3744 Log: fixes #847: Updates to mavenpom 3.4.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-11 20:14:32 UTC (rev 3743) +++ trunk/pom.xml 2012-11-16 16:05:39 UTC (rev 3744) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.4-SNAPSHOT</version> + <version>3.4.4</version> </parent> <groupId>org.chorem</groupId>

1 0

r3743 - trunk
by tchemit＠users.chorem.org 11 Nov '12

11 Nov '12

Author: tchemit Date: 2012-11-11 21:14:32 +0100 (Sun, 11 Nov 2012) New Revision: 3743 Url: http://chorem.org/repositories/revision/pollen/3743 Log: refs #847: Updates to mavenpom 3.4.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-09 09:37:09 UTC (rev 3742) +++ trunk/pom.xml 2012-11-11 20:14:32 UTC (rev 3743) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.3</version> + <version>3.4.4-SNAPSHOT</version> </parent> <groupId>org.chorem</groupId>

1 0

r3742 - in trunk/pollen-ui-struts2/src/main/webapp: WEB-INF/jsp/poll css
by kmorin＠users.chorem.org 09 Nov '12

09 Nov '12

Author: kmorin Date: 2012-11-09 10:37:09 +0100 (Fri, 09 Nov 2012) New Revision: 3742 Url: http://chorem.org/repositories/revision/pollen/3742 Log: resolves #85 : [Comment] Permettre l'ajout de liens dans les commentaires Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp trunk/pollen-ui-struts2/src/main/webapp/css/vote.css Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp 2012-11-09 09:35:43 UTC (rev 3741) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp 2012-11-09 09:37:09 UTC (rev 3742) @@ -23,7 +23,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<div> +<div class="comment"> <s:if test="isDeleteCommentAllowed(#comment)"> <span class="cmd"> <s:a href="#" @@ -35,11 +35,11 @@ </span> </s:if> <span class="name"><s:property value='%{#comment.author}'/></span> : - <span class="date"> - <s:property value='#comment.postDate'/> - </span> + <span class="date"> + <s:property value='#comment.postDate'/> + </span> <p> - <s:property value='#comment.text'/> + <s:property value='#comment.text' escapeHtml="false"/> </p> </div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-11-09 09:35:43 UTC (rev 3741) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-11-09 09:37:09 UTC (rev 3742) @@ -23,6 +23,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> +<%@ taglib prefix="sjr" uri="/struts-jquery-richtext-tags"%> <title><s:property value="%{poll.title}"/></title> @@ -396,9 +397,17 @@ validate="true"> <s:textfield key="commentAuthor" required="true" size="78" label="%{getText('pollen.common.commentAuthor')}"/> - <s:textarea key="commentText" required="true" value='' - label="%{getText('pollen.common.commentText')}"/> - + <sjr:ckeditor + key="commentText" + required="true" + value="" + rows="3" + cols="54" + width="500" + label="%{getText('pollen.common.commentText')}" + toolbar="Basic" + editorLocal="fr" + /> <div class="cleanBoth"> <s:submit action="addComment/%{pollUri}" key="pollen.action.addComment" align="center"/> Modified: trunk/pollen-ui-struts2/src/main/webapp/css/vote.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/vote.css 2012-11-09 09:35:43 UTC (rev 3741) +++ trunk/pollen-ui-struts2/src/main/webapp/css/vote.css 2012-11-09 09:37:09 UTC (rev 3742) @@ -153,6 +153,12 @@ margin: auto; } +#commentZone .comment ul { + list-style-type: disc; + margin: 13px 0; + padding: 0 0 0 40px; +} + #commentZone textarea { width: 500px; height: 100px;

1 0

r3741 - trunk/pollen-ui-struts2/src/main/webapp/css
by kmorin＠users.chorem.org 09 Nov '12

09 Nov '12

Author: kmorin Date: 2012-11-09 10:35:43 +0100 (Fri, 09 Nov 2012) New Revision: 3741 Url: http://chorem.org/repositories/revision/pollen/3741 Log: layout Modified: trunk/pollen-ui-struts2/src/main/webapp/css/main.css Modified: trunk/pollen-ui-struts2/src/main/webapp/css/main.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/main.css 2012-11-09 09:33:24 UTC (rev 3740) +++ trunk/pollen-ui-struts2/src/main/webapp/css/main.css 2012-11-09 09:35:43 UTC (rev 3741) @@ -398,11 +398,6 @@ color: #727a7e; } -#po-header-addressBar { - padding: 5px; - margin-left: 350px; -} - .IndexAddress { background-color: #ffffaa; } @@ -420,6 +415,7 @@ } .content { + margin-top: 5px; padding: 15px; }

1 0

r3740 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by kmorin＠users.chorem.org 09 Nov '12

09 Nov '12

Author: kmorin Date: 2012-11-09 10:33:24 +0100 (Fri, 09 Nov 2012) New Revision: 3740 Url: http://chorem.org/repositories/revision/pollen/3740 Log: display descrption + do not display author when author is not defined Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp 2012-11-06 20:33:48 UTC (rev 3739) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp 2012-11-09 09:33:24 UTC (rev 3740) @@ -83,15 +83,21 @@ <h1 class="titleCreation"><s:property value="poll.title"/></h1> -<h3><s:property value="poll.title"/> <s:text name="pollen.common.by"/> - <s:property value="poll.creator.votingId"/></h3> +<h3> + <s:if test="%{poll.creator.votingId != ''}"> + <s:text name="pollen.common.by"/> + <s:property value="poll.creator.votingId"/> + </s:if> +</h3> +<p> + <s:property value="poll.description" escapeHtml="false"/> +</p> <div class="ui-widget-content ui-corner-all"> - <s:label key="pollen.common.pollId" value=""/> <span class="fright url" id='pollId'> - <s:property value="%{poll.pollId}"/> - </span> + <s:property value="%{poll.pollId}"/> + </span> <br/> </div>

1 0

r3739 - in trunk: . pollen-ui-struts2 pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org 06 Nov '12

06 Nov '12

Author: tchemit Date: 2012-11-06 21:33:48 +0100 (Tue, 06 Nov 2012) New Revision: 3739 Url: http://chorem.org/repositories/revision/pollen/3739 Log: refs #846: Use nice text rich editor for description in forms Modified: trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp trunk/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-11-06 20:09:20 UTC (rev 3738) +++ trunk/pollen-ui-struts2/pom.xml 2012-11-06 20:33:48 UTC (rev 3739) @@ -181,6 +181,12 @@ </dependency> <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-richtext-plugin</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-json-plugin</artifactId> </dependency> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-11-06 20:09:20 UTC (rev 3738) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-11-06 20:33:48 UTC (rev 3739) @@ -23,6 +23,7 @@ <%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> +<%@ taglib prefix="sjr" uri="/struts-jquery-richtext-tags"%> <link rel="stylesheet" type="text/css" href="<s:url value='/css/pollCreation.css'/>"/> @@ -119,8 +120,12 @@ <s:textfield key="poll.title" label="%{getText('pollen.common.title')}" required="true" size="80"/> - <s:textarea key="poll.description" rows="3" cols="54" - label="%{getText('pollen.common.description')}"/> + + <sjr:ckeditor key="poll.description" rows="10" cols="80" width="800" + label="%{getText('pollen.common.description')}" /> + + <%--s:textarea key="poll.description" rows="3" cols="54" + label="%{getText('pollen.common.description')}"/--%> <s:hidden key="poll.pollId" label=""/> </fieldset> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-06 20:09:20 UTC (rev 3738) +++ trunk/pom.xml 2012-11-06 20:33:48 UTC (rev 3739) @@ -312,6 +312,12 @@ </dependency> <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-richtext-plugin</artifactId> + <version>${jqueryPluginVersion}</version> + </dependency> + + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-json-plugin</artifactId> <version>${struts2Version}</version>

1 0

r3738 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions
by tchemit＠users.chorem.org 06 Nov '12

06 Nov '12

Author: tchemit Date: 2012-11-06 21:09:20 +0100 (Tue, 06 Nov 2012) New Revision: 3738 Url: http://chorem.org/repositories/revision/pollen/3738 Log: fixes #837: Remove date from page header Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-11-06 20:07:54 UTC (rev 3737) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-11-06 20:09:20 UTC (rev 3738) @@ -285,10 +285,6 @@ return language; } - public static Date getCurrentDateTime() { - return new Date(); - } - public String getCurrentUrl() { String result = request.getRequestURL().toString(); return result;

1 0

r3737 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators
by tchemit＠users.chorem.org 06 Nov '12

06 Nov '12

Author: tchemit Date: 2012-11-06 21:07:54 +0100 (Tue, 06 Nov 2012) New Revision: 3737 Url: http://chorem.org/repositories/revision/pollen/3737 Log: fixes #837: Remove date from page header Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-11-06 20:05:29 UTC (rev 3736) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-11-06 20:07:54 UTC (rev 3737) @@ -95,21 +95,24 @@ <body id="<s:property value="%{pageLogo}"/>Body">  -<div id="po-header-localization" class="<s:property value='%{pageLogo}'/>Localization"> +<div id="po-header-localization" + class="<s:property value='%{pageLogo}'/>Localization"> <s:a title="Contacter un administrateur" href="mailto:%{configuration.adminEmail}"> <img src="<s:url value='/img/contact.png' />" alt="Contact"/> </s:a> - | <%=PollenActionSupport.getCurrentDateTime()%> | + | <s:a action="changeLang" namespace="/user" id="localeFr"> <s:param name="request_locale">fr_FR</s:param> <s:param name="redirectUrl" value="%{currentUrl}"/> <img src="<s:url value='/img/fr.png' />" alt="Français"/> - </s:a> | <s:a action="changeLang" namespace="/user" id="localeEn"> - <s:param name="request_locale">en_GB</s:param> - <s:param name="redirectUrl" value="%{currentUrl}"/> - <img src="<s:url value='/img/en.png' />" alt="English"/> -</s:a> + </s:a> + | + <s:a action="changeLang" namespace="/user" id="localeEn"> + <s:param name="request_locale">en_GB</s:param> + <s:param name="redirectUrl" value="%{currentUrl}"/> + <img src="<s:url value='/img/en.png' />" alt="English"/> + </s:a> </div>

1 0

r3736 - trunk
by tchemit＠users.chorem.org 06 Nov '12

06 Nov '12

Author: tchemit Date: 2012-11-06 21:05:29 +0100 (Tue, 06 Nov 2012) New Revision: 3736 Url: http://chorem.org/repositories/revision/pollen/3736 Log: fixes #845: Updates to nuiton-web 1.12-beta-1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-06 20:00:55 UTC (rev 3735) +++ trunk/pom.xml 2012-11-06 20:05:29 UTC (rev 3736) @@ -152,7 +152,7 @@ <eugenePluginVersion>2.5.6-SNAPSHOT</eugenePluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> - <nuitonWebVersion>1.11</nuitonWebVersion> + <nuitonWebVersion>1.12-beta-1</nuitonWebVersion> <nuitonUtilsVersion>2.6.4-SNAPSHOT</nuitonUtilsVersion> <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion>

1 0

r3735 - trunk
by tchemit＠users.chorem.org 06 Nov '12

06 Nov '12

Author: tchemit Date: 2012-11-06 21:00:55 +0100 (Tue, 06 Nov 2012) New Revision: 3735 Url: http://chorem.org/repositories/revision/pollen/3735 Log: fixes #841: Updates to jquery-struts2 3.4.0 fixes #842: Updates to slf4j 1.7.2 fixes #843: Updates to mockito 1.9.5 fixes #844: Updates to selenium 2.26.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-06 18:08:53 UTC (rev 3734) +++ trunk/pom.xml 2012-11-06 20:00:55 UTC (rev 3735) @@ -157,13 +157,13 @@ <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.4.1</struts2Version> - <jqueryPluginVersion>3.3.3</jqueryPluginVersion> + <jqueryPluginVersion>3.4.0</jqueryPluginVersion> <shiroVersion>1.2.1</shiroVersion> - <slf4jVersion>1.6.6</slf4jVersion> + <slf4jVersion>1.7.2</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <seleniumVersion>2.25.0</seleniumVersion> - <mockitoVersion>1.9.0</mockitoVersion> + <seleniumVersion>2.26.0</seleniumVersion> + <mockitoVersion>1.9.5</mockitoVersion> <pollenI18nBundle>pollen-i18n</pollenI18nBundle>

1 0

r3734 - trunk
by tchemit＠users.chorem.org 06 Nov '12

06 Nov '12

Author: tchemit Date: 2012-11-06 19:08:53 +0100 (Tue, 06 Nov 2012) New Revision: 3734 Url: http://chorem.org/repositories/revision/pollen/3734 Log: refs #838: Updates to nuiton-utils 2.6.4 refs #839: Updates to eugene 2.5.6 refs #840: Updates to topia 2.7.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-30 07:45:37 UTC (rev 3733) +++ trunk/pom.xml 2012-11-06 18:08:53 UTC (rev 3734) @@ -148,12 +148,12 @@ <projectId>pollen</projectId>  - <topiaVersion>2.7</topiaVersion> - <eugenePluginVersion>2.5</eugenePluginVersion> + <topiaVersion>2.7.1-SNAPSHOT</topiaVersion> + <eugenePluginVersion>2.5.6-SNAPSHOT</eugenePluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonWebVersion>1.11</nuitonWebVersion> - <nuitonUtilsVersion>2.6.2</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.4-SNAPSHOT</nuitonUtilsVersion> <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.4.1</struts2Version>

1 0