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

r3313 - trunk/src/site/rst
by fdesbois＠users.chorem.org April 24, 2012

April 24, 2012

Author: fdesbois Date: 2012-04-24 15:36:59 +0200 (Tue, 24 Apr 2012) New Revision: 3313 Url: http://chorem.org/repositories/revision/pollen/3313 Log: translate the new french index page in english Modified: trunk/src/site/rst/index.rst Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-04-24 13:15:22 UTC (rev 3312) +++ trunk/src/site/rst/index.rst 2012-04-24 13:36:59 UTC (rev 3313) @@ -22,27 +22,36 @@ .. * #L% .. - Welcome to Pollen website -========================= +------------------------- -What is Pollen ? ----------------- - Pollen is web based poll/vote application. It is aimed to small entities that want to have a way to manage votes without giving their data to someone. -Why is Pollen cool ? --------------------- +No need of user account... +-------------------------- - Pollen features textual, date or image vote. - You can use different `vote counting methods`_ - You can vote anonymously. +- You can change your votes (even anonymous ones). +- You can receive notification and/or reminder emails. +- You can add some comments on a poll. +- You can restrict a poll to one or several lists of persons + (for example, one by company or department). + +But an account offers others features... +---------------------------------------- + +- You can found all polls you've created and participated. - You can import voters lists from CSV files or LDAP. - You can import/export votes/polls. + +But also... +----------- + - You can install Pollen on your own server to keep the control on your data (confidential vote for example). -- Pollen is build as services so you can integrate it wherever you want. - Pollen is Libre so you can modify it, improve it, adapt it to your needs. -- Pollen as a nice looking. .. image:: home.png :alt: Pollen screenshot

1 0

r3312 - in trunk/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions/poll resources resources/config resources/i18n webapp/WEB-INF/jsp webapp/WEB-INF/jsp/poll webapp/js
by fdesbois＠users.chorem.org April 24, 2012

April 24, 2012

Author: fdesbois Date: 2012-04-24 15:15:22 +0200 (Tue, 24 Apr 2012) New Revision: 3312 Url: http://chorem.org/repositories/revision/pollen/3312 Log: Use redirection on ResultLink page after close action Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultLink.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resultLink.jsp Removed: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/resources/shiro.ini trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java 2012-04-24 11:32:56 UTC (rev 3311) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java 2012-04-24 13:15:22 UTC (rev 3312) @@ -23,7 +23,6 @@ */ package org.chorem.pollen.ui.actions.poll; -import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.services.impl.PollService; /** @@ -36,39 +35,25 @@ private static final long serialVersionUID = 1L; - protected PollService pollService; - - protected Poll poll; - - protected String pollResultUrl; + protected String redirectUrl; - protected PollService getPollService() { - if (pollService == null) { - pollService = newService(PollService.class); - } - return pollService; + public String getRedirectUrl() { + return redirectUrl; } - - public Poll getPoll() { - return poll; - } - public String getPollResultUrl() { - return pollResultUrl; + public void setRedirectUrl(String redirectUrl) { + this.redirectUrl = redirectUrl; } @Override public String execute() throws Exception { - - String pollUid = getPollId(); - poll = getPollService().getPollByPollId(pollUid); + PollService service = newService(PollService.class); - pollResultUrl = getPollService().getPollResultUrl(poll).getUrl(); - - getPollService().closePoll(pollUid, - getPollenUserAccount(), - getAccountId()); + service.closePoll(getPollId(), getPollenUserAccount(), getAccountId()); + + addActionMessage(_("pollen.information.poll.closed")); + return SUCCESS; } } Copied: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultLink.java (from rev 3311, trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java) =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultLink.java (rev 0) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultLink.java 2012-04-24 13:15:22 UTC (rev 3312) @@ -0,0 +1,77 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * %% + * 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% + */ +package org.chorem.pollen.ui.actions.poll; + +import org.chorem.pollen.business.persistence.Poll; +import org.chorem.pollen.services.impl.PollService; +import org.chorem.pollen.ui.actions.PageSkin; + +/** + * Display the result link page. + * + * @author fdesbois <desbois(a)codelutin.com> + * @since 1.3 + */ +public class ResultLink extends AbstractPollUriIdAction { + + private static final long serialVersionUID = 1L; + + protected PollService pollService; + + protected Poll poll; + + protected String pollResultUrl; + + protected PollService getPollService() { + if (pollService == null) { + pollService = newService(PollService.class); + } + return pollService; + } + + @Override + public PageSkin getSkin() { + return PageSkin.EDITION; + } + + public Poll getPoll() { + return poll; + } + + public String getPollResultUrl() { + return pollResultUrl; + } + + @Override + public String execute() throws Exception { + + String pollUid = getPollId(); + + poll = getPollService().getPollByPollId(pollUid); + + pollResultUrl = getPollService().getPollResultUrl(poll).getUrl(); + + return SUCCESS; + } +} Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-04-24 11:32:56 UTC (rev 3311) +++ trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-04-24 13:15:22 UTC (rev 3312) @@ -98,9 +98,16 @@ <action name="close/*" class="org.chorem.pollen.ui.actions.poll.ClosePoll"> <param name="uriId">{1}</param> - <result>/WEB-INF/jsp/poll/close.jsp</result> + <result type="redirect2"/> </action> +  + <action name="resultLink/*" + class="org.chorem.pollen.ui.actions.poll.ResultLink"> + <param name="uriId">{1}</param> + <result>/WEB-INF/jsp/poll/resultLink.jsp</result> + </action> +  <action name="confirmDeletePoll/*" class="org.chorem.pollen.ui.actions.poll.ConfirmPollAction"> Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-24 11:32:56 UTC (rev 3311) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-24 13:15:22 UTC (rev 3312) @@ -216,6 +216,7 @@ pollen.information.lostPassword=You will receive a new password to the given email pollen.information.lostPassword.success=An e-mail was sent with your new password. You can change it on your user account page. pollen.information.need.login=You must be logged to access this page. Please fill the form below. +pollen.information.poll.closed=Poll closed pollen.information.poll.created=Poll created pollen.information.poll.form.voteStarted=Votes are started, some options can't be updated. pollen.information.poll.updated=Poll modified Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-24 11:32:56 UTC (rev 3311) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-24 13:15:22 UTC (rev 3312) @@ -219,6 +219,7 @@ pollen.information.lostPassword=Vous allez recevoir un nouveau mot de passe sur l'e-mail suivant pollen.information.lostPassword.success=Un e-mail vous a été envoyé avec votre nouveau mot de passe. Vous pouvez le changer sur la page d'édition de votre compte. pollen.information.need.login=Vous devez être identifié pour pouvoir accéder à cette page. Veuillez remplir le formulaire ci-dessous. +pollen.information.poll.closed=Sondage clos pollen.information.poll.created=Sondage créé pollen.information.poll.form.voteStarted=Les votes ont commencé, certaines options ne sont pas modifiables. pollen.information.poll.updated=Sondage mise à jour Modified: trunk/pollen-ui-struts2/src/main/resources/shiro.ini =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/shiro.ini 2012-04-24 11:32:56 UTC (rev 3311) +++ trunk/pollen-ui-struts2/src/main/resources/shiro.ini 2012-04-24 13:15:22 UTC (rev 3312) @@ -44,4 +44,5 @@ # is pollCreator (can admin a poll) /poll/modification/**=poll,pollCreator -/poll/clone/**=poll,pollCreator \ No newline at end of file +/poll/clone/**=poll,pollCreator +/poll/resultLink/**=poll,pollCreator \ No newline at end of file Deleted: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp 2012-04-24 11:32:56 UTC (rev 3311) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp 2012-04-24 13:15:22 UTC (rev 3312) @@ -1,47 +0,0 @@ -<%-- - #%L - Pollen :: UI (strust2) - - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - %% - 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% - --%> -<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<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> - -<div style="margin-top: 10px;"> - <img src="<s:url value='/img/count.png'/>" - alt="<s:text name='pollen.common.resultAction'/>" - style="margin-right: 18px;"/> - <s:text name='pollen.label.pollResultPage'/> - <br/> - <s:set name="resultUrl" value="%{pollResultUrl}"/> - <s:a href="%{resultUrl}" cssStyle="margin-left:50px;"> - <s:property value="resultUrl"/> - </s:a> -</div> -<div style="margin-top: 30px;"> - <s:text name="pollen.label.pollRegisterPage"/> - <s:a namespace="/user" action="myPolls"> - <s:text name="pollen.common.myPolls"/> - </s:a>. -</div> \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp 2012-04-24 11:32:56 UTC (rev 3311) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp 2012-04-24 13:15:22 UTC (rev 3312) @@ -32,7 +32,7 @@ <s:form method="POST" namespace="/poll"> <fieldset class="ui-widget-content ui-corner-all"> -  + <s:hidden key="redirectUrl" label=''/> <s:hidden key="uriId" label=''/> <s:text name="pollen.information.confirmClosePoll"/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-04-24 11:32:56 UTC (rev 3311) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-04-24 13:15:22 UTC (rev 3312) @@ -56,9 +56,10 @@ choiceType:'<s:property value="%{poll.choiceType.name()}"/>', pollType:'<s:property value="%{poll.pollType.name()}"/>', - adminId:'<s:property value="%{poll.adminId}"/>', confirmCloseTitle: "<s:text name='pollen.title.close.poll'/>", confirmCloseUrl: '<s:url action="confirmClosePoll/" namespace="/poll"/>' + + '<s:property value="%{poll.adminId}"/>', + confirmCloseRedirectUrl: '<s:url action="resultLink/" namespace="/poll"/>' + '<s:property value="%{poll.adminId}"/>' } ); Copied: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resultLink.jsp (from rev 3311, trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp) =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resultLink.jsp (rev 0) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resultLink.jsp 2012-04-24 13:15:22 UTC (rev 3312) @@ -0,0 +1,47 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + %% + 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% + --%> +<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<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> + +<div style="margin-top: 10px;"> + <img src="<s:url value='/img/count.png'/>" + alt="<s:text name='pollen.common.resultAction'/>" + style="margin-right: 18px;"/> + <s:text name='pollen.label.pollResultPage'/> + <br/> + <s:set name="resultUrl" value="%{pollResultUrl}"/> + <s:a href="%{resultUrl}" cssStyle="margin-left:50px;"> + <s:property value="resultUrl"/> + </s:a> +</div> +<div style="margin-top: 30px;"> + <s:text name="pollen.label.pollRegisterPage"/> + <s:a namespace="/user" action="myPolls"> + <s:text name="pollen.common.myPolls"/> + </s:a>. +</div> \ No newline at end of file Property changes on: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resultLink.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-04-24 11:32:56 UTC (rev 3311) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-04-24 13:15:22 UTC (rev 3312) @@ -74,7 +74,7 @@ $('.ui-dialog-title').html("<s:text name="pollen.title.close.poll"/>") var dialog = $("#confirmDialog"); var url = "<s:url action='confirmClosePoll/' namespace='/poll'/>"; - url += id; + url += id + '?' + $.param({redirectUrl:redirectUrl}); dialog.load(url); dialog.dialog('open'); return false; Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-04-24 11:32:56 UTC (rev 3311) +++ trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-04-24 13:15:22 UTC (rev 3312) @@ -488,7 +488,8 @@ function confirmClose() { $('.ui-dialog-title').html(datas['confirmCloseTitle']) var dialog = $("#confirmDialog"); - var url = datas['confirmCloseUrl']; + var url = datas['confirmCloseUrl'] + '?' + + $.param({redirectUrl:datas['confirmCloseRedirectUrl']}); dialog.load(url); dialog.dialog('open'); return false;

1 0

r3311 - in trunk/src/site/fr/resources: . images images/logos
by tchemit＠users.chorem.org April 24, 2012

April 24, 2012

Author: tchemit Date: 2012-04-24 13:32:56 +0200 (Tue, 24 Apr 2012) New Revision: 3311 Url: http://chorem.org/repositories/revision/pollen/3311 Log: add logos for french site Added: trunk/src/site/fr/resources/images/ trunk/src/site/fr/resources/images/logos/ trunk/src/site/fr/resources/images/logos/argouml-logo.png trunk/src/site/fr/resources/images/logos/jrst-logo.png trunk/src/site/fr/resources/images/logos/restructuredtext-logo.png trunk/src/site/fr/resources/images/logos/struts2-logo.png trunk/src/site/fr/resources/images/logos/topia-logo.png Copied: trunk/src/site/fr/resources/images/logos/argouml-logo.png (from rev 3310, trunk/src/site/resources/images/logos/argouml-logo.png) =================================================================== (Binary files differ) Copied: trunk/src/site/fr/resources/images/logos/jrst-logo.png (from rev 3310, trunk/src/site/resources/images/logos/jrst-logo.png) =================================================================== (Binary files differ) Copied: trunk/src/site/fr/resources/images/logos/restructuredtext-logo.png (from rev 3310, trunk/src/site/resources/images/logos/restructuredtext-logo.png) =================================================================== (Binary files differ) Copied: trunk/src/site/fr/resources/images/logos/struts2-logo.png (from rev 3310, trunk/src/site/resources/images/logos/struts2-logo.png) =================================================================== (Binary files differ) Copied: trunk/src/site/fr/resources/images/logos/topia-logo.png (from rev 3310, trunk/src/site/resources/images/logos/topia-logo.png) =================================================================== (Binary files differ)

1 0

r3310 - trunk
by tchemit＠users.chorem.org April 24, 2012

April 24, 2012

Author: tchemit Date: 2012-04-24 13:17:06 +0200 (Tue, 24 Apr 2012) New Revision: 3310 Url: http://chorem.org/repositories/revision/pollen/3310 Log: use mavenpom 3.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-24 10:56:32 UTC (rev 3309) +++ trunk/pom.xml 2012-04-24 11:17:06 UTC (rev 3310) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.3</version> </parent> <groupId>org.chorem</groupId>

1 0

r3309 - trunk/src/site
by tchemit＠users.chorem.org April 24, 2012

April 24, 2012

Author: tchemit Date: 2012-04-24 12:56:32 +0200 (Tue, 24 Apr 2012) New Revision: 3309 Url: http://chorem.org/repositories/revision/pollen/3309 Log: fix site.xml + reformat them (same ident as pom.xml) Modified: trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-04-24 10:52:39 UTC (rev 3308) +++ trunk/src/site/site_en.xml 2012-04-24 10:56:32 UTC (rev 3309) @@ -25,107 +25,109 @@ <project name="${project.name}"> - <bannerLeft> - <src alt="Pollen">logo.jpg</src> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <src alt="Pollen">logo.jpg</src> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> - <publishDate position="right" format="MM/dd/yyyy"/> - <version position="right" /> + <publishDate position="right" format="MM/dd/yyyy"/> + <version position="right"/> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="images/logos/maven-feather.png"/> + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" + img="images/logos/maven-feather.png"/> - <logo href="http://struts.apache.org/" name="Struts 2" - img="images/logos/struts2-logo.png"/> + <logo href="http://struts.apache.org/" name="Struts 2" + img="images/logos/struts2-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" - name="ReStructuredText" - img="images/logos/restructuredtext-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" + name="ReStructuredText" + img="images/logos/restructuredtext-logo.png"/> - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="images/logos/jrst-logo.png"/> + <logo href="http://maven-site.nuiton.org/jrst" name="JRst" + img="images/logos/jrst-logo.png"/> - <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="images/logos/topia-logo.png"/> + <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" + img="images/logos/topia-logo.png"/> - <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="images/logos/argouml-logo.png"/> - </poweredBy> + <logo href="http://argouml.tigris.org/" name="ArgoUML" + img="images/logos/argouml-logo.png"/> + </poweredBy> - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> + <body> - <links> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> - </links> + <breadcrumbs> + <item name="${project.name}" href="${project.url}"/> + </breadcrumbs> - <menu name="Download"> - <item name="Download" href="http://www.chorem.org/projects/list_files/pollen"/> - </menu> + <links> + <item name="nuiton.org" href="http://www.nuiton.org"/> + <item name="chorem.org" href="http://www.chorem.org"/> + <item name="CodeLutin" href="http://codelutin.com"/> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> + </links> - <menu name="Install"> - <item name="Install" href="install.html"/> - </menu> + <menu name="Download"> + <item name="Download" + href="http://www.chorem.org/projects/pollen/files"/> + </menu> - <menu name="Demo"> - <item name="Demo" href="http://pollen.chorem.org/"/> - </menu> + <menu name="Install"> + <item name="Install" href="install.html"/> + </menu> - <menu name="Language"> - <item name="Français" href="fr/index.html" /> - <item name="English" href="index.html" /> - </menu> + <menu name="Demo"> + <item name="Demo" href="http://pollen.chorem.org/"/> + </menu> - <menu ref="parent"/> -  - <menu ref="reports"/> + <menu name="Language"> + <item name="Français" href="fr/index.html"/> + <item name="English" href="index.html"/> + </menu> - <footer> - <script type="text/javascript" - src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> - </script> + <menu ref="reports"/> - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.url}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> + <footer> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> - </body> + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> - </project> + </body> +</project> + Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-04-24 10:52:39 UTC (rev 3308) +++ trunk/src/site/site_fr.xml 2012-04-24 10:56:32 UTC (rev 3309) @@ -25,108 +25,110 @@ <project name="${project.name}"> - <bannerLeft> - <src alt="Pollen">logo.jpg</src> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <src alt="Pollen">logo.jpg</src> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right" /> + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right"/> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="images/logos/maven-feather.png"/> + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" + img="images/logos/maven-feather.png"/> - <logo href="http://struts.apache.org/" name="Struts 2" - img="images/logos/struts2-logo.png"/> + <logo href="http://struts.apache.org/" name="Struts 2" + img="images/logos/struts2-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" - name="ReStructuredText" - img="images/logos/restructuredtext-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" + name="ReStructuredText" + img="images/logos/restructuredtext-logo.png"/> - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="images/logos/jrst-logo.png"/> + <logo href="http://maven-site.nuiton.org/jrst" name="JRst" + img="images/logos/jrst-logo.png"/> - <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="images/logos/topia-logo.png"/> + <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" + img="images/logos/topia-logo.png"/> - <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="images/logos/argouml-logo.png"/> - </poweredBy> + <logo href="http://argouml.tigris.org/" name="ArgoUML" + img="images/logos/argouml-logo.png"/> + </poweredBy> - <body> + <body> - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> + <breadcrumbs> + <item name="${project.name}" href="${project.url}"/> + </breadcrumbs> - <links> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> - </links> + <links> + <item name="nuiton.org" href="http://www.nuiton.org"/> + <item name="chorem.org" href="http://www.chorem.org"/> + <item name="CodeLutin" href="http://codelutin.com"/> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> + </links> - <menu name="Téléchargement"> - <item name="Téléchargement" href="http://www.chorem.org/projects/list_files/pollen"/> - </menu> + <menu name="Téléchargement"> + <item name="Téléchargement" + href="http://www.chorem.org/projects/pollen/files"/> + </menu> - <menu name="Installation"> - <item name="Installation" href="install.html"/> - </menu> + <menu name="Installation"> + <item name="Installation" href="install.html"/> + </menu> - <menu name="Demo"> - <item name="Demo" href="http://pollen.chorem.org/"/> - </menu> + <menu name="Demo"> + <item name="Demo" href="http://pollen.chorem.org/"/> + </menu> - <menu name="Language"> - <item name="Français" href="index.html" /> - <item name="English" href="../index.html" /> - </menu> - - <menu ref="parent"/> -  - <menu ref="reports"/> + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> - <footer> + <menu ref="reports"/> - <script type="text/javascript" - src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> - </script> + <footer> - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.url}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> - </body> + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> + </project>

1 0

r3308 - in trunk/src/site: fr/rst rst
by tchemit＠users.chorem.org April 24, 2012

April 24, 2012

Author: tchemit Date: 2012-04-24 12:52:39 +0200 (Tue, 24 Apr 2012) New Revision: 3308 Url: http://chorem.org/repositories/revision/pollen/3308 Log: fix links Modified: trunk/src/site/fr/rst/index.rst trunk/src/site/rst/index.rst Modified: trunk/src/site/fr/rst/index.rst =================================================================== --- trunk/src/site/fr/rst/index.rst 2012-04-24 10:45:44 UTC (rev 3307) +++ trunk/src/site/fr/rst/index.rst 2012-04-24 10:52:39 UTC (rev 3308) @@ -64,4 +64,4 @@ .. image:: home.png :alt: Page d'accueil de Pollen -.. _mode de dépouillement: ./depouillement.html +.. _modes de dépouillement: ./depouillement.html Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-04-24 10:45:44 UTC (rev 3307) +++ trunk/src/site/rst/index.rst 2012-04-24 10:52:39 UTC (rev 3308) @@ -47,4 +47,4 @@ .. image:: home.png :alt: Pollen screenshot -.. _vote counting methods: methods.html +.. _vote counting methods: ./methods.html

1 0

r3307 - in trunk: . pollen-services/src/main/java/org/chorem/pollen/services pollen-services/src/main/java/org/chorem/pollen/services/exceptions pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions pollen-ui-struts2/src/main/webapp/css pollen-ui-struts2/src/main/webapp/js src/site src/site/fr/rst src/site/resources src/site/resources/images src/site/resources/images/logos
by tchemit＠users.chorem.org April 24, 2012

April 24, 2012

Author: tchemit Date: 2012-04-24 12:45:44 +0200 (Tue, 24 Apr 2012) New Revision: 3307 Url: http://chorem.org/repositories/revision/pollen/3307 Log: fixes #531: Updates to h2 1.3.166 uses mavenpom 3.3-SNAPSHOT (make works documentation with it) svn properties Added: trunk/src/site/resources/images/ trunk/src/site/resources/images/logos/ trunk/src/site/resources/images/logos/argouml-logo.png trunk/src/site/resources/images/logos/jrst-logo.png trunk/src/site/resources/images/logos/restructuredtext-logo.png trunk/src/site/resources/images/logos/struts2-logo.png trunk/src/site/resources/images/logos/topia-logo.png Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java trunk/pollen-ui-struts2/src/main/webapp/css/tipTip.css trunk/pollen-ui-struts2/src/main/webapp/js/jquery.tipTip.minified.js trunk/pom.xml trunk/src/site/fr/rst/depouillement.rst trunk/src/site/fr/rst/index.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java 2012-04-24 09:41:18 UTC (rev 3306) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java 2012-04-24 10:45:44 UTC (rev 3307) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $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% + */ package org.chorem.pollen.ui.actions; import com.opensymphony.xwork2.ActionContext; Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/main/webapp/css/tipTip.css ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/main/webapp/js/jquery.tipTip.minified.js ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-24 09:41:18 UTC (rev 3306) +++ trunk/pom.xml 2012-04-24 10:45:44 UTC (rev 3307) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.2.1</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.chorem</groupId> @@ -457,7 +457,7 @@ <tapestryVersion>5.1.0.5</tapestryVersion> <nuitonWebVersion>1.11</nuitonWebVersion> <nuitonUtilsVersion>2.4.7</nuitonUtilsVersion> - <h2Version>1.3.165</h2Version> + <h2Version>1.3.166</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.1.2</struts2Version> <jqueryPluginVersion>3.3.0</jqueryPluginVersion> @@ -465,12 +465,12 @@ <slf4jVersion>1.6.4</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> -  - <siteLocales>en,fr</siteLocales> -  <license.licenseName>agpl_v3</license.licenseName> +  + + <locales>en,fr</locales> <scmwebeditorEnabled>true</scmwebeditorEnabled> </properties> @@ -531,7 +531,9 @@ <scm> <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</developerConnection> + <developerConnection> + scm:svn:http://svn.chorem.org/svn/pollen/trunk + </developerConnection> <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> Modified: trunk/src/site/fr/rst/depouillement.rst =================================================================== --- trunk/src/site/fr/rst/depouillement.rst 2012-04-24 09:41:18 UTC (rev 3306) +++ trunk/src/site/fr/rst/depouillement.rst 2012-04-24 10:45:44 UTC (rev 3307) @@ -68,6 +68,7 @@ nombre de choix, cela permet de varier entre le scrutin uninominal à un tour et le scrutin par assentiment, cela invite également les électeurs à voter sincèrement. + Méthode par nombre ------------------ Modified: trunk/src/site/fr/rst/index.rst =================================================================== --- trunk/src/site/fr/rst/index.rst 2012-04-24 09:41:18 UTC (rev 3306) +++ trunk/src/site/fr/rst/index.rst 2012-04-24 10:45:44 UTC (rev 3307) @@ -64,4 +64,4 @@ .. image:: home.png :alt: Page d'accueil de Pollen -.. _mode de dépouillement: depouillement.html +.. _mode de dépouillement: ./depouillement.html Added: trunk/src/site/resources/images/logos/argouml-logo.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/logos/argouml-logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/site/resources/images/logos/jrst-logo.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/logos/jrst-logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/site/resources/images/logos/restructuredtext-logo.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/logos/restructuredtext-logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/site/resources/images/logos/struts2-logo.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/logos/struts2-logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/site/resources/images/logos/topia-logo.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/logos/topia-logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-04-24 09:41:18 UTC (rev 3306) +++ trunk/src/site/site_en.xml 2012-04-24 10:45:44 UTC (rev 3307) @@ -30,17 +30,7 @@ <name>${project.name}</name> <href>index.html</href> </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - <bannerRight> <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> <href>http://www.codelutin.com</href> @@ -66,9 +56,24 @@ <version position="right" /> <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" img="http://maven-site.nuiton.org/jrst/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="http://maven-site.nuiton.org/jrst/images/restructuredtext-logo.png"/> + <logo href="http://maven.apache.org" name="Maven" + img="images/logos/maven-feather.png"/> + + <logo href="http://struts.apache.org/" name="Struts 2" + img="images/logos/struts2-logo.png"/> + + <logo href="http://docutils.sourceforge.net/rst.html" + name="ReStructuredText" + img="images/logos/restructuredtext-logo.png"/> + + <logo href="http://maven-site.nuiton.org/jrst" name="JRst" + img="images/logos/jrst-logo.png"/> + + <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" + img="images/logos/topia-logo.png"/> + + <logo href="http://argouml.tigris.org/" name="ArgoUML" + img="images/logos/argouml-logo.png"/> </poweredBy> <body> @@ -103,7 +108,8 @@ <menu ref="reports"/> <footer> - <script type="text/javascript" src="./maven-site-chorem.org.js"> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> </script> <div id='projectMetas' Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-04-24 09:41:18 UTC (rev 3306) +++ trunk/src/site/site_fr.xml 2012-04-24 10:45:44 UTC (rev 3307) @@ -56,9 +56,24 @@ <version position="right" /> <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" img="http://maven-site.nuiton.org/jrst/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="http://maven-site.nuiton.org/jrst/images/restructuredtext-logo.png"/> + <logo href="http://maven.apache.org" name="Maven" + img="images/logos/maven-feather.png"/> + + <logo href="http://struts.apache.org/" name="Struts 2" + img="images/logos/struts2-logo.png"/> + + <logo href="http://docutils.sourceforge.net/rst.html" + name="ReStructuredText" + img="images/logos/restructuredtext-logo.png"/> + + <logo href="http://maven-site.nuiton.org/jrst" name="JRst" + img="images/logos/jrst-logo.png"/> + + <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" + img="images/logos/topia-logo.png"/> + + <logo href="http://argouml.tigris.org/" name="ArgoUML" + img="images/logos/argouml-logo.png"/> </poweredBy> <body> @@ -94,7 +109,8 @@ <footer> - <script type="text/javascript" src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> </script> <div id='projectMetas'

1 0

r3306 - in trunk: pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll pollen-ui-struts2/src/main/resources/config pollen-ui-struts2/src/main/resources/i18n pollen-ui-struts2/src/main/webapp/WEB-INF/jsp pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll pollen-ui-struts2/src/main/webapp/js
by fdesbois＠users.chorem.org April 24, 2012

April 24, 2012

Author: fdesbois Date: 2012-04-24 11:41:18 +0200 (Tue, 24 Apr 2012) New Revision: 3306 Url: http://chorem.org/repositories/revision/pollen/3306 Log: Add missing close action on poll form when edition is activated. There is an issue when rendering the close.jsp page (no layout) but it seems that the decorator doesn't exclude this page. Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-04-24 08:18:28 UTC (rev 3305) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-04-24 09:41:18 UTC (rev 3306) @@ -395,6 +395,20 @@ return result; } + public PollUrl getPollResultUrl(Poll poll) { + URL applicationUrl = serviceContext.getApplicationURL(); + String baseUrl = applicationUrl + "/poll/results/"; + PollUri pollUri = PollUri.newPollUri(poll.getPollId()); + + if (!poll.isPublicResults()) { + String creatorId = poll.getCreator().getAccountId(); + pollUri.setAccountId(creatorId); + } + + PollUrl result = PollUrl.newPollUrl(baseUrl, pollUri); + return result; + } + public List<Poll> getPolls(TopiaFilterPagerUtil.FilterPagerBean pager) { Preconditions.checkNotNull(pager); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-04-24 08:18:28 UTC (rev 3305) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-04-24 09:41:18 UTC (rev 3306) @@ -247,16 +247,7 @@ return creator.getUserAccount() != null; } - protected int getNbChoices() { - //TODO tchemit-2012-03-05 use a default value from configuration - return 5; - } - - protected int getDefaultNbVotingLists() { - return 1; - } - - protected boolean isEdit() { + public boolean isEdit() { return StringUtils.isNotEmpty(getPoll().getTopiaId()); } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java 2012-04-24 08:18:28 UTC (rev 3305) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java 2012-04-24 09:41:18 UTC (rev 3306) @@ -23,6 +23,7 @@ */ package org.chorem.pollen.ui.actions.poll; +import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.services.impl.PollService; /** @@ -35,22 +36,39 @@ private static final long serialVersionUID = 1L; - protected String redirectUrl; + protected PollService pollService; + + protected Poll poll; + + protected String pollResultUrl; - public String getRedirectUrl() { - return redirectUrl; + protected PollService getPollService() { + if (pollService == null) { + pollService = newService(PollService.class); + } + return pollService; } + + public Poll getPoll() { + return poll; + } - public void setRedirectUrl(String redirectUrl) { - this.redirectUrl = redirectUrl; + public String getPollResultUrl() { + return pollResultUrl; } @Override public String execute() throws Exception { + + String pollUid = getPollId(); - PollService service = newService(PollService.class); + poll = getPollService().getPollByPollId(pollUid); - service.closePoll(getPollId(), getPollenUserAccount(), getAccountId()); + pollResultUrl = getPollService().getPollResultUrl(poll).getUrl(); + + getPollService().closePoll(pollUid, + getPollenUserAccount(), + getAccountId()); return SUCCESS; } } Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-04-24 08:18:28 UTC (rev 3305) +++ trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-04-24 09:41:18 UTC (rev 3306) @@ -98,7 +98,7 @@ <action name="close/*" class="org.chorem.pollen.ui.actions.poll.ClosePoll"> <param name="uriId">{1}</param> - <result type="redirect2"/> + <result>/WEB-INF/jsp/poll/close.jsp</result> </action>  Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-24 08:18:28 UTC (rev 3305) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-24 09:41:18 UTC (rev 3306) @@ -113,6 +113,7 @@ pollen.common.pollType=Who can vote ? pollen.common.pollType.help=Free\: accessible to everyone <br/><br/> Restricted\: accessible only to a list of persons <br/><br/> Group\: accessible to several lists of persons pollen.common.postDate=Comment date +pollen.common.resultAction=Count pollen.common.results=Results\: pollen.common.select.choiceType=Select the type of choice pollen.common.select.userFavoriteList=List @@ -235,8 +236,9 @@ pollen.label.contact.administrator=Send an email to an administrator pollen.label.pollEditPage=The link below leads to the page to modify your poll. Save it to be able to modify your poll later if you need it or to close it \: pollen.label.pollRegisterPage=If you are a logged user, you can find these links on the page +pollen.label.pollResultPage=The link below leads to the page to count the votes. Save it to be able to count the vote later \: pollen.label.pollVotePage=The link below leads to the page to vote for your poll. Save it and send it to the people that you want to vote \: -pollen.label.pollVotePage.restricted= +pollen.label.pollVotePage.restricted=The link below leads to the page to vote for your poll. This access is available only for you as poll's creator \: pollen.legend.login=Login pollen.legend.select.favoriteList.to.add=Sélectionner la liste de favoris à ajouter pollen.legend.select.personList.to.create.votingList=Sélectionner la liste des votant à importer dans le nouveau groupe Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-24 08:18:28 UTC (rev 3305) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-24 09:41:18 UTC (rev 3306) @@ -116,6 +116,7 @@ pollen.common.pollType=Qui peut voter ? pollen.common.pollType.help=Libre \: accessible à tout le monde <br/><br/> Restreint \: accessible uniquement à une liste de votants <br/><br/> Groupe \: accessible à plusieurs listes de votants pollen.common.postDate=Date du commentaire +pollen.common.resultAction=Dépouillement pollen.common.results=Résultats \: pollen.common.select.choiceType=Sélectionner le type de choix pollen.common.select.userFavoriteList=Liste @@ -139,7 +140,6 @@ pollen.common.voterName=Votant pollen.common.votingList=Groupe pollen.common.weight=Poids -pollen.common.x=Dépouillement pollen.error.accountNotFound= pollen.error.choice.empty=%s obligatoire pollen.error.comment.name.empty=Nom du commentaire obligatoire @@ -239,6 +239,7 @@ pollen.label.contact.administrator=Contacter un administrateur pollen.label.pollEditPage=Le lien ci-dessous mène à la page de modification du sondage. Enregistrez-le pour pouvoir modifier votre sondage au besoin ou le clore \: pollen.label.pollRegisterPage=Si vous êtes un utilisateur identifié, vous pouvez retrouver ces liens dans la page +pollen.label.pollResultPage=Le lien ci-dessous mène à la page de dépouillement. Enregistrez-le pour pouvoir accéder au dépouillement plus tard \: pollen.label.pollVotePage=Le lien ci-dessous mène à la page de vote. Enregistrez-le et envoyez-le à ceux que vous voulez voir voter \: pollen.label.pollVotePage.restricted=Le lien ci-dessous mène à la page de vote. Cet accès n'est valable que pour vous en tant que créateur du sondage \: pollen.legend.login=Login Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp 2012-04-24 08:18:28 UTC (rev 3305) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp 2012-04-24 09:41:18 UTC (rev 3306) @@ -21,5 +21,27 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --%> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<h2>close poll TODO</h2> \ No newline at end of file +<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<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> + +<div style="margin-top: 10px;"> + <img src="<s:url value='/img/count.png'/>" + alt="<s:text name='pollen.common.resultAction'/>" + style="margin-right: 18px;"/> + <s:text name='pollen.label.pollResultPage'/> + <br/> + <s:set name="resultUrl" value="%{pollResultUrl}"/> + <s:a href="%{resultUrl}" cssStyle="margin-left:50px;"> + <s:property value="resultUrl"/> + </s:a> +</div> +<div style="margin-top: 30px;"> + <s:text name="pollen.label.pollRegisterPage"/> + <s:a namespace="/user" action="myPolls"> + <s:text name="pollen.common.myPolls"/> + </s:a>. +</div> \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp 2012-04-24 08:18:28 UTC (rev 3305) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp 2012-04-24 09:41:18 UTC (rev 3306) @@ -32,7 +32,7 @@ <s:form method="POST" namespace="/poll"> <fieldset class="ui-widget-content ui-corner-all"> - <s:hidden key="redirectUrl" label=''/> +  <s:hidden key="uriId" label=''/> <s:text name="pollen.information.confirmClosePoll"/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-04-24 08:18:28 UTC (rev 3305) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-04-24 09:41:18 UTC (rev 3306) @@ -54,7 +54,12 @@ reminder:'<s:property value="%{reminder}"/>', voteCountingType:'<s:property value="%{poll.voteCountingType.name()}"/>', choiceType:'<s:property value="%{poll.choiceType.name()}"/>', - pollType:'<s:property value="%{poll.pollType.name()}"/>' + pollType:'<s:property value="%{poll.pollType.name()}"/>', + + adminId:'<s:property value="%{poll.adminId}"/>', + confirmCloseTitle: "<s:text name='pollen.title.close.poll'/>", + confirmCloseUrl: '<s:url action="confirmClosePoll/" namespace="/poll"/>' + + '<s:property value="%{poll.adminId}"/>' } ); </script> @@ -253,6 +258,13 @@ <br/> <s:submit action="save" value="%{actionLabel}" align="center"/> + <s:if test="edit"> + <div align="center" style="margin-top: 10px"> + <button onclick="return confirmClose();"> + <s:text name="pollen.action.close"/> + </button> + </div> + </s:if> </s:form> <script type="text/javascript"> @@ -278,3 +290,5 @@ <sj:dialog id="selectPersonListDialog" resizable="true" autoOpen="false" modal="true" width="500"/> + +<sj:dialog id="confirmDialog" autoOpen="false" modal="true" width="500"/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-04-24 08:18:28 UTC (rev 3305) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-04-24 09:41:18 UTC (rev 3306) @@ -74,7 +74,7 @@ $('.ui-dialog-title').html("<s:text name="pollen.title.close.poll"/>") var dialog = $("#confirmDialog"); var url = "<s:url action='confirmClosePoll/' namespace='/poll'/>"; - url += id + '?' + $.param({redirectUrl:redirectUrl}); + url += id; dialog.load(url); dialog.dialog('open'); return false; Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-04-24 08:18:28 UTC (rev 3305) +++ trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-04-24 09:41:18 UTC (rev 3306) @@ -485,6 +485,15 @@ return false; }*/ +function confirmClose() { + $('.ui-dialog-title').html(datas['confirmCloseTitle']) + var dialog = $("#confirmDialog"); + var url = datas['confirmCloseUrl']; + dialog.load(url); + dialog.dialog('open'); + return false; +} + jQuery(document).ready(function () { function changeChoiceAddAllowed(val) {

1 0

r3305 - in trunk/src/site: fr/resources resources
by fdesbois＠users.chorem.org April 24, 2012

April 24, 2012

Author: fdesbois Date: 2012-04-24 10:18:28 +0200 (Tue, 24 Apr 2012) New Revision: 3305 Url: http://chorem.org/repositories/revision/pollen/3305 Log: add svn:keywords Modified: trunk/src/site/fr/resources/home.png trunk/src/site/fr/resources/logo.jpg trunk/src/site/resources/home.png trunk/src/site/resources/logo.jpg Property changes on: trunk/src/site/fr/resources/home.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/fr/resources/logo.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/home.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/logo.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r3304 - in trunk/src/site: fr/resources resources
by fdesbois＠users.chorem.org April 24, 2012

April 24, 2012

Author: fdesbois Date: 2012-04-24 10:01:46 +0200 (Tue, 24 Apr 2012) New Revision: 3304 Url: http://chorem.org/repositories/revision/pollen/3304 Log: images are binary files Modified: trunk/src/site/fr/resources/logo.jpg trunk/src/site/resources/logo.jpg Property changes on: trunk/src/site/fr/resources/logo.jpg ___________________________________________________________________ Modified: svn:mime-type - image/png + image/jpeg Property changes on: trunk/src/site/resources/logo.jpg ___________________________________________________________________ Modified: svn:mime-type - image/png + image/jpeg

1 0