Author: tchemit Date: 2012-09-04 16:06:07 +0200 (Tue, 04 Sep 2012) New Revision: 3671 Url: http://chorem.org/repositories/revision/pollen/3671 Log: improve doc re-add log4j config files (for tests) Added: trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties Modified: trunk/src/site/fr/rst/configure.rst trunk/src/site/fr/rst/depouillement.rst trunk/src/site/rst/methods.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Copied: trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties (from rev 3670, trunk/pollen-votecounting-strategy-borda/src/test/resources/log4j.properties) =================================================================== --- trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties 2012-09-04 14:06:07 UTC (rev 3671) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.chorem.pollen=INFO Copied: trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties (from rev 3670, trunk/pollen-votecounting-strategy-borda/src/test/resources/log4j.properties) =================================================================== --- trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties 2012-09-04 14:06:07 UTC (rev 3671) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.chorem.pollen=INFO Copied: trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties (from rev 3670, trunk/pollen-votecounting-strategy-borda/src/test/resources/log4j.properties) =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties 2012-09-04 14:06:07 UTC (rev 3671) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.chorem.pollen=INFO Copied: trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties (from rev 3670, trunk/pollen-votecounting-strategy-borda/src/test/resources/log4j.properties) =================================================================== --- trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties 2012-09-04 14:06:07 UTC (rev 3671) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.chorem.pollen=INFO Copied: trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties (from rev 3670, trunk/pollen-votecounting-strategy-borda/src/test/resources/log4j.properties) =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties 2012-09-04 14:06:07 UTC (rev 3671) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.chorem.pollen=INFO Modified: trunk/src/site/fr/rst/configure.rst =================================================================== --- trunk/src/site/fr/rst/configure.rst 2012-09-04 13:17:44 UTC (rev 3670) +++ trunk/src/site/fr/rst/configure.rst 2012-09-04 14:06:07 UTC (rev 3671) @@ -101,4 +101,4 @@ | MySql | org.hibernate.dialect.MySQLDialect | com.mysql.jdbc.Driver | jdbc:mysql:pollen | +-------------------------+------------------------------------------+-----------------------------------+------------------------------------------+ -.. _page des options: ./pollen-ui-struts2/application-config-report.html +.. _page des options: ./application-config-report.html Modified: trunk/src/site/fr/rst/depouillement.rst =================================================================== --- trunk/src/site/fr/rst/depouillement.rst 2012-09-04 13:17:44 UTC (rev 3670) +++ trunk/src/site/fr/rst/depouillement.rst 2012-09-04 14:06:07 UTC (rev 3671) @@ -82,3 +82,17 @@ - la somme des nombres parmi les votes non blanc - la moyenne des nombres parmi les votes non blanc +Méthode Coombs +-------------- + +A venir en version 2.5 (http://chorem.org/issues/543) + +Méthode instant-runoff +---------------------- + +A venir en version 2.5 (http://chorem.org/issues/541) + +Méthode Borda +------------- + +A venir en version 2.5 (http://chorem.org/issues/542) Modified: trunk/src/site/rst/methods.rst =================================================================== --- trunk/src/site/rst/methods.rst 2012-09-04 13:17:44 UTC (rev 3670) +++ trunk/src/site/rst/methods.rst 2012-09-04 14:06:07 UTC (rev 3671) @@ -79,3 +79,19 @@ - The number of white votes - The sum of votes among non-white - The average number of votes among non-white + +Méthode Coombs +-------------- + +Coming soon in version 2.5 (http://chorem.org/issues/543) + +Méthode instant-runoff +---------------------- + +Coming soon in version 2.5 (http://chorem.org/issues/541) + +Méthode Borda +------------- + +Coming soon in version 2.5 (http://chorem.org/issues/542) + Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-09-04 13:17:44 UTC (rev 3670) +++ trunk/src/site/site_en.xml 2012-09-04 14:06:07 UTC (rev 3671) @@ -56,23 +56,23 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> + img="http://maven-site.nuiton.org/public/images/logos/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="http://maven-site.nuiton.org/public/images/struts2-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="http://maven-site.nuiton.org/public/images/restructuredtext-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="http://maven-site.nuiton.org/public/images/jrst-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/> <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="http://maven-site.nuiton.org/public/images/topia-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="http://maven-site.nuiton.org/public/images/argouml-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/argouml-logo.png"/> </poweredBy> <body> @@ -97,6 +97,11 @@ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> </links> + <menu name="User documentation"> + <item name="Home" href="./index.html"/> + <item name="Vote counting methods" href="./methods.html"/> + </menu> + <menu name="Install"> <item name="Install Pollen" href="install.html"/> <item name="Configure Pollen" href="configure.html"/> @@ -120,7 +125,7 @@ <menu ref="reports"/> <footer> - <div id='projectMetas' + <div id='projectMetas' locale='en' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-09-04 13:17:44 UTC (rev 3670) +++ trunk/src/site/site_fr.xml 2012-09-04 14:06:07 UTC (rev 3671) @@ -97,6 +97,11 @@ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> </links> + <menu name="Documentation utilisateur"> + <item name="Accueil" href="./index.html"/> + <item name="Méthodes de dépouillement" href="./depouillement.html"/> + </menu> + <menu name="Installation"> <item name="Installer Pollen" href="install.html"/> <item name="Configurer Pollen" href="configure.html"/> @@ -107,7 +112,7 @@ <item name="Instance de tests (utilise la dernière version de dev, pour tests uniquement)" href="http://demo.codelutin.com/pollen"/> </menu> - <menu name="Language"> + <menu name="Langue"> <item name="Français" href="index.html"/> <item name="English" href="../index.html"/> </menu> @@ -116,7 +121,7 @@ <footer> - <div id='projectMetas' + <div id='projectMetas' locale='fr' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}'