February 2010 - Pollen-commits - mailman.cloud.codelutin.com

r2872 - in trunk: . pollen-business pollen-ui pollen-votecounting
by schorlet＠users.chorem.org Feb. 18, 2010

Feb. 18, 2010

Author: schorlet Date: 2010-02-18 16:17:40 +0100 (Thu, 18 Feb 2010) New Revision: 2872 Modified: trunk/pollen-business/pom.xml trunk/pollen-ui/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2010-02-18 15:17:35 UTC (rev 2871) +++ trunk/pollen-business/pom.xml 2010-02-18 15:17:40 UTC (rev 2872) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.3</version> + <version>1.2.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2010-02-18 15:17:35 UTC (rev 2871) +++ trunk/pollen-ui/pom.xml 2010-02-18 15:17:40 UTC (rev 2872) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.3</version> + <version>1.2.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2010-02-18 15:17:35 UTC (rev 2871) +++ trunk/pollen-votecounting/pom.xml 2010-02-18 15:17:40 UTC (rev 2872) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.3</version> + <version>1.2.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-18 15:17:35 UTC (rev 2871) +++ trunk/pom.xml 2010-02-18 15:17:40 UTC (rev 2872) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.3</version> + <version>1.2.4-SNAPSHOT</version> <modules> <module>pollen-ui</module> @@ -345,9 +345,9 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.2.3</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.2.3</developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.2.3</url> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</developerConnection> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <repositories>

1 0

r2871 - in tags: . pollen-1.2.3
by schorlet＠users.chorem.org Feb. 18, 2010

Feb. 18, 2010

Author: schorlet Date: 2010-02-18 16:17:35 +0100 (Thu, 18 Feb 2010) New Revision: 2871 Added: tags/pollen-1.2.3/ Log: [maven-scm] copy for tag pollen-1.2.3 Property changes on: tags/pollen-1.2.3 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml Added: svn:mergeinfo +

1 0

r2870 - in trunk: . pollen-business pollen-ui pollen-votecounting
by schorlet＠users.chorem.org Feb. 18, 2010

Feb. 18, 2010

Author: schorlet Date: 2010-02-18 16:17:32 +0100 (Thu, 18 Feb 2010) New Revision: 2870 Modified: trunk/pollen-business/pom.xml trunk/pollen-ui/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare release pollen-1.2.3 Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2010-02-18 14:10:54 UTC (rev 2869) +++ trunk/pollen-business/pom.xml 2010-02-18 15:17:32 UTC (rev 2870) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.2.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2010-02-18 14:10:54 UTC (rev 2869) +++ trunk/pollen-ui/pom.xml 2010-02-18 15:17:32 UTC (rev 2870) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.2.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2010-02-18 14:10:54 UTC (rev 2869) +++ trunk/pollen-votecounting/pom.xml 2010-02-18 15:17:32 UTC (rev 2870) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.2.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-18 14:10:54 UTC (rev 2869) +++ trunk/pom.xml 2010-02-18 15:17:32 UTC (rev 2870) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>1.2.3</version> <modules> <module>pollen-ui</module> @@ -345,9 +345,9 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.2.3</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.2.3</developerConnection> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.2.3</url> </scm> <repositories>

1 0

r2869 - in trunk: . src/site src/site/fr/rst src/site/rst
by schorlet＠users.chorem.org Feb. 18, 2010

Feb. 18, 2010

Author: schorlet Date: 2010-02-18 15:10:54 +0100 (Thu, 18 Feb 2010) New Revision: 2869 Added: trunk/src/site/fr/rst/nombre.rst trunk/src/site/rst/number.rst Modified: trunk/changelog.txt trunk/src/site/fr/rst/depouillement.rst trunk/src/site/fr/rst/tutoriel.rst trunk/src/site/rst/approval.rst trunk/src/site/rst/methods.rst trunk/src/site/rst/tutoriel.rst trunk/src/site/rst/user.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Log: documentation du nouveau type de consultation: un nombre Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-02-17 17:49:42 UTC (rev 2868) +++ trunk/changelog.txt 2010-02-18 14:10:54 UTC (rev 2869) @@ -1,9 +1,12 @@ ChangeLog ========= +1.2.3 +- Anomalie #101: Sondage à type de dépouillement: Number 1.2.2 - Rename favicon to favicon.png - Use war launcher from nuiton-utils project +- Evolution #96: Nouveau type de consultation: un nombre 1.2.1 - Erreur lors de la modification de son vote Issue: 87 Modified: trunk/src/site/fr/rst/depouillement.rst =================================================================== --- trunk/src/site/fr/rst/depouillement.rst 2010-02-17 17:49:42 UTC (rev 2868) +++ trunk/src/site/fr/rst/depouillement.rst 2010-02-18 14:10:54 UTC (rev 2869) @@ -7,7 +7,10 @@ * Méthode Condorcet_ * Méthode par pourcentage_ * Méthode par assentiment_ + * Méthode par nombre_ -.. _Méthode Condorcet: condorcet.html -.. _Méthode par pourcentage: pourcentage.html -.. _Méthode par assentiment: assentiment.html \ No newline at end of file +.. _Condorcet: condorcet.html +.. _pourcentage: pourcentage.html +.. _assentiment: assentiment.html +.. _nombre: nombre.html + Added: trunk/src/site/fr/rst/nombre.rst =================================================================== --- trunk/src/site/fr/rst/nombre.rst (rev 0) +++ trunk/src/site/fr/rst/nombre.rst 2010-02-18 14:10:54 UTC (rev 2869) @@ -0,0 +1,13 @@ +Dépouillement par nombre +------------------------ + +La consultation par nombre se déroule en seul tour. Chaque personne +attribue un nombre à chaque choix. On peut aussi décider de ne pas +s'exprimer à propos d'un choix et laisser le champ de saisie vide. + +Le dépouillement indique pour chaque choix: + - le nombre total de votes + - le nombre de votes blanc + - la somme des nombres parmi les votes non blanc + - la moyenne des nombres parmi les votes non blanc + Modified: trunk/src/site/fr/rst/tutoriel.rst =================================================================== --- trunk/src/site/fr/rst/tutoriel.rst 2010-02-17 17:49:42 UTC (rev 2868) +++ trunk/src/site/fr/rst/tutoriel.rst 2010-02-18 14:10:54 UTC (rev 2869) @@ -21,6 +21,7 @@ - **Normal** : sélection de 1 ou n choix parmis les choix possibles(Vote par assentiment) - **Percentage** : attribution d'un pourcentage à chaque choix - **Condorcet** : classement des choix par ordre de préférence (cf `Condorcet`_ ) +- **Nombre** : attribution d'un nombre à chaque choix .. _Condorcet: http://fr.wikipedia.org/wiki/M%C3%A9thode_Condorcet Modified: trunk/src/site/rst/approval.rst =================================================================== --- trunk/src/site/rst/approval.rst 2010-02-17 17:49:42 UTC (rev 2868) +++ trunk/src/site/rst/approval.rst 2010-02-18 14:10:54 UTC (rev 2869) @@ -1,10 +1,10 @@ Approval voting --------------- -The approval voting is a one round voting system. EAch person select as many +The approval voting is a one round voting system. Each person select as many choices as he/she want : none, one, several, all, but never two times the same. The winner is the choice that has the greater number of votes. This method is simple and easy. In Pollen, it is possible to limit the number of choices, this permits to switch from the first-to-post voting (only one choice) -to approval voting (no limit of choice). This invites voters to vote sincerely. \ No newline at end of file +to approval voting (no limit of choice). This invites voters to vote sincerely. Modified: trunk/src/site/rst/methods.rst =================================================================== --- trunk/src/site/rst/methods.rst 2010-02-17 17:49:42 UTC (rev 2868) +++ trunk/src/site/rst/methods.rst 2010-02-18 14:10:54 UTC (rev 2869) @@ -7,8 +7,11 @@ * Condorcet_ method * Percentage_ method - * Approval_ voting + * Approval_ method + * Number_ method + .. _Condorcet: condorcet.html .. _Percentage: percentage.html -.. _Approval: approval.html \ No newline at end of file +.. _Approval: approval.html +.. _Number: number.html Added: trunk/src/site/rst/number.rst =================================================================== --- trunk/src/site/rst/number.rst (rev 0) +++ trunk/src/site/rst/number.rst 2010-02-18 14:10:54 UTC (rev 2869) @@ -0,0 +1,13 @@ +Counting by numbers +------------------- + +The consultation is held by many in one round. Each person +assign a number to each choice. You may also decide not +speak about choice and leave the textbox empty. + +The recount shows for each choice: + - The total number of votes + - The number of white votes + - The sum of votes among non-white + - The average number of votes among non-white + Modified: trunk/src/site/rst/tutoriel.rst =================================================================== --- trunk/src/site/rst/tutoriel.rst 2010-02-17 17:49:42 UTC (rev 2868) +++ trunk/src/site/rst/tutoriel.rst 2010-02-18 14:10:54 UTC (rev 2869) @@ -28,6 +28,7 @@ - **Normal** : select 1 or n winners amongst the choices - **Percentage** : attribute a percentage to each choice - **Condorcet** : Rank the choices by preference order (cf `Condorcet`_ ) +- **Number** : awarding a number to each choice .. _Condorcet: http://en.wikipedia.org/wiki/Condorcet_method Modified: trunk/src/site/rst/user.rst =================================================================== --- trunk/src/site/rst/user.rst 2010-02-17 17:49:42 UTC (rev 2868) +++ trunk/src/site/rst/user.rst 2010-02-18 14:10:54 UTC (rev 2869) @@ -3,8 +3,9 @@ You will find here all the documentation available for Pollen. -You can find an `installation guide`_ and a `tutorial`_ to understand how to create +You can find an `installation guide`_ and a tutorial_ to understand how to create a poll, vote and count votes at the end. -.. _installation guide:install.html -.. _tutorial:tutoriel.html \ No newline at end of file +.. _installation guide: install.html +.. _tutorial: tutoriel.html + Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-02-17 17:49:42 UTC (rev 2868) +++ trunk/src/site/site_en.xml 2010-02-18 14:10:54 UTC (rev 2869) @@ -40,6 +40,7 @@ <item name="Percentage" href="percentage.html"/> <item name="Condorcet" href="condorcet.html"/> <item name="Approval" href="approval.html"/> + <item name="Number" href="number.html"/> </item> </item> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-02-17 17:49:42 UTC (rev 2868) +++ trunk/src/site/site_fr.xml 2010-02-18 14:10:54 UTC (rev 2869) @@ -39,6 +39,7 @@ <item name="Pourcentage" href="pourcentage.html"/> <item name="Condorcet" href="condorcet.html"/> <item name="Assentiment" href="assentiment.html"/> + <item name="Nombre" href="nombre.html"/> </item> </item>

1 0

r2868 - in trunk/pollen-ui: . src/main/java/org/chorem/pollen/ui/components src/main/java/org/chorem/pollen/ui/services src/main/resources/org/chorem/pollen/ui/components src/main/webapp/WEB-INF src/main/webapp/css src/main/webapp/img
by fdesbois＠users.chorem.org Feb. 17, 2010

Feb. 17, 2010

Author: fdesbois Date: 2010-02-17 18:49:42 +0100 (Wed, 17 Feb 2010) New Revision: 2868 Added: trunk/pollen-ui/src/main/webapp/img/contact.png Modified: trunk/pollen-ui/ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/Configuration.java trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_fr.properties trunk/pollen-ui/src/main/webapp/WEB-INF/app.properties trunk/pollen-ui/src/main/webapp/css/main.css Log: Ano #117 : Change footer : - suppress useless messages in properties file - change GPL link place - add contact link in header instead of footer + [WARN] use property in pollen.properties : "adminEmail", need to be override in demo server config - add other links - improve html code Property changes on: trunk/pollen-ui ___________________________________________________________________ Modified: svn:ignore - target .classpath .project .settings *.ipr *.iws *.iml .pollen profiles.xml + *.ipr *.iws .classpath *.iml .project target profiles.xml .pollen nbactions.xml .settings Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java 2010-02-09 16:20:38 UTC (rev 2867) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java 2010-02-17 17:49:42 UTC (rev 2868) @@ -18,7 +18,9 @@ import java.io.File; import java.text.DateFormat; +import java.util.Calendar; import java.util.Date; +import java.util.GregorianCalendar; import java.util.Locale; import org.apache.tapestry5.BindingConstants; @@ -213,6 +215,7 @@ /** * Date et heure actuelles. + * @return current date */ public Date getCurrentTime() { return new Date(); @@ -220,11 +223,21 @@ /** * Version de l'application. + * @return current application version */ public String getVersion() { - return conf.getProperty("version"); + return conf.getProperty(Configuration.PROP_APP_VERSION); } + public int getCurrentYear() { + Calendar current = new GregorianCalendar(); + return current.get(Calendar.YEAR); + } + + public String getContactEmail() { + return conf.getProperty(Configuration.PROP_CONTACT_EMAIL); + } + /** * Retourne si l'utilisateur a renseigné un nom ou un prénom. */ Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/Configuration.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/Configuration.java 2010-02-09 16:20:38 UTC (rev 2867) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/Configuration.java 2010-02-17 17:49:42 UTC (rev 2868) @@ -29,6 +29,8 @@ public static final String FEED_DIR = "feedDir"; public static final String IMG_DIR = "upImgDir"; + public static final String PROP_APP_VERSION = "version"; + public static final String PROP_CONTACT_EMAIL = "adminEmail"; /** * Retourne les propriétés. Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml 2010-02-09 16:20:38 UTC (rev 2867) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml 2010-02-17 17:49:42 UTC (rev 2868) @@ -1,12 +1,12 @@ - +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> <head> - <title>${message:pollen}</title> + <title>Pollen</title> <link rel="icon" type="image/png" href="${asset:context:favicon.png}" /> <t:FeedContextLink t:id="feedContext" /> <t:if test="${feedFileExisting}"> - <t:headlink rel="alternate" type="application/atom+xml" href="${feedFilename}" t:context="feedContext" /> + <link t:type="headlink" rel="alternate" type="application/atom+xml" href="${feedFilename}" t:context="feedContext" /> </t:if> <script type="text/javascript" src="${asset:context:js/pollen.js}" /> </head> @@ -15,20 +15,24 @@  <div id="localization" class="${pageLogo}Localization"> - <t:output value="currentTime" format="dateFormat"/> - | - <t:actionlink t:id="localeFr"> + <a href="mailto:${contactEmail}" title="${message:header-contact-title}"> + <img src="${asset:context:img/contact.png}" alt="Contact" /> + </a> | + <t:output value="currentTime" format="dateFormat"/> | + <a t:type="actionlink" t:id="localeFr" href="#"> <img src="${asset:context:img/fr.png}" alt="Français" /> - </t:actionlink> | - <t:actionlink t:id="localeEn"> + </a> | + <a t:type="actionlink" t:id="localeEn" href="#"> <img src="${asset:context:img/en.png}" alt="English" /> - </t:actionlink> + </a> </div>  - <t:pagelink t:page="Index"> - <img src="${asset:context:img}/${logo}" id="top_logo" alt="${message:pollen}" /> - </t:pagelink> + <p id="top_logo"> + <a t:type="pagelink" t:page="index" href="index"> + <img src="${asset:context:img}/${logo}" alt="Pollen" /> + </a> + </p> <t:zone t:id="top" class="${pageLogo}" show="show" update="show">  @@ -59,24 +63,24 @@ <div class="dropdown_menu" id="login_menu" style="display: none;"> <div class="top_right${pageLogo}"></div> <div class="top_left${pageLogo}"></div> - <ul class="top_middle${pageLogo}"> - <t:form t:id="loginForm"> + <form t:type="form" t:id="loginForm" action="post"> + <ul class="top_middle${pageLogo}"> <li> - <t:errors /> + <div t:type="errors" /> </li> <li> - <t:label for="login" />: - <input t:type="TextField" t:id="login" validate="required" size="10" /> + <label t:type="label" for="login" />: + <input t:type="TextField" t:id="login" t:validate="required" size="10" /> </li> <li> - <t:label for="password"/>: - <input t:type="PasswordField" t:id="password" validate="required" size="10" /> + <label t:type="label" for="password"/>: + <input t:type="PasswordField" t:id="password" t:validate="required" size="10" /> </li> <li> <input t:id="submitform" t:type="Submit" t:value="${message:loginSubmit}" /> </li> - </t:form> - </ul> + </ul> + </form> </div> ${message:or} <t:pagelink t:page="user/Register">${message:register}</t:pagelink> @@ -87,7 +91,7 @@  <ul id="menu"> <li class="menu_elt"> - <t:pagelink t:page="Index">${message:home}</t:pagelink> + <a t:type="pagelink" t:page="Index" href="index">${message:home}</a> </li> <li class="menu_elt" onmouseout="$('menu1').hide()" onmouseover="$('menu1').show()"> <a>${message:menu1}</a> @@ -142,10 +146,10 @@ <t:loop t:source="address" t:value="lien"> > <strong> - <t:if test="lien.isLienNull()"> - ${lien.name} + <t:if test="lien.address"> + <a t:type="pagelink" t:page="${lien.address}" href="index">${lien.name}</a> <p:else> - <t:pagelink t:page="${lien.address}">${lien.name}</t:pagelink> + ${lien.name} </p:else> </t:if> </strong> @@ -164,12 +168,16 @@  <div id="footer" class="${pageLogo}" xml:space="preserve"> - <a href="${message:docUrl}">${message:pollen}</a> - <a href="${message:downloadUrl}">${version}</a> - - <a href="${message:codeLutinUrl}">${message:copyright}</a> - - <a href="mailto:${message:contactEmail}">${message:contact}</a> - - <a href="${message:bugReportUrl}">${message:bugreport}</a> + <a href="${message:footer-documentation-url}">Pollen</a> + <a href="http://www.chorem.org/projects/list_files/pollen">${version}</a> - + <a href="http://www.gnu.org/licenses/gpl.html">${message:footer-license}</a> - +  + <span title="Copyright">©2009-${currentYear}</span> + <a href="http://www.codelutin.com">Code Lutin</a> - +  + <a href="http://www.chorem.org/projects/pollen/issues">${message:footer-bugReport}</a> - + <a href="http://list.chorem.org/cgi-bin/mailman/listinfo/pollen-users">${message:footer-userSupport}</a> </div> - <a href="${message:gplUrl}"><img src="${asset:context:img/gplv3.png}" alt="GPLv3" /></a> +  </body> </html> Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_en.properties 2010-02-09 16:20:38 UTC (rev 2867) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_en.properties 2010-02-17 17:49:42 UTC (rev 2868) @@ -1,3 +1,6 @@ +#head +header-contact-title=Send a mail to an administrator + #menu login=Log in register=Register @@ -26,5 +29,8 @@ loginFailed=Login or password invalid. #foot -contact=Contact -bugreport=Bug report \ No newline at end of file +#contact=Contact +footer-documentation-url=http://maven-site.chorem.org/pollen/ +footer-license=GPL +footer-bugReport=Bug report +footer-userSupport=User support \ No newline at end of file Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_fr.properties 2010-02-09 16:20:38 UTC (rev 2867) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_fr.properties 2010-02-17 17:49:42 UTC (rev 2868) @@ -1,3 +1,6 @@ +#head +header-contact-title=Contacter un administrateur + #menu login=Identifiez-vous register=Inscrivez-vous @@ -26,5 +29,8 @@ loginFailed=Mauvais identifiant ou mot de passe. #foot -contact=Contact -bugreport=Rapport de bug \ No newline at end of file +#contact=Contact +footer-documentation-url=http://maven-site.chorem.org/pollen/fr +footer-license=Licence GPL +footer-bugReport=Rapport de bug +footer-userSupport=Support utilisateur \ No newline at end of file Modified: trunk/pollen-ui/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/pollen-ui/src/main/webapp/WEB-INF/app.properties 2010-02-09 16:20:38 UTC (rev 2867) +++ trunk/pollen-ui/src/main/webapp/WEB-INF/app.properties 2010-02-17 17:49:42 UTC (rev 2868) @@ -1,17 +1,17 @@ # This is where global application properties go. # Title -pollen=Pollen +#pollen=Pollen # Copyright -copyright=2009-2010 Code Lutin +#copyright=2009-2010 Code Lutin # Contact contactEmail=webmaster(a)codelutin.com # Links -docUrl=http://maven-site.chorem.org/pollen/ -bugReportUrl=http://www.chorem.org/projects/pollen/issues -downloadUrl=http://www.chorem.org/projects/list_files/pollen -codeLutinUrl=http://www.codelutin.com/ -gplUrl=http://www.gnu.org/licenses/gpl.html +#docUrl=http://maven-site.chorem.org/pollen/ +#bugReportUrl=http://www.chorem.org/projects/pollen/issues +#downloadUrl=http://www.chorem.org/projects/list_files/pollen +#codeLutinUrl=http://www.codelutin.com/ +#gplUrl=http://www.gnu.org/licenses/gpl.html Modified: trunk/pollen-ui/src/main/webapp/css/main.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/main.css 2010-02-09 16:20:38 UTC (rev 2867) +++ trunk/pollen-ui/src/main/webapp/css/main.css 2010-02-17 17:49:42 UTC (rev 2868) @@ -68,9 +68,9 @@ /*Haut de page*/ #top_logo { - float: left; - margin-top: -102px; - margin-right: 10px; + float: left; + margin-top: -102px; + margin-right: 10px; } .Index { @@ -423,6 +423,7 @@ margin-top: 20px; } -#footer a { +#footer a, +#footer span { color:#727a7e; } \ No newline at end of file Added: trunk/pollen-ui/src/main/webapp/img/contact.png =================================================================== (Binary files differ) Property changes on: trunk/pollen-ui/src/main/webapp/img/contact.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r2867 - trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services
by jruchaud＠users.chorem.org Feb. 9, 2010

Feb. 9, 2010

Author: jruchaud Date: 2010-02-09 17:20:38 +0100 (Tue, 09 Feb 2010) New Revision: 2867 Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java Log: Javadoc Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java 2010-02-09 16:19:21 UTC (rev 2866) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java 2010-02-09 16:20:38 UTC (rev 2867) @@ -50,6 +50,7 @@ * Import d'un sondage et de ses résultats à partir d'un fichier XML. * * @param filePath chemin du fichier à importer. + * @return le sondage importé */ public PollExportDTO executeImport(String filePath); }

1 0

r2866 - trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business
by jruchaud＠users.chorem.org Feb. 9, 2010

Feb. 9, 2010

Author: jruchaud Date: 2010-02-09 17:19:21 +0100 (Tue, 09 Feb 2010) New Revision: 2866 Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java Log: Formattage Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java 2010-02-09 16:17:54 UTC (rev 2865) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java 2010-02-09 16:19:21 UTC (rev 2866) @@ -24,17 +24,13 @@ * @version $Id$ */ public class Vote { - /** - * Valeur du vote (ex : 1, 2, 3 pour condorcet ou 15 pour pourcentage) - */ + /** Valeur du vote (ex : 1, 2, 3 pour condorcet ou 15 pour pourcentage) */ private double value; - /** - * Poids du vote dans le sondage - */ + + /** Poids du vote dans le sondage */ private double weight; - /** - * Identifiant du votant - */ + + /** Identifiant du votant */ private String votingID; /**

1 0

r2865 - trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business
by jruchaud＠users.chorem.org Feb. 9, 2010

Feb. 9, 2010

Author: jruchaud Date: 2010-02-09 17:17:54 +0100 (Tue, 09 Feb 2010) New Revision: 2865 Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java Log: Formattage Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java 2010-02-09 16:16:50 UTC (rev 2864) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java 2010-02-09 16:17:54 UTC (rev 2865) @@ -165,7 +165,6 @@ */ private void calculateVictories(List<Choice> choices, Map<String, Map<Choice, Double>> votes, boolean byGroup) { - // Initialisation des victoires à 0. victories = new HashMap<Choice, Double>(); for (Choice choice : choices) {

1 0

r2864 - in trunk/pollen-ui/src/main: java/org/chorem/pollen/ui/pages/poll resources/org/chorem/pollen/ui/pages/poll
by schorlet＠users.chorem.org Feb. 9, 2010

Feb. 9, 2010

Author: schorlet Date: 2010-02-09 17:16:50 +0100 (Tue, 09 Feb 2010) New Revision: 2864 Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/Results.java trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/Results_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/Results_fr.properties Log: fin de l'evolution #96: ajout du nombre total de votes traduction des libell?\195?\169s Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/Results.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/Results.java 2010-02-09 16:05:39 UTC (rev 2863) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/Results.java 2010-02-09 16:16:50 UTC (rev 2864) @@ -390,9 +390,16 @@ private void computeResults(ResultListDTO resultListDTO) { if (poll.getVoteCounting() == VoteCountingType.NUMBER) { + // resultats des choix cachés choicesResults = new LinkedHashMap<String, List<String>>(); + + // sous-titres des vrais choix (les choix pas cachés) subtitles = new LinkedHashMap<String, List<String>>(); + /* + * liste des vrais choix (les choix pas cachés). + * cette variable sera affectée à la variable results + */ List<ResultDTO> results2 = new ArrayList<ResultDTO>(); // Ajout des résultats des choix cachés @@ -424,6 +431,7 @@ Set<Entry<String, List<String>>> entries = choicesResults.entrySet(); for (Entry<String, List<String>> entry : entries) { String choiceName = entry.getKey(); + List<String> values = entry.getValue(); // Récupération du choix correspondant au résultat VoteCountingResultDTO voteCountingResultDTO = resultListDTO @@ -437,13 +445,18 @@ choiceSubtitles = new ArrayList<String>(); } - choiceSubtitles.add("total"); + choiceSubtitles.add(messages.get("numberVote-total")); choiceSubtitles.add(String.valueOf(choice.getValue())); - choiceSubtitles.add("average"); + + choiceSubtitles.add(messages.get("numberVote-average")); choiceSubtitles.add(String.valueOf(choice.getAverage())); - choiceSubtitles.add("blanks"); + + choiceSubtitles.add(messages.get("numberVote-blank-votes")); choiceSubtitles.add(String.valueOf(choice.getNbBlankVotes())); + choiceSubtitles.add(messages.get("numberVote-total-votes")); + choiceSubtitles.add(String.valueOf(values.size() / 2)); + subtitles.put(choiceName, choiceSubtitles); break; } Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/Results_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/Results_en.properties 2010-02-09 16:05:39 UTC (rev 2863) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/Results_en.properties 2010-02-09 16:16:50 UTC (rev 2864) @@ -21,4 +21,8 @@ normal=normal pollNotClosed=The poll is not closed. Results may change. pollNotFound=The poll you want to count does not exist. -userNotAllowed=You are not allowed to count the votes for this poll. \ No newline at end of file +userNotAllowed=You are not allowed to count the votes for this poll. +numberVote-total=Sum of numbers +numberVote-average=Average of numbers +numberVote-blank-votes=Number of blank votes +numberVote-total-votes=Total votes Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/Results_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/Results_fr.properties 2010-02-09 16:05:39 UTC (rev 2863) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/Results_fr.properties 2010-02-09 16:16:50 UTC (rev 2864) @@ -21,4 +21,8 @@ normal=normal pollNotClosed=Ce sondage n'est pas clos. Les résultats peuvent encore changer. pollNotFound=Le sondage que vous voulez dépouiller n'existe pas. -userNotAllowed=Vous n'êtes pas autorisé à dépouiller ce sondage. \ No newline at end of file +userNotAllowed=Vous n'êtes pas autorisé à dépouiller ce sondage. +numberVote-total=Somme des nombres +numberVote-average=Moyenne des nombres +numberVote-blank-votes=Nombre de votes blancs +numberVote-total-votes=Nombre total de votes

1 0

r2863 - trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils
by jruchaud＠users.chorem.org Feb. 9, 2010

Feb. 9, 2010

Author: jruchaud Date: 2010-02-09 17:05:39 +0100 (Tue, 09 Feb 2010) New Revision: 2863 Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java Log: Fomattage Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java 2010-02-09 15:31:45 UTC (rev 2862) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java 2010-02-09 16:05:39 UTC (rev 2863) @@ -301,7 +301,6 @@ * @param transaction la transaction courante */ public static void doCatch(Exception eee, TopiaContext transaction, String message) { - if (log.isErrorEnabled()) { log.error(message, eee); }

1 0