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

r2795 - in trunk: . pollen-business
by fdesbois＠users.chorem.org Nov. 6, 2009

Nov. 6, 2009

Author: fdesbois Date: 2009-11-06 13:19:41 +0100 (Fri, 06 Nov 2009) New Revision: 2795 Modified: trunk/pollen-business/pom.xml trunk/pom.xml Log: Migration Topia 2.3 beta and Eugene 2.0 beta Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2009-11-06 10:38:00 UTC (rev 2794) +++ trunk/pollen-business/pom.xml 2009-11-06 12:19:41 UTC (rev 2795) @@ -81,21 +81,17 @@ <version>${eugene.version}</version> <executions> <execution> - <phase>process-sources</phase> + <phase>generate-sources</phase>  <configuration> - <addCompileDirectory>true</addCompileDirectory> - <srcDirZuml>${maven.src.dir}/main/xmi</srcDirZuml> - <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> - <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> + <reader>org.nuiton.eugene.ObjectModelReader</reader> <includes>**/*.objectmodel</includes> <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates> - <destDirGen>${maven.gen.dir}/java</destDirGen> <defaultPackage>org.chorem.pollen.business.persistence</defaultPackage> <extractedPackages>org.chorem.pollen.business.persistence</extractedPackages> <copyVersionDir>${project.basedir}/src/main/resources/oldmappings/pollen</copyVersionDir> <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> - <copyOverwrite>true</copyOverwrite> + <overwrite>true</overwrite> </configuration> <goals> <goal>zargo2xmi</goal> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-06 10:38:00 UTC (rev 2794) +++ trunk/pom.xml 2009-11-06 12:19:41 UTC (rev 2795) @@ -295,8 +295,8 @@   - <topia.version>2.2.2-SNAPSHOT</topia.version> - <eugene.version>1.0.1-SNAPSHOT</eugene.version> + <topia.version>2.3.0-beta-SNAPSHOT</topia.version> + <eugene.version>2.0.0-beta-SNAPSHOT</eugene.version> <tapestry.version>5.1.0.5</tapestry.version>

1 0

r2794 - trunk
by echatellier＠users.chorem.org Nov. 6, 2009

Nov. 6, 2009

Author: echatellier Date: 2009-11-06 11:38:00 +0100 (Fri, 06 Nov 2009) New Revision: 2794 Modified: trunk/pom.xml Log: la 1.0.13 a ?\195?\169t?\195?\169 mal d?\195?\169ploy?\195?\169e, retour sur la 1.0.12 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-06 08:25:45 UTC (rev 2793) +++ trunk/pom.xml 2009-11-06 10:38:00 UTC (rev 2794) @@ -105,7 +105,7 @@ <dependency> <groupId>jfree</groupId> <artifactId>jfreechart</artifactId> - <version>1.0.13</version> + <version>1.0.12</version> </dependency> <dependency> <groupId>javassist</groupId>

1 0

r2793 - trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils
by echatellier＠users.chorem.org Nov. 6, 2009

Nov. 6, 2009

Author: echatellier Date: 2009-11-06 09:25:45 +0100 (Fri, 06 Nov 2009) New Revision: 2793 Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java Log: Passage de la stacktrace jndi en trace 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 2009-11-06 08:21:46 UTC (rev 2792) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java 2009-11-06 08:25:45 UTC (rev 2793) @@ -145,13 +145,19 @@ filename = (String) jndiContext.lookup("configurationfilename"); } catch (NamingException e) { - if (log.isDebugEnabled()) { - log.debug("Can't get jndi", e); - } else if (log.isInfoEnabled()) { - log.info("Can't get jndi"); + + // ce n'est pas forcement une erreur + // elle arrive si l'application est lancé normalement + // c'est a dire (hors war embarqué par winstone) + if (log.isInfoEnabled()) { + log.info("JNDI context not found (normal launch, jndi only exist in winstone launch)"); + + if (log.isTraceEnabled()) { + log.trace("Can't get jndi", e); + } } } - + // .. if styll null, set default one if (filename == null || filename.isEmpty()) { filename = "pollen.properties";

1 0

r2792 - in trunk: . pollen-ui
by echatellier＠users.chorem.org Nov. 6, 2009

Nov. 6, 2009

Author: echatellier Date: 2009-11-06 09:21:46 +0100 (Fri, 06 Nov 2009) New Revision: 2792 Modified: trunk/changelog.txt trunk/pollen-ui/pom.xml trunk/pom.xml Log: Global dependencies update Use hudson version of winstone web server (original seam unmaintained) Fix slf4j dependency bug between api & impl Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-11-05 13:58:23 UTC (rev 2791) +++ trunk/changelog.txt 2009-11-06 08:21:46 UTC (rev 2792) @@ -1,6 +1,10 @@ ChangeLog +========= 1.2.0 +- Global dependencies update +- Use hudson version of winstone web server (original seam unmaintained) +- Fix slf4j dependency bug between api & impl - Evol #54 - Ano #49 Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2009-11-05 13:58:23 UTC (rev 2791) +++ trunk/pollen-ui/pom.xml 2009-11-06 08:21:46 UTC (rev 2792) @@ -32,6 +32,14 @@ <artifactId>tapestry-core</artifactId> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-upload</artifactId> </dependency> @@ -64,7 +72,7 @@ <artifactId>junit</artifactId> </dependency> <dependency> - <groupId>net.sourceforge.winstone</groupId> + <groupId>org.jvnet.hudson.winstone</groupId> <artifactId>winstone</artifactId> <scope>provided</scope> </dependency> @@ -124,7 +132,7 @@ </archive> <overlays> <overlay> - <groupId>net.sourceforge.winstone</groupId> + <groupId>org.jvnet.hudson.winstone</groupId> <artifactId>winstone</artifactId> <type>jar</type> </overlay> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-05 13:58:23 UTC (rev 2791) +++ trunk/pom.xml 2009-11-06 08:21:46 UTC (rev 2792) @@ -40,7 +40,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> - <version>1.1</version> + <version>1.2</version> </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -70,6 +70,18 @@ </exclusions> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.8</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.8</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-upload</artifactId> <version>${tapestry.version}</version> @@ -77,7 +89,7 @@ <dependency> <groupId>org.chenillekit</groupId> <artifactId>chenillekit-tapestry</artifactId> - <version>1.0.0</version> + <version>1.2.0</version> <exclusions> <exclusion> <groupId>jboss</groupId> @@ -93,7 +105,7 @@ <dependency> <groupId>jfree</groupId> <artifactId>jfreechart</artifactId> - <version>1.0.12</version> + <version>1.0.13</version> </dependency> <dependency> <groupId>javassist</groupId> @@ -103,7 +115,7 @@ <dependency> <groupId>net.sf.opencsv</groupId> <artifactId>opencsv</artifactId> - <version>1.8</version> + <version>2.0.1</version> </dependency> <dependency> <groupId>rome</groupId> @@ -113,12 +125,12 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.121</version> + <version>1.2.122</version> </dependency> <dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> - <version>8.3-603.jdbc4</version> + <version>8.4-701.jdbc4</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -133,9 +145,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>net.sourceforge.winstone</groupId> + <groupId>org.jvnet.hudson.winstone</groupId> <artifactId>winstone</artifactId> - <version>0.9.10</version> + <version>0.9.10-hudson-15</version> </dependency> </dependencies> </dependencyManagement> @@ -334,15 +346,6 @@ <repositories> -  - <repository> - <id>chenillekit</id> - <url>http://www.chenillekit.org/mvnrepo/release</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> -  <repository> <id>maven2-repository.dev.java.net</id>

1 0

r2791 - trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components
by echatellier＠users.chorem.org Nov. 5, 2009

Nov. 5, 2009

Author: echatellier Date: 2009-11-05 14:58:23 +0100 (Thu, 05 Nov 2009) New Revision: 2791 Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FileLink.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/HeadLink.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Image.java Log: Fix security issue (filer resources with .. in name/src/href) Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FileLink.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FileLink.java 2009-11-04 16:08:42 UTC (rev 2790) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FileLink.java 2009-11-05 13:58:23 UTC (rev 2791) @@ -25,6 +25,7 @@ import javax.activation.MimetypesFileTypeMap; +import org.apache.commons.lang.StringUtils; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.Link; import org.apache.tapestry5.MarkupWriter; @@ -84,7 +85,9 @@ /** Affichage du fichier */ public StreamResponse onCreateLink(final String filename, String type) { - if (filename == null || "".equals(filename)) { + + // security : src containing .. are filtered, to not access to full system + if (StringUtils.isEmpty(filename) || filename.contains("..")) { return null; } Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/HeadLink.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/HeadLink.java 2009-11-04 16:08:42 UTC (rev 2790) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/HeadLink.java 2009-11-05 13:58:23 UTC (rev 2791) @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; +import org.apache.commons.lang.StringUtils; import org.apache.tapestry5.BindingConstants; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.Link; @@ -82,7 +83,9 @@ /** Affichage du fichier */ public StreamResponse onFileLink(final String href, final String type) { - if (href == null || "".equals(href)) { + + // security : src containing .. are filtered, to not access to full system + if (StringUtils.isEmpty(href) || href.contains("..")) { return null; } Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Image.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Image.java 2009-11-04 16:08:42 UTC (rev 2790) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Image.java 2009-11-05 13:58:23 UTC (rev 2791) @@ -24,6 +24,7 @@ import javax.activation.MimetypesFileTypeMap; +import org.apache.commons.lang.StringUtils; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.Link; import org.apache.tapestry5.MarkupWriter; @@ -93,7 +94,9 @@ /** Affichage de l'image */ public StreamResponse onImageLink(final String src, final int width, final int height) { - if (src == null || "".equals(src)) { + + // security : src containing .. are filtered, to not access to full system + if (StringUtils.isEmpty(src) || src.contains("..")) { return null; }

1 0

r2790 - trunk/src/site/fr/rst
by jcouteau＠users.chorem.org Nov. 4, 2009

Nov. 4, 2009

Author: jcouteau Date: 2009-11-04 17:08:42 +0100 (Wed, 04 Nov 2009) New Revision: 2790 Modified: trunk/src/site/fr/rst/index.rst Log: Add mention of condorcet method Modified: trunk/src/site/fr/rst/index.rst =================================================================== --- trunk/src/site/fr/rst/index.rst 2009-11-04 15:26:08 UTC (rev 2789) +++ trunk/src/site/fr/rst/index.rst 2009-11-04 16:08:42 UTC (rev 2790) @@ -12,6 +12,7 @@ --------------------------- - Pollen permet de voter pour des textes, dates ou images. +- Vous pouvez utiliser un dépouillement classique ou Condorcet - Vous pouvez voter anonymement. - Vous pouvez importer des listes de votants depuis des fichiers de CSV ou des annuaires LDAP.

1 0

r2789 - in trunk/pollen-ui/src/main: java/org/chorem/pollen/ui/base java/org/chorem/pollen/ui/components java/org/chorem/pollen/ui/pages/poll java/org/chorem/pollen/ui/services java/org/chorem/pollen/ui/utils resources resources/org/chorem/pollen/ui/components webapp/poll
by fdesbois＠users.chorem.org Nov. 4, 2009

Nov. 4, 2009

Author: fdesbois Date: 2009-11-04 16:26:08 +0100 (Wed, 04 Nov 2009) New Revision: 2789 Added: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/ContextLink.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FeedContextLink.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ImageContextLink.java 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/FileLink.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/HeadLink.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Image.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ImageDisplay.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollCreation.java 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/VoteForPoll.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/Configuration.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/ImageUtil.java trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml trunk/pollen-ui/src/main/resources/pollen.properties trunk/pollen-ui/src/main/webapp/poll/ImageDisplay.tml trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml trunk/pollen-ui/src/main/webapp/poll/Results.tml trunk/pollen-ui/src/main/webapp/poll/VoteForPoll.tml Log: Ano #64 : - Add ContextLink to manage path from configuration - Change absolutepath in url by filename (image or feed) + context component - Change default config for upImgDir and feedDir Added: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/ContextLink.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/ContextLink.java (rev 0) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/ContextLink.java 2009-11-04 15:26:08 UTC (rev 2789) @@ -0,0 +1,33 @@ + +package org.chorem.pollen.ui.base; + +import java.io.File; + +/** + * ContextLink + * + * Created: 4 nov. 2009 + * + * ContextLink for Link components : HeaderLink, FileLink and Image + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public interface ContextLink { + + /** + * ContextPath for the link + * @return a String contextPath + */ + public String getContextPath(); + + /** + * Get a file from context with name defined by filename. + * @param filename name of the file to get + * @return a File with absolutePath corresponding to contextPath + filename + */ + public File getFile(String filename); +} 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 2009-11-02 04:28:18 UTC (rev 2788) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java 2009-11-04 15:26:08 UTC (rev 2789) @@ -35,6 +35,7 @@ import org.chorem.pollen.business.dto.UserDTO; import org.chorem.pollen.business.services.ServiceAuth; import org.chorem.pollen.business.utils.MD5; +import org.chorem.pollen.ui.base.ContextLink; import org.chorem.pollen.ui.data.Lien; import org.chorem.pollen.ui.services.Configuration; @@ -67,7 +68,7 @@ @SuppressWarnings("unused") @Parameter(required = false, defaultPrefix = BindingConstants.LITERAL) @Property - private String feedUrl; + private String feedFilename; /** * Hierarchie de l'adresse @@ -161,6 +162,13 @@ @Inject private ServiceAuth serviceAuth; + @InjectComponent + private ContextLink feedContext; + + public ContextLink getFeedContext() { + return feedContext; + } + /** * Methode appelée lorsque l'utilisateur s'identifie. L'utilisateur est * retrouvé grâce au service d'authentification. @@ -230,10 +238,10 @@ * @return vrai si le fichier existe */ public boolean isFeedFileExisting() { - if (feedUrl == null) { + if (feedFilename == null) { return false; } - File feedFile = new File(feedUrl); + File feedFile = feedContext.getFile(feedFilename); return feedFile.exists() ? true : false; } Added: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FeedContextLink.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FeedContextLink.java (rev 0) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FeedContextLink.java 2009-11-04 15:26:08 UTC (rev 2789) @@ -0,0 +1,36 @@ + +package org.chorem.pollen.ui.components; + +import org.chorem.pollen.ui.base.ContextLink; +import java.io.File; +import org.chorem.pollen.ui.base.*; +import org.apache.tapestry5.MarkupWriter; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.chorem.pollen.ui.services.Configuration; + +/** + * FeedLink + * + * Created: 4 nov. 2009 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class FeedContextLink implements ContextLink { + + @Inject + private Configuration conf; + + @Override + public String getContextPath() { + return conf.getProperty(Configuration.FEED_DIR); + } + + @Override + public File getFile(String filename) { + return new File(getContextPath(), filename + ".xml"); + } +} Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FileLink.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FileLink.java 2009-11-02 04:28:18 UTC (rev 2788) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FileLink.java 2009-11-04 15:26:08 UTC (rev 2789) @@ -16,6 +16,7 @@ package org.chorem.pollen.ui.components; +import org.chorem.pollen.ui.base.ContextLink; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -28,6 +29,7 @@ import org.apache.tapestry5.Link; import org.apache.tapestry5.MarkupWriter; import org.apache.tapestry5.StreamResponse; +import org.apache.tapestry5.annotations.Log; import org.apache.tapestry5.annotations.Parameter; import org.apache.tapestry5.corelib.base.AbstractLink; import org.apache.tapestry5.ioc.annotations.Inject; @@ -52,7 +54,7 @@ /** Chemin du fichier */ @Parameter(required = true) - private String _src; + private String _filename; /** Type MIME du fichier */ @Parameter @@ -64,8 +66,15 @@ @Inject private ComponentResources _resources; + /** + * Context to get the file + */ + @Parameter(required=true) + private ContextLink _context; + + @Log void beginRender(MarkupWriter writer) { - Link link = _resources.createEventLink("createLink", _src, _type); + Link link = _resources.createEventLink("createLink", _filename, _type); writeLink(writer, link); } @@ -74,12 +83,13 @@ } /** Affichage du fichier */ - public StreamResponse onCreateLink(final String src, String type) { - if (src == null || "".equals(src)) { + public StreamResponse onCreateLink(final String filename, String type) { + if (filename == null || "".equals(filename)) { return null; } - File file = new File(src); + //File file = new File(/*_context.getContextPath() + */filename/* + _context.getExtension()*/); + File file = _context.getFile(filename); FileInputStream stream = null; try { stream = new FileInputStream(file); Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/HeadLink.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/HeadLink.java 2009-11-02 04:28:18 UTC (rev 2788) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/HeadLink.java 2009-11-04 15:26:08 UTC (rev 2789) @@ -30,6 +30,7 @@ import org.apache.tapestry5.annotations.Parameter; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.services.Response; +import org.chorem.pollen.ui.base.ContextLink; import org.slf4j.Logger; /** @@ -37,7 +38,7 @@ * * <pre> * Utilisation : - * <t:headlink rel="alternate" href="${feedUrl}" type="application/atom+xml" title="Pollen ATOM Feed" /> + * <t:headlink rel="alternate" href="${feedFilename}" type="application/atom+xml" title="Pollen ATOM Feed" /> * </pre> * * @author rannou @@ -46,6 +47,9 @@ public class HeadLink { /** Chemin du fichier */ + @Parameter(required = true) + private ContextLink _context; + @Parameter(required = true, defaultPrefix = BindingConstants.LITERAL) private String _href; @@ -82,7 +86,7 @@ return null; } - File file = new File(href); + File file = _context.getFile(href); FileInputStream stream = null; try { stream = new FileInputStream(file); Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Image.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Image.java 2009-11-02 04:28:18 UTC (rev 2788) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Image.java 2009-11-04 15:26:08 UTC (rev 2789) @@ -32,6 +32,7 @@ import org.apache.tapestry5.dom.Element; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.services.Response; +import org.chorem.pollen.ui.base.ContextLink; import org.slf4j.Logger; /** @@ -56,6 +57,9 @@ @Parameter(required = true) private String _src; + @Parameter(required = true) + private ContextLink _context; + /** Texte alternatif */ @Parameter private String _alt; @@ -93,7 +97,7 @@ return null; } - File file = new File(src); + File file = _context.getFile(src); FileInputStream stream = null; try { stream = new FileInputStream(file); Added: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ImageContextLink.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ImageContextLink.java (rev 0) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ImageContextLink.java 2009-11-04 15:26:08 UTC (rev 2789) @@ -0,0 +1,68 @@ + +package org.chorem.pollen.ui.components; + +import java.io.File; +import org.apache.tapestry5.annotations.Parameter; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.chorem.pollen.ui.base.ContextLink; +import org.chorem.pollen.ui.services.Configuration; + +/** + * ImageContextLink + * + * Created: 4 nov. 2009 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class ImageContextLink implements ContextLink { + + public static final String THUMB_PREFIX = "thumb_"; + + @Inject + private Configuration config; + + /** + * Directory for files getting or saving from this context + * (ie. subdirectory where images are uploaded, main directory is defined by contextPath) + */ + @Parameter + private String dir; + + /** + * true for thumbnails images prefixed by {@link Configuration.IMG_DIR} + */ + @Parameter + private boolean thumb; + + @Override + public String getContextPath() { + return config.getProperty(Configuration.IMG_DIR); + } + + @Override + public File getFile(String filename) { + if (thumb) { + filename = THUMB_PREFIX + filename; + } + return new File(getImageDir(), filename); + } + + /** + * Get the directory where are uploaded the images from the context. + * @return a File corresponding to the image directory + */ + public File getImageDir() { + File result = null; + if (dir != null && !dir.isEmpty()) { + result = new File(getContextPath(), dir); + } else { + result = new File(getContextPath()); + } + return result; + } + +} Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ImageDisplay.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ImageDisplay.java 2009-11-02 04:28:18 UTC (rev 2788) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ImageDisplay.java 2009-11-04 15:26:08 UTC (rev 2789) @@ -19,6 +19,7 @@ import java.io.File; import org.apache.tapestry5.BindingConstants; +import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Parameter; import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.annotations.Property; @@ -26,6 +27,7 @@ import org.apache.tapestry5.ioc.annotations.Inject; import org.chorem.pollen.business.dto.ChoiceDTO; import org.chorem.pollen.business.dto.PollDTO; +import org.chorem.pollen.ui.components.ImageContextLink; import org.chorem.pollen.ui.data.Lien; import org.chorem.pollen.ui.services.Configuration; @@ -70,6 +72,13 @@ @Property private ChoiceDTO choice; + @InjectComponent + private ImageContextLink imgContext; + + public ImageContextLink getImgContext() { + return imgContext; + } + public PollDTO getPoll() { return poll; } @@ -97,13 +106,6 @@ this.pageStyle = pageStyle; } - /** Retourne le chemin de l'image correspondant au choix courant */ - public String getChoiceImageSrc() { - File dir = new File(conf.getProperty("upImgDir"), poll.getPollId()); - File file = new File(dir, choice.getName()); - return file.getAbsolutePath(); - } - /** * Initialisation de la page */ Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollCreation.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollCreation.java 2009-11-02 04:28:18 UTC (rev 2788) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollCreation.java 2009-11-04 15:26:08 UTC (rev 2789) @@ -63,7 +63,10 @@ import org.chorem.pollen.common.ChoiceType; import org.chorem.pollen.common.PollType; import org.chorem.pollen.common.VoteCountingType; +import org.chorem.pollen.ui.base.ContextLink; import org.chorem.pollen.ui.components.FeedBack; +import org.chorem.pollen.ui.components.FeedContextLink; +import org.chorem.pollen.ui.components.ImageContextLink; import org.chorem.pollen.ui.data.GenericSelectModel; import org.chorem.pollen.ui.data.Lien; import org.chorem.pollen.ui.data.PollHelper; @@ -307,6 +310,18 @@ private List<ImageChoiceUIO> imgTypeChoices; /** + * Contexte pour l'upload des images (parametres definis dans .tml) + */ + @InjectComponent + private ImageContextLink imgContext; + + /** + * Contexte pour la gestion du flux RSS + */ + @InjectComponent + private ContextLink feedContext; + + /** * Formulaire de création de sondage */ @Component(id = "pollCreationForm") @@ -812,8 +827,8 @@ // Création des images if (poll.getChoiceType() == ChoiceType.IMAGE) { - ImageUtil.saveImages(imgTypeChoices, new File(conf - .getProperty("upImgDir"), poll.getPollId())); + File dir = imgContext.getImageDir(); + ImageUtil.saveImages(imgTypeChoices, dir); } // Mise à jour du sondage @@ -830,8 +845,7 @@ PollAccountDTO creator = servicePollAccount.findPollAccountById(poll .getCreatorId()); String voteURL = siteURL + "poll/VoteFor/" + poll.getPollId(); - File feedFile = new File(conf.getProperty("feedDir"), poll.getPollId() - + ".xml"); + File feedFile = feedContext.getFile(poll.getPollId()); FeedUtil.createFeed(feedFile, "atom_1.0", messages.format( "pollFeed_title", poll.getTitle()), siteURL, messages.format( 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 2009-11-02 04:28:18 UTC (rev 2788) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/Results.java 2009-11-04 15:26:08 UTC (rev 2789) @@ -16,7 +16,6 @@ package org.chorem.pollen.ui.pages.poll; -import java.io.File; import java.text.DateFormat; import java.util.ArrayList; import java.util.Collections; @@ -47,6 +46,7 @@ import org.chorem.pollen.common.PollType; import org.chorem.pollen.ui.components.Chart; import org.chorem.pollen.ui.components.FeedBack; +import org.chorem.pollen.ui.components.ImageContextLink; import org.chorem.pollen.ui.data.Lien; import org.chorem.pollen.ui.services.Configuration; import org.slf4j.Logger; @@ -153,6 +153,13 @@ @Inject private ServiceResults serviceResults; + @InjectComponent + private ImageContextLink imgContext; + + public ImageContextLink getImgContext() { + return imgContext; + } + /** Récupération de la liste des résultats pour le diagramme. */ public ArrayList<ArrayList<String>> getChoices() { ArrayList<ArrayList<String>> choices = new ArrayList<ArrayList<String>>(); @@ -310,13 +317,6 @@ return new Date(Long.valueOf(result.getName())); } - /** Retourne le chemin de la miniature correspondant au résultat courant */ - public String getResultThumbSrc() { - File dir = new File(conf.getProperty("upImgDir"), poll.getPollId()); - File file = new File(dir, "thumb_" + result.getName()); - return file.getAbsolutePath(); - } - /** Action réalisée lorsqu'on clique sur l'image */ Object onDisplayImage(String resultName) { String choiceId = ""; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2009-11-02 04:28:18 UTC (rev 2788) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2009-11-04 15:26:08 UTC (rev 2789) @@ -66,7 +66,9 @@ import org.chorem.pollen.common.ChoiceType; import org.chorem.pollen.common.PollType; import org.chorem.pollen.common.VoteCountingType; +import org.chorem.pollen.ui.base.ContextLink; import org.chorem.pollen.ui.components.FeedBack; +import org.chorem.pollen.ui.components.ImageContextLink; import org.chorem.pollen.ui.data.EvenOdd; import org.chorem.pollen.ui.data.Lien; import org.chorem.pollen.ui.data.PollAction; @@ -259,6 +261,34 @@ @Inject private ServiceResults serviceResults; + /** + * Composant pour la gestion des flux RSS + */ + @InjectComponent + private ContextLink feedContext; + + /** + * Context to get feed of the current poll + * @return a FeedContext defined in .tml file + */ + public ContextLink getFeedContext() { + return feedContext; + } + + /** + * Composant pour la gestion des upload d'images + */ + @InjectComponent + private ImageContextLink imgContext; + + /** + * Context to get images for choices. + * @return an ImageContextLink defined in .tml file + */ + public ImageContextLink getImgContext() { + return imgContext; + } + /** Méthode appelée après la soumission du vote. */ @Log Object onSuccessFromVoteForm() { @@ -484,7 +514,7 @@ private void addFeedEntry(PollAction pollAction, String titleStr, String contentStr) { String voteURL = siteURL + "poll/VoteFor/" + poll.getPollId(); - File feedFile = new File(getFeedFileName()); + File feedFile = getFeedContext().getFile(poll.getPollId()); String title = null; String content = null; @@ -601,23 +631,17 @@ * * @return vrai si le fichier existe */ + @Log public boolean isFeedFileExisting() { - File feedFile = new File(getFeedFileName()); + File feedFile = getFeedContext().getFile(poll.getPollId()); + if (log.isDebugEnabled()) { + log.debug("feed context path : " + getFeedContext().getContextPath()); + log.debug("feed absolute path : " + feedFile.getAbsolutePath()); + } return feedFile.exists() ? true : false; } - + /** - * Retourne le nom complet du fichier de flux de syndication. - * - * @return le nom du fichier - */ - public String getFeedFileName() { - File feedFile = new File(conf.getProperty("feedDir"), poll.getPollId() - + ".xml"); - return feedFile.getAbsolutePath(); - } - - /** * Supprime le 0 final d'un nombre à virgule. Le résultat peut-être un * double : 1,0 -> 1 et 1,2 -> 1,2. * @@ -743,8 +767,8 @@ newImageChoice.setName(newImageChoice.getImg().getFileName() .replace(' ', '_')); poll.getChoiceDTOs().add(newImageChoice); - ImageUtil.saveImage(newImageChoice, new File(conf - .getProperty("upImgDir"), poll.getPollId())); + File imgFile = getImgContext().getImageDir(); // dir set in getImgContext() + ImageUtil.saveImage(newImageChoice, imgFile); choiceName = newImageChoice.getName(); choiceDesc = newImageChoice.getDescription(); } @@ -912,20 +936,6 @@ return new Date(Long.valueOf(choiceOfPoll.getName())); } - /** Retourne le chemin de l'image correspondant au choix courant */ - public String getChoiceImageSrc() { - File dir = new File(conf.getProperty("upImgDir"), poll.getPollId()); - File file = new File(dir, choiceOfPoll.getName()); - return file.getAbsolutePath(); - } - - /** Retourne le chemin de la miniature correspondant au choix courant */ - public String getChoiceThumbSrc() { - File dir = new File(conf.getProperty("upImgDir"), poll.getPollId()); - File file = new File(dir, "thumb_" + choiceOfPoll.getName()); - return file.getAbsolutePath(); - } - /** Action réalisée lorsqu'on clique sur l'image */ Object onDisplayImage(String choiceId) { imageDisplay.setPoll(poll); 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 2009-11-02 04:28:18 UTC (rev 2788) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/Configuration.java 2009-11-04 15:26:08 UTC (rev 2789) @@ -27,6 +27,9 @@ */ public interface Configuration { + public static final String FEED_DIR = "feedDir"; + public static final String IMG_DIR = "upImgDir"; + /** * Retourne les propriétés. * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/ImageUtil.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/ImageUtil.java 2009-11-02 04:28:18 UTC (rev 2788) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/ImageUtil.java 2009-11-04 15:26:08 UTC (rev 2789) @@ -30,6 +30,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.ui.components.ImageContextLink; import org.chorem.pollen.ui.data.uio.ImageChoiceUIO; /** @@ -112,7 +113,7 @@ graphics2D.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR); graphics2D.drawImage(image, 0, 0, width, height, null); - File thumbCopied = new File(dir, "thumb_" + img.getName()); + File thumbCopied = new File(dir, ImageContextLink.THUMB_PREFIX + img.getName()); try { ImageIO.write(thumbImage, "jpg", thumbCopied); } catch (IOException e) { 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 2009-11-02 04:28:18 UTC (rev 2788) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml 2009-11-04 15:26:08 UTC (rev 2789) @@ -4,8 +4,9 @@ <head> <title>${message:pollen}</title> <link rel="shortcut icon" type="image/x-icon" href="${asset:context:favicon.ico}" /> + <t:FeedContextLink t:id="feedContext" /> <t:if test="${feedFileExisting}"> - <t:headlink rel="alternate" type="application/atom+xml" href="${feedUrl}" /> + <t: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> Modified: trunk/pollen-ui/src/main/resources/pollen.properties =================================================================== --- trunk/pollen-ui/src/main/resources/pollen.properties 2009-11-02 04:28:18 UTC (rev 2788) +++ trunk/pollen-ui/src/main/resources/pollen.properties 2009-11-04 15:26:08 UTC (rev 2789) @@ -31,7 +31,7 @@ adminEmail=admin(a)domain.com ## R\u00C3\u00A9pertoire des images transf\u00C3\u00A9r\u00C3\u00A9es -upImgDir=~/.pollen/uploadedImages +upImgDir=.pollen/uploadedImages ## Taille maximal des images transf\u00C3\u00A9r\u00C3\u00A9es (en octets) upload.filesize-max=1048576 @@ -43,7 +43,7 @@ email_from=bot(a)pollen.org ## R\u00C3\u00A9pertoire des flux de syndication (Atom) -feedDir=~/.pollen/feeds +feedDir=.pollen/feeds ## Adresse du site (utilis\u00C3\u00A9e pour les emails de rappel) siteUrl= Modified: trunk/pollen-ui/src/main/webapp/poll/ImageDisplay.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/ImageDisplay.tml 2009-11-02 04:28:18 UTC (rev 2788) +++ trunk/pollen-ui/src/main/webapp/poll/ImageDisplay.tml 2009-11-04 15:26:08 UTC (rev 2789) @@ -16,9 +16,9 @@ </div> <h3>${choice.name}</h3> - + <t:ImageContextLink t:id="imgContext" t:dir="poll.pollId"/> <div class="center"> - <t:image src="${choiceImageSrc}" alt="${choiceImageSrc}"/> + <t:image src="${choice.name}" alt="${choice.name}" t:context="imgContext"/> </div> <div class="center" style="margin-top: 10px;"> Modified: trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml 2009-11-02 04:28:18 UTC (rev 2788) +++ trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml 2009-11-04 15:26:08 UTC (rev 2789) @@ -221,6 +221,7 @@  <t:if test="inChoices"> + <t:FeedContextLink t:id="feedContext" /> <t:form t:id="choicesCreationForm"> <div id="choicesCreationFormDiv"> <div> @@ -259,6 +260,7 @@ </div> </t:formfragment> <t:formfragment t:id="imgChoiceFragment" visible="isImgChoices()"> + <t:ImageContextLink t:id="imgContext" t:dir="poll.pollId" /> <div t:type="loop" t:source="imgTypeChoices" t:value="imgTypeChoice" t:volatile="true"> <div class="fleft choiceName"> <t:label for="imgFile" /> Modified: trunk/pollen-ui/src/main/webapp/poll/Results.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/Results.tml 2009-11-02 04:28:18 UTC (rev 2788) +++ trunk/pollen-ui/src/main/webapp/poll/Results.tml 2009-11-04 15:26:08 UTC (rev 2789) @@ -44,9 +44,10 @@ <t:output value="resultNameAsDate" format="dateFormat"/> </t:if> <t:if test="imageType"> + <t:ImageContextLink t:id="imgContext" t:thumb="true" t:dir="poll.pollId" /> <span t:type="ck/Tooltip" value="${result.name}" effect="appear"> <t:eventlink event="displayImage" context="${result.name}"> - <t:image src="${resultThumbSrc}" alt="${result.name}" /> + <t:image src="${result.name}" alt="${result.name}" t:context="imgContext" /> </t:eventlink> </span> </t:if> Modified: trunk/pollen-ui/src/main/webapp/poll/VoteForPoll.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/VoteForPoll.tml 2009-11-02 04:28:18 UTC (rev 2788) +++ trunk/pollen-ui/src/main/webapp/poll/VoteForPoll.tml 2009-11-04 15:26:08 UTC (rev 2789) @@ -1,5 +1,5 @@ -<t:border t:address="address" t:pageLogo="literal:Vote" t:feedUrl="${feedFileName}" +<t:border t:address="address" t:pageLogo="literal:Vote" t:feedFilename="${poll.pollId}" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> <t:feedback t:id="feedback"/> @@ -19,8 +19,9 @@ <img src="${asset:context:img/count.png}" title="${message:results-help}" alt="${message:results}"/> </t:PageLink> </t:if> + <t:FeedContextLink t:id="feedContext" /> <t:if test="feedFileExisting"> - <t:FileLink src="${feedFileName}" type="literal:application/atom+xml"> + <t:FileLink filename="${poll.pollId}" type="literal:application/atom+xml" t:context="feedContext"> <img src="${asset:context:img/feed.png}" title="Atom" alt="Atom"/> </t:FileLink> </t:if> @@ -93,19 +94,20 @@ </t:loop> </t:if> <t:if test="imageType"> + <t:ImageContextLink t:id="imgContext" t:thumb="true" t:dir="poll.pollId"/> <t:loop t:source="poll.choiceDTOs" t:value="choiceOfPoll" volatile="true"> <t:unless test="isDescNull()"> <th class="desc"> <span t:type="ck/Tooltip" title="${message:description}" value="${choiceOfPoll.description}" effect="blind"> <t:eventlink event="displayImage" context="${choiceOfPoll.id}"> - <t:image src="${choiceThumbSrc}" alt="${choiceOfPoll.name}" /> + <t:image src="${choiceOfPoll.name}" alt="${choiceOfPoll.name}" t:context="imgContext"/> </t:eventlink> </span> </th> <p:else> <th> <t:eventlink event="displayImage" context="${choiceOfPoll.id}"> - <t:image src="${choiceThumbSrc}" alt="${choiceOfPoll.name}" /> + <t:image src="${choiceOfPoll.name}" alt="${choiceOfPoll.name}" t:context="imgContext"/> </t:eventlink> </th> </p:else>

1 0

r2788 - trunk
by tchemit＠users.chorem.org Nov. 2, 2009

Nov. 2, 2009

Author: tchemit Date: 2009-11-02 05:28:18 +0100 (Mon, 02 Nov 2009) New Revision: 2788 Modified: trunk/pom.xml Log: - use mavenpom 1.1.0 - reformat poms Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 04:25:47 UTC (rev 2787) +++ trunk/pom.xml 2009-11-02 04:28:18 UTC (rev 2788) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -10,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </parent> <groupId>org.chorem</groupId> @@ -279,7 +280,7 @@  <platform>chorem.org</platform> <projectId>pollen</projectId> - +   <topia.version>2.2.2-SNAPSHOT</topia.version> @@ -291,14 +292,14 @@  <license.licenseName>gpl_v3</license.licenseName> - + </properties> - + <build> - + <pluginManagement> <plugins> - + <plugin> <artifactId>maven-site-plugin</artifactId> <dependencies> @@ -309,10 +310,10 @@ </dependency> </dependencies> </plugin> - + </plugins> </pluginManagement> - + <resources> <resource> <directory>src/main/resources</directory> @@ -330,7 +331,7 @@ <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</developerConnection> <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> - + <repositories>  @@ -341,7 +342,7 @@ <enabled>false</enabled> </snapshots> </repository> - +  <repository> <id>maven2-repository.dev.java.net</id> @@ -379,7 +380,7 @@ <enabled>false</enabled> </releases> </repository> - + </repositories> <pluginRepositories> @@ -416,5 +417,5 @@ </pluginRepository> </pluginRepositories> - + </project>

1 0

r2787 - in trunk: . pollen-business pollen-ui pollen-votecounting
by tchemit＠users.chorem.org Nov. 2, 2009

Nov. 2, 2009

Author: tchemit Date: 2009-11-02 05:25:47 +0100 (Mon, 02 Nov 2009) New Revision: 2787 Modified: trunk/ trunk/pollen-business/ trunk/pollen-ui/ trunk/pollen-votecounting/ Log: svn ignore idea files Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target nbactions.xml .settings .classpath .project + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml Property changes on: trunk/pollen-business ___________________________________________________________________ Modified: svn:ignore - target .classpath .project .settings + target .classpath .project .settings *.ipr *.iws *.iml Property changes on: trunk/pollen-ui ___________________________________________________________________ Modified: svn:ignore - target .classpath .project .settings + target .classpath .project .settings *.ipr *.iws *.iml Property changes on: trunk/pollen-votecounting ___________________________________________________________________ Modified: svn:ignore - target .classpath .project .settings + target .classpath .project .settings *.ipr *.iws *.iml

1 0

r2786 - in trunk/pollen-ui/src/main/webapp: css poll
by fdesbois＠users.chorem.org Oct. 19, 2009

Oct. 19, 2009

Author: fdesbois Date: 2009-10-19 18:12:41 +0200 (Mon, 19 Oct 2009) New Revision: 2786 Modified: trunk/pollen-ui/src/main/webapp/css/main.css trunk/pollen-ui/src/main/webapp/css/pollCreation.css trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml trunk/pollen-ui/src/main/webapp/poll/PollModification.tml Log: Evol #55 : the description field of choices becomes a textarea (more place to explain the choice) Modified: trunk/pollen-ui/src/main/webapp/css/main.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/main.css 2009-10-19 15:10:05 UTC (rev 2785) +++ trunk/pollen-ui/src/main/webapp/css/main.css 2009-10-19 16:12:41 UTC (rev 2786) @@ -10,6 +10,18 @@ margin: auto; } +.fleft { + float: left; +} + +.fright { + float: right; +} + +.clr { + clear: both; +} + #CreationBody { background-image: url("../img/bigCreation.png"); } Modified: trunk/pollen-ui/src/main/webapp/css/pollCreation.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/pollCreation.css 2009-10-19 15:10:05 UTC (rev 2785) +++ trunk/pollen-ui/src/main/webapp/css/pollCreation.css 2009-10-19 16:12:41 UTC (rev 2786) @@ -36,15 +36,27 @@ text-align: left; } +#choicesCreationFormDiv div { + margin-bottom: 5px; +} + #choicesCreationFormDiv fieldset { border: 1px solid #aab; padding: 15px; - width: 600px; + width: 670px; margin: auto; vertical-align: top; text-align: left; } +#choicesCreationFormDiv div.choiceName { + padding-top: 12px; +} + +#choicesCreationFormDiv div.choiceName input.nameField { + width: 280px; +} + #pollCreationFormDiv label { display: block; width: 150px; @@ -89,8 +101,7 @@ #pollCreationFormDiv div, #optionsCreationFormDiv div, -#listsCreationFormDiv div, -#choicesCreationFormDiv div { +#listsCreationFormDiv div { margin-bottom: 10px; } Modified: trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml 2009-10-19 15:10:05 UTC (rev 2785) +++ trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml 2009-10-19 16:12:41 UTC (rev 2786) @@ -232,29 +232,44 @@ <legend>${stepLegend}</legend> <t:formfragment t:id="textChoiceFragment" visible="isTextChoices()"> <div t:type="loop" t:source="choices" t:value="choice" t:volatile="true"> - <t:label for="textName" /> - <t:textfield t:id="textName" t:value="choice.name" /> - - - <t:label for="textDesc" /> - <t:textfield t:id="textDesc" t:value="choice.description" /> + <div class="fleft choiceName"> + <t:label for="textName" /> + <t:textfield class="nameField" t:id="textName" t:value="choice.name" /> + - + <t:label for="textDesc" /> + </div> + <div class="fleft"> + <t:textarea cols="30" t:id="textDesc" t:value="choice.description" /> + </div> + <div class="clr" /> </div> </t:formfragment> <t:formfragment t:id="dateChoiceFragment" visible="isDateChoices()"> <div t:type="loop" t:source="dateTypeChoices" t:value="dateTypeChoice" t:volatile="true"> - <t:label for="dateDTF" /> - <input t:id="dateDTF" t:value="dateTypeChoice.date" t:validate="regexp" t:datePattern="${message:DTF-pattern}"/> - - - <t:label for="dateDesc" /> - <t:textfield t:id="dateDesc" t:value="dateTypeChoice.description" /> + <div class="fleft choiceName"> + <t:label for="dateDTF" /> + <input t:id="dateDTF" t:value="dateTypeChoice.date" t:validate="regexp" t:datePattern="${message:DTF-pattern}"/> + - + <t:label for="dateDesc" /> + </div> + <div class="fleft"> + <t:textarea cols="35" t:id="dateDesc" t:value="dateTypeChoice.description" /> + </div> + <div class="clr" /> </div> </t:formfragment> <t:formfragment t:id="imgChoiceFragment" visible="isImgChoices()"> <div t:type="loop" t:source="imgTypeChoices" t:value="imgTypeChoice" t:volatile="true"> - <t:label for="imgFile" /> - <input t:type="upload" t:id="imgFile" t:value="imgTypeChoice.img" t:validate="regexp" /> - - - <t:label for="imgDesc" /> - <t:textfield t:id="imgDesc" t:value="imgTypeChoice.description" /> + <div class="fleft choiceName"> + <t:label for="imgFile" /> + <input class="nameField" t:type="upload" t:id="imgFile" t:value="imgTypeChoice.img" t:validate="regexp" /> + - + <t:label for="imgDesc" /> + </div> + <div class="fleft"> + <t:textarea cols="30" t:id="imgDesc" t:value="imgTypeChoice.description" /> + </div> + <div class="clr" /> </div> </t:formfragment> </fieldset> Modified: trunk/pollen-ui/src/main/webapp/poll/PollModification.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/PollModification.tml 2009-10-19 15:10:05 UTC (rev 2785) +++ trunk/pollen-ui/src/main/webapp/poll/PollModification.tml 2009-10-19 16:12:41 UTC (rev 2786) @@ -156,18 +156,23 @@ <fieldset> <legend>${stepLegend}</legend> <div t:type="loop" t:source="poll.choiceDTOs" t:value="choice" t:volatile="true"> - <t:if test="isTextChoices()"> - ${choice.name} - </t:if> - <t:if test="isDateChoices()"> - <t:output value="choiceNameAsDate" format="dateFormat"/> - </t:if> - <t:if test="isImgChoices()"> - ${choice.name} - </t:if> - - - <t:label for="desc" /> - <t:textfield t:id="desc" t:value="choice.description" /> + <div class="fleft choiceName"> + <t:if test="isTextChoices()"> + ${choice.name} + </t:if> + <t:if test="isDateChoices()"> + <t:output value="choiceNameAsDate" format="dateFormat"/> + </t:if> + <t:if test="isImgChoices()"> + ${choice.name} + </t:if> + - + <t:label for="desc" /> + </div> + <div class="fleft"> + <t:textarea cols="35" t:id="desc" t:value="choice.description" /> + </div> + <div class="clr" /> </div> </fieldset> <div class="buttons">

1 0