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

r3075 - trunk
by tchemit＠users.chorem.org 19 Aug '11

19 Aug '11

Author: tchemit Date: 2011-08-19 18:31:45 +0200 (Fri, 19 Aug 2011) New Revision: 3075 Url: http://chorem.org/repositories/revision/pollen/3075 Log: Update mavenpom4redmine to 3.0.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-16 23:13:59 UTC (rev 3074) +++ trunk/pom.xml 2011-08-19 16:31:45 UTC (rev 3075) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.1</version> + <version>3.0.2</version> </parent> <groupId>org.chorem</groupId>

1 0

r3074 - trunk
by tchemit＠users.chorem.org 16 Aug '11

16 Aug '11

Author: tchemit Date: 2011-08-17 01:13:59 +0200 (Wed, 17 Aug 2011) New Revision: 3074 Url: http://chorem.org/repositories/revision/pollen/3074 Log: Update mavenpom4redmine to 3.0.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-04 09:52:57 UTC (rev 3073) +++ trunk/pom.xml 2011-08-16 23:13:59 UTC (rev 3074) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0</version> + <version>3.0.1</version> </parent> <groupId>org.chorem</groupId>

1 0

r3073 - trunk
by tchemit＠users.chorem.org 04 Aug '11

04 Aug '11

Author: tchemit Date: 2011-08-04 11:52:57 +0200 (Thu, 04 Aug 2011) New Revision: 3073 Url: http://chorem.org/repositories/revision/pollen/3073 Log: Update mavenpom4redmine to 3.0. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-07 20:10:34 UTC (rev 3072) +++ trunk/pom.xml 2011-08-04 09:52:57 UTC (rev 3073) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.5.5</version> + <version>3.0</version> </parent> <groupId>org.chorem</groupId>

1 0

r3072 - trunk
by tchemit＠users.chorem.org 07 Jun '11

07 Jun '11

Author: tchemit Date: 2011-06-07 22:10:34 +0200 (Tue, 07 Jun 2011) New Revision: 3072 Url: http://chorem.org/repositories/revision/pollen/3072 Log: Update mavenpom4redmine to 2.5.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-30 12:40:13 UTC (rev 3071) +++ trunk/pom.xml 2011-06-07 20:10:34 UTC (rev 3072) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.5.4</version> + <version>2.5.5</version> </parent> <groupId>org.chorem</groupId>

1 0

r3071 - in trunk/pollen-ui/src/main: resources/org/chorem/pollen/ui/components webapp/WEB-INF
by echatellier＠users.chorem.org 30 May '11

30 May '11

Author: echatellier Date: 2011-05-30 14:40:13 +0200 (Mon, 30 May 2011) New Revision: 3071 Url: http://chorem.org/repositories/revision/pollen/3071 Log: Fix redmine download links Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml trunk/pollen-ui/src/main/webapp/WEB-INF/app.properties 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 2011-05-30 12:31:15 UTC (rev 3070) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml 2011-05-30 12:40:13 UTC (rev 3071) @@ -189,7 +189,7 @@  <div id="po-footer" class="${pageLogo}" xml:space="preserve"> <a href="${message:footer-documentation-url}">Pollen</a> - <a href="http://www.chorem.org/projects/list_files/pollen">${version}</a> - + <a href="http://www.chorem.org/projects/pollen/files">${version}</a> - <a href="http://www.gnu.org/licenses/gpl.html">${message:footer-license}</a> - <span title="Copyright">©2009-${currentYear}</span> <a href="http://www.codelutin.com">Code Lutin</a> - Modified: trunk/pollen-ui/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/pollen-ui/src/main/webapp/WEB-INF/app.properties 2011-05-30 12:31:15 UTC (rev 3070) +++ trunk/pollen-ui/src/main/webapp/WEB-INF/app.properties 2011-05-30 12:40:13 UTC (rev 3071) @@ -35,6 +35,6 @@ # Links #docUrl=http://maven-site.chorem.org/pollen/ #bugReportUrl=http://www.chorem.org/projects/pollen/issues -#downloadUrl=http://www.chorem.org/projects/list_files/pollen +#downloadUrl=http://www.chorem.org/projects/pollen/files #codeLutinUrl=http://www.codelutin.com/ #gplUrl=http://www.gnu.org/licenses/gpl.html

1 0

r3070 - trunk/src/site
by echatellier＠users.chorem.org 30 May '11

30 May '11

Author: echatellier Date: 2011-05-30 14:31:15 +0200 (Mon, 30 May 2011) New Revision: 3070 Url: http://chorem.org/repositories/revision/pollen/3070 Log: Fix redmine download link 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 2011-05-14 11:46:12 UTC (rev 3069) +++ trunk/src/site/site_en.xml 2011-05-30 12:31:15 UTC (rev 3070) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2010 CodeLutin + Copyright (C) 2009 - 2011 CodeLutin, Chatellier Eric %% 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 @@ -84,7 +84,7 @@ <menu name ="Download"> - <item name="Download" href="http://www.chorem.org/projects/list_files/pollen"/> + <item name="Download" href="http://www.chorem.org/projects/pollen/files"/> </menu> <menu name="Demo"> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2011-05-14 11:46:12 UTC (rev 3069) +++ trunk/src/site/site_fr.xml 2011-05-30 12:31:15 UTC (rev 3070) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2010 CodeLutin + Copyright (C) 2009 - 2011 CodeLutin, Chatellier Eric %% 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 @@ -86,7 +86,7 @@ </menu> <menu name="Téléchargement"> - <item name="Téléchargement" href="http://www.chorem.org/projects/list_files/pollen"/> + <item name="Téléchargement" href="http://www.chorem.org/projects/pollen/files"/> </menu> <menu name="Demo">

1 0

r3069 - trunk
by tchemit＠users.chorem.org 14 May '11

14 May '11

Author: tchemit Date: 2011-05-14 13:46:12 +0200 (Sat, 14 May 2011) New Revision: 3069 Url: http://chorem.org/repositories/revision/pollen/3069 Log: Update mavenpom4redmine to 2.5.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-11 08:47:36 UTC (rev 3068) +++ trunk/pom.xml 2011-05-14 11:46:12 UTC (rev 3069) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.5.3</version> + <version>2.5.4</version> </parent> <groupId>org.chorem</groupId>

1 0

r3068 - trunk
by tchemit＠users.chorem.org 11 Apr '11

11 Apr '11

Author: tchemit Date: 2011-04-11 10:47:36 +0200 (Mon, 11 Apr 2011) New Revision: 3068 Url: http://chorem.org/repositories/revision/pollen/3068 Log: Update mavenpom4redmine to 2.5.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-12 14:23:00 UTC (rev 3067) +++ trunk/pom.xml 2011-04-11 08:47:36 UTC (rev 3068) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.5.2</version> + <version>2.5.3</version> </parent> <groupId>org.chorem</groupId>

1 0

r3067 - trunk
by tchemit＠users.chorem.org 12 Mar '11

12 Mar '11

Author: tchemit Date: 2011-03-12 15:23:00 +0100 (Sat, 12 Mar 2011) New Revision: 3067 Url: http://chorem.org/repositories/revision/pollen/3067 Log: Update mavenpom4redmine to 2.5.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-25 11:09:37 UTC (rev 3066) +++ trunk/pom.xml 2011-03-12 14:23:00 UTC (rev 3067) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.5.1</version> + <version>2.5.2</version> </parent> <groupId>org.chorem</groupId>

1 0

r3066 - in branches/pollen-1.2.6-struts2/pollen-ui: . src/main/java/org/chorem/pollen/ui src/main/java/org/chorem/pollen/ui/actions src/main/java/org/chorem/pollen/ui/actions/poll src/main/java/org/chorem/pollen/ui/actions/user src/main/resources src/main/webapp src/main/webapp/WEB-INF src/main/webapp/WEB-INF/decorators src/main/webapp/jsp src/main/webapp/jsp/admin src/main/webapp/jsp/poll src/main/webapp/jsp/user src/main/webapp/template src/main/webapp/template/simple src/main/webapp/temp
by vbriand＠users.chorem.org 25 Feb '11

25 Feb '11

Author: vbriand Date: 2011-02-25 12:09:37 +0100 (Fri, 25 Feb 2011) New Revision: 3066 Url: http://chorem.org/repositories/revision/pollen/3066 Log: Added Struts2 files Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/PollenSession.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/ branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/PollenBaseAction.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/admin/ branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/poll/ branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePollAction.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/poll/PollsParticipatedAction.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/user/ branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/user/LoginUserAction.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUserAction.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/user/UserProfileAction.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/struts.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/struts.xml branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/WEB-INF/decorators/ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/WEB-INF/decorators/main.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/admin/ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/admin/polls.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/admin/users.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/index.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/closeValidation.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/confirmPoll.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/creationValidation.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/imageDisplay.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/modificationValidation.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollCreation.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollForm.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollLinks.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollModification.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/results.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/voteForPoll.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/lists.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/pollsCreated.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/pollsParticipated.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/profile.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/register.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/simple/ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/simple/form-common.ftl branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/controlheader-core.ftl branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/file.ftl branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/form-close.ftl branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/form.ftl branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/password.ftl branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/submit-close.ftl branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/submit.ftl branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/text.ftl Modified: branches/pollen-1.2.6-struts2/pollen-ui/pom.xml Modified: branches/pollen-1.2.6-struts2/pollen-ui/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/pom.xml 2011-02-17 17:42:32 UTC (rev 3065) +++ branches/pollen-1.2.6-struts2/pollen-ui/pom.xml 2011-02-25 11:09:37 UTC (rev 3066) @@ -1,5 +1,7 @@ <?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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -31,6 +33,16 @@ <artifactId>tapestry-core</artifactId> </dependency> <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + <version>${struts2Version}</version> + </dependency> + <dependency> + <groupId>com.opensymphony</groupId> + <artifactId>xwork-core</artifactId> + <version>2.1.6</version> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> @@ -79,6 +91,24 @@ <artifactId>winstone</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-spring-plugin</artifactId> + <version>${struts2Version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-config-browser-plugin</artifactId> + <version>${struts2Version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <version>${struts2Version}</version> + <scope>runtime</scope> + </dependency> </dependencies>  @@ -96,7 +126,14 @@ <packaging>war</packaging> <properties> - <redmine.releaseFiles>target/${project.build.finalName}.war</redmine.releaseFiles> + <redmine.releaseFiles> + target/${project.build.finalName}.war + </redmine.releaseFiles> + + <i18n.collectOutputName>app</i18n.collectOutputName> + <i18n.bundleOutputName>app</i18n.bundleOutputName> + + <struts2Version>2.1.8.1</struts2Version> </properties> <reporting> @@ -149,7 +186,8 @@ <artifactId>jetty-maven-plugin</artifactId> <configuration> <connectors> - <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> + <connector + implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> <port>8888</port> </connector> </connectors> @@ -158,9 +196,9 @@ </plugins> </build> - <repositories> +  + chenillekit Repository <repository> <id>chenillekit</id> <url>http://www.chenillekit.org/mvnrepo/release</url> @@ -169,13 +207,13 @@ </snapshots> </repository> -  + Maven Java.net Repository <repository> <id>maven2-repository.dev.java.net</id> <name>Java.net Repository for Maven</name> <url>http://download.java.net/maven/2/</url> <layout>default</layout> </repository> - </repositories> + </repositories> --> </project> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/PollenSession.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/PollenSession.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/PollenSession.java 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,31 @@ +package org.chorem.pollen.ui; + +import java.util.Map; + +import com.opensymphony.xwork2.ActionContext; + +/** + * Class used to manage the session + */ +public class PollenSession { + + static final private String POLLEN_SESSION_KEY = PollenSession.class.getSimpleName(); + + static public Map<String, Object> getSession() { + return ActionContext.getContext().getSession(); + } + + static public PollenSession getPollenSession() { + PollenSession session = (PollenSession) getSession().get(POLLEN_SESSION_KEY); + + if (session == null) { + session = new PollenSession(); + getSession().put(POLLEN_SESSION_KEY, session); + } + return session; + } + + static public void invalidate() { + getSession().remove(POLLEN_SESSION_KEY); + } +} Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/PollenBaseAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/PollenBaseAction.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/PollenBaseAction.java 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,95 @@ +package org.chorem.pollen.ui.actions; + +import java.util.List; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.ui.PollenSession; + +import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.util.ValueStack; + +/** + * Base class which must be extended by every action + * It redefines the Struts2 methods used to render text in order to explicitly + * show the missing i18n translations and allows access to the session + */ +public class PollenBaseAction extends ActionSupport { + + private static final long serialVersionUID = 6886502350446292344L; + + protected static final Log log = LogFactory.getLog(PollenBaseAction.class); + + public static final String UNTRANSLATED_MARKER = "???"; + + public PollenSession getPollenSession() { + return PollenSession.getPollenSession(); + } + + @Override + public String getText(String aTextName) { + String value = super.getText(aTextName); + return getSafeText(aTextName, value); + } + + @Override + public String getText(String aTextName, String defaultValue) { + String value = super.getText(aTextName, defaultValue); + return getSafeText(aTextName, value); + } + + @Override + public String getText(String aTextName, String defaultValue, String obj) { + String value = super.getText(aTextName, defaultValue, obj); + return getSafeText(aTextName, value); + } + + @Override + public String getText(String aTextName, List<Object> args) { + String value = super.getText(aTextName, args); + return getSafeText(aTextName, value); + } + + @Override + public String getText(String key, String[] args) { + String value = super.getText(key, args); + return getSafeText(key, value); + } + + @Override + public String getText(String aTextName, String defaultValue, + List<Object> args) { + String value = super.getText(aTextName, defaultValue, args); + return getSafeText(aTextName, value); + } + + @Override + public String getText(String key, String defaultValue, String[] args) { + String value = super.getText(key, defaultValue, args); + return getSafeText(key, value); + } + + @Override + public String getText(String key, String defaultValue, List<Object> args, + ValueStack stack) { + String value = super.getText(key, defaultValue, args, stack); + return getSafeText(key, value); + } + + @Override + public String getText(String key, String defaultValue, String[] args, + ValueStack stack) { + String value = super.getText(key, defaultValue, args, stack); + return getSafeText(key, value); + } + + protected String getSafeText(String key, String value) { + if (StringUtils.isEmpty(value)) { + if (log.isWarnEnabled()) { + log.warn("Key [" + key + "] is not translated"); + } + return UNTRANSLATED_MARKER + key + UNTRANSLATED_MARKER; + } + return value; + } +} Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePollAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePollAction.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePollAction.java 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,5 @@ +package org.chorem.pollen.ui.actions.poll; + +public class CreatePollAction { + +} Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/poll/PollsParticipatedAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/poll/PollsParticipatedAction.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/poll/PollsParticipatedAction.java 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,5 @@ +package org.chorem.pollen.ui.actions.poll; + +public class PollsParticipatedAction { + +} Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/user/LoginUserAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/user/LoginUserAction.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/user/LoginUserAction.java 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,5 @@ +package org.chorem.pollen.ui.actions.user; + +public class LoginUserAction { + +} Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUserAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUserAction.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUserAction.java 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,5 @@ +package org.chorem.pollen.ui.actions.user; + +public class RegisterUserAction { + +} Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/user/UserProfileAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/user/UserProfileAction.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/user/UserProfileAction.java 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,5 @@ +package org.chorem.pollen.ui.actions.user; + +public class UserProfileAction { + +} Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/struts.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/struts.properties (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/struts.properties 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,51 @@ +struts.locale=fr_FR +struts.i18n.encoding=UTF-8 + +struts.objectFactory = spring + +struts.objectFactory.spring.autoWire = name + +struts.objectFactory.spring.useClassCache = true + +# struts.multipart.parser=cos +# struts.multipart.parser=pell +struts.multipart.parser=jakarta +# uses javax.servlet.context.tempdir by default +struts.multipart.saveDir= +struts.multipart.maxSize=2097152 + +# struts.custom.properties=application,com/webwork/extension/custom + +struts.mapper.class=org.apache.struts2.dispatcher.mapper.DefaultActionMapper + +struts.action.extension=action + +struts.serve.static=true + +struts.serve.static.browserCache=true + +struts.tag.altSyntax=true + +struts.devMode=true + +struts.i18n.reload=true + +struts.ui.theme=xhtml +struts.ui.templateDir=template +#sets the default template type. Either ftl, vm, or jsp +struts.ui.templateSuffix=ftl + +struts.configuration.xml.reload=false + +struts.url.http.port = 80 +struts.url.https.port = 443 + +struts.custom.i18n.resources=bow-i18n + +struts.dispatcher.parametersWorkaround = false + +#struts.freemarker.manager.classname=org.apache.struts2.views.freemarker.FreemarkerManager + +struts.freemarker.wrapper.altMap=true + +struts.xslt.nocache=false Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/struts.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/struts.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/struts.xml 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE struts PUBLIC + "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" + "http://struts.apache.org/dtds/struts-2.0.dtd"> +<struts> + <constant name="struts.devMode" value="true" /> + <constant name="struts.ognl.allowStaticMethodAccess" value="true" /> + + <package name="default" extends="struts-default"> + <interceptors> + <interceptor name="login" + class="org.chorem.pollen.ui.interceptor.LoginInterceptor"> + <param name="redirect">login_input.action</param> + </interceptor> + <interceptor-stack name="loginStack"> + <interceptor-ref name="login" /> + <interceptor-ref name="defaultStack" /> + </interceptor-stack> + </interceptors> + <action name="login" + class="org.chorem.pollen.ui.action.user.LoginUserAction" + method="login"> + </action> + <action name="logout" + class="org.chorem.pollen.ui.action.user.LoginUserAction" + method="logout"> + <result type="redirect">/jsp/index.jsp</result> + </action> + <action name="register" + class="org.chorem.pollen.ui.action.user.RegisterAction"> + <result type="redirect">/jsp/index.jsp</result> + </action> + <action name="pollsParticipated" + class="org.chorem.pollen.ui.action.poll.PollsListAction" + method="listPollsParticipated"> + <interceptor-ref name="loginStack" /> + </action> + <action name="pollsCreated" + class="org.chorem.pollen.ui.action.poll.PollsListAction" + method="listPollsCreated"> + <interceptor-ref name="loginStack" /> + </action> + <action name="userProfile" + class="org.chorem.pollen.ui.action.user.UserProfileAction"> + <interceptor-ref name="loginStack" /> + </action> + <action name="createVotersList" + class="org.chorem.pollen.ui.action.poll.VotersListAction" + method="create"> + <interceptor-ref name="loginStack" /> + </action> + <action name="modifyVotersList" + class="org.chorem.pollen.ui.action.poll.VotersListAction" + method="modify"> + <interceptor-ref name="loginStack" /> + </action> + <action name="deleteVotersList" + class="org.chorem.pollen.ui.action.poll.VotersListAction" + method="delete"> + <interceptor-ref name="loginStack" /> + </action> + <action name="voteFor" + class="org.chorem.pollen.ui.action.poll.VoteForAction"> + </action> + <action name="createPoll" + class="org.chorem.pollen.ui.action.poll.PollAction" + method="create"> + </action> + <action name="modifyPoll" + class="org.chorem.pollen.ui.action.poll.PollAction" + method="modify"> + </action> + <action name="copyPoll" + class="org.chorem.pollen.ui.action.poll.PollAction" + method="copy"> + </action> + <action name="closePoll" + class="org.chorem.pollen.ui.action.poll.PollAction" + method="close"> + </action> + <action name="deletePoll" + class="org.chorem.pollen.ui.action.poll.PollAction" + method="delete"> + </action> + <action name="exportPollXML" + class="org.chorem.pollen.ui.action.poll.PollAction" + method="exportXML"> + </action> + </package> +</struts> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/WEB-INF/decorators/main.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/WEB-INF/decorators/main.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/WEB-INF/decorators/main.jsp 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,189 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %> +<%@taglib prefix="s" uri="/struts-tags" %> + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <title>Pollen :: <decorator:title default="pollen" /></title> + <decorator:head /> + <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> + <meta name="description" content="Poll application" /> + <s:url var="favicon" value="/favicon.png" /> + <link rel="icon" type="image/png" href="${favicon}" /> + <s:url var="commonCSS" value="/css/common.css" /> + <link href="${commonCSS}" rel="stylesheet" type="text/css" media="screen,projection" /> + <s:url var="mainCSS" value="/css/main.css" /> + <link href="${mainCSS}" rel="stylesheet" type="text/css" media="screen,projection" /> +  + <s:url id="bookmarkJS" value="/js/pollen.js" /> + <script type="text/javascript" src="${bookmarkJS}"></script> + </head> + <body id="${pageLogo}Body"> +  + <div id="po-header-localization" class="${pageLogo}Localization"> + <s:text var="contactTitle" name="pollen.header.contact.title" /> + <a href="mailto:${contactEmail}" title="${contactTitle}"> + <s:url var="contact" value="/img/contact.png" /> + <img src="${contact}" alt="Contact" /> + </a> | + <s:date name="currentTime" format="dateFormat" /> + <s:a action="localeFr"> + <s:url var="fr" value="/img/fr.png" /> + <img src="${fr}" alt="Français" /> + </s:a> | + <s:a action="localeEn"> + <s:url var="en" value="/img/en.png" /> + <img src="${en}" alt="English" /> + </s:a> + </div> +  + <p id="po-header-logo"> + <s:a action="home"> + <img src="/${logo}" alt="Pollen" /> + </s:a> + </p> +  + +  + <div id="po-header-connection" class="${pageLogo}"> + <s:if test="userExists"> + <span class="menu_elt" onmouseover="$('compte_menu').show()" onmouseout="$('compte_menu').hide()"> + ${user.displayName} + <div class="dropdown_menu" id="compte_menu" style="display: none;"> + <div class="top_right${pageLogo}"></div> + <div class="top_left${pageLogo}"></div> + <ul class="top_middle${pageLogo}"> + <li> + <s:a action="userProfile"><s:text name="pollen.account.link" /></s:a> + </li> + <li> + <s:a action="logout"><s:text name="pollen.logout" /></s:a> + </li> + </ul> + </div> + </span> + </s:if> + <s:else> + <span onclick="$('login_menu').toggle()"><s:text name="pollen.login.link" /></span> + <div class="dropdown_menu" id="login_menu" style="display:none;"> + <div class="top_right${pageLogo}"></div> + <div class="top_left${pageLogo}"></div> + <s:form action="connection"> + <ul class="top_middle${pageLogo}"> + <li> + <div t:type="errors" /> + </li> + <li> + <s:textfield key="pollen.login.username" name="login" size="10" /> + </li> + <li> + <s:textfield key="pollen.login.password" name="password" size="10" /> + </li> + <li> + <s:submit key="pollen.login.submit" name="submit" /> + </li> + </ul> + </s:form> + </div> + <s:text name="pollen.misc.or" /> + <s:a action="register"><s:text name="pollen.register.link" /></s:a> + </s:else> + </div> + +  + <ul id="menu"> + <li class="menu_elt"> + <s:a action="home"><s:text name="pollen.home.link" /></s:a> + </li> + <li class="menu_elt" onmouseout="$('menu1').hide()" onmouseover="$('menu1').show()"> + <a><s:text name="pollen.poll.link" /></a> + <div class="dropdown_menu" id="menu1" style="display:none"> + <div class="top_right${pageLogo}"></div> + <div class="top_left${pageLogo}"></div> + <ul class ="top_middle${pageLogo}"> + <li> + <s:a action="pollForm"><s:text name="pollen.poll.create" /></s:a> + </li> + <s:if test="userExists"> + <li> + <s:a action="userPollsCreated"><s:text name="pollen.poll.createdPolls" /></s:a> + </li> + <li> + <s:a action="userPollsParticipated"><s:text name="pollen.poll.participatedPolls" /></s:a> + </li> + <li> + <s:a action="userLists"><s:text name="pollen.poll.votingLists" /></s:a> + </li> + </s:if> + </ul> + </div> + </li> + <s:if test="userExists"> + <s:if test="user.admin"> + <li class="menu_elt" onmouseout="$('menu2').hide()" onmouseover="$('menu2').show()"> + <a><s:text name="pollen.admin.link" /></a> + <div class="dropdown_menu" id="menu2" style="display:none"> + <div class="top_right${pageLogo}"></div> + <div class="top_left${pageLogo}"></div> + <ul class ="top_middle${pageLogo}"> + <li> + <s:a action="adminPolls"><s:text name="pollen.admin.polls" /></s:a> + </li> + <li> + <s:a action="adminUsers"><s:text name="pollen.admin.users" /></s:a> + </li> + </ul> + </div> + </li> + </s:if> + </s:if> + </ul> +  + +  + <div id="corps"> + +  + <div id="po-header-addressBar" class="${pageLogo}Address"> + <s:iterator value="addressBar.items" status="item"> + > + <strong> + <s:if test="item.address"> + <s:a action="home">${item.name}</s:a> + </s:if> + <s:else> + ${item.name} + </s:else> + </strong> + </s:iterator> + </div> + +  + <div id="${pageBodyId}" class="content"> + <noscript> + <div t:type="nuiton/feedback" t:id="errorJs" /> + </noscript> + <div t:type="nuiton/feedback" t:id="borderFeedback" t:autoClear="false" /> + <decorator:body /> + </div> + </div> + +  + <div id="po-footer" class="${pageLogo}" xml:space="preserve"> + <s:text var="docUrl" name="pollen.footer.docUrl" /> + <a href="${docUrl}">Pollen</a> + <a href="http://www.chorem.org/projects/list_files/pollen">${version}</a> - + <a href="http://www.gnu.org/licenses/gpl.html"><s:text name="pollen.footer.license" /></a> - + <span title="Copyright">©2009-${currentYear}</span> + <a href="http://www.codelutin.com">Code Lutin</a> - + <a href="http://www.chorem.org/projects/pollen/issues"><s:text name="pollen.footer.bugReport" /></a> - + <a href="http://list.chorem.org/cgi-bin/mailman/listinfo/pollen-users"><s:text name="pollen.footer.userSupport" /></a> + </div> + </body> +</html> + Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/admin/polls.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/admin/polls.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/admin/polls.jsp 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,10 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<html> + <head> + <title><s:text name="pollen.admin.polls.title" /></title> + <s:head /> + </head> + <body> + </body> +</html> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/admin/users.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/admin/users.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/admin/users.jsp 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,10 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<html> + <head> + <title><s:text name="pollen.admin.users.title" /></title> + <s:head /> + </head> + <body> + </body> +</html> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/index.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/index.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/index.jsp 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,27 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<html> + <head> + <title><s:text name="pollen.index.title" /></title> + <s:head /> + </head> + <body> + <div class="center" style="margin-bottom:20px;"> + <img src="img/pollen.png" alt="Pollen logo" /> + </div> + <div class="center"> + <s:a action="createPoll"> + <s:url var="smallCreation" value="img/smallCreation.png" /> + <img src="${smallCreation}" alt="poll creation" /> + </s:a> + <s:a action="pollsParticipated"> + <s:url var="smallVote" value="img/smallVote.png" /> + <img src="${smallVote}" alt="vote" /> + </s:a> + <s:a action="pollsParticipated"> + <s:url var="smallVoteCounting" value="img/smallVoteCounting.png" /> + <img src="${smallVoteCounting}" alt="voteCounting" /> + </s:a> + </div> + </body> +</html> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/closeValidation.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/closeValidation.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/closeValidation.jsp 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,10 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<html> + <head> + <title><s:text name="pollen.poll.closeValidation.title" /></title> + <s:head /> + </head> + <body> + </body> +</html> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/confirmPoll.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/confirmPoll.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/confirmPoll.jsp 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,10 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<html> + <head> + <title><s:text name="pollen.poll.confirmPoll.title" /></title> + <s:head /> + </head> + <body> + </body> +</html> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/creationValidation.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/creationValidation.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/creationValidation.jsp 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,10 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<html> + <head> + <title><s:text name="pollen.poll.creationValidation.title" /></title> + <s:head /> + </head> + <body> + </body> +</html> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/imageDisplay.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/imageDisplay.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/imageDisplay.jsp 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,10 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<html> + <head> + <title><s:text name="pollen.poll.imageDisplay.title" /></title> + <s:head /> + </head> + <body> + </body> +</html> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/modificationValidation.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/modificationValidation.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/modificationValidation.jsp 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,10 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<html> + <head> + <title><s:text name="pollen.poll.modificationValidation.title" /></title> + <s:head /> + </head> + <body> + </body> +</html> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollCreation.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollCreation.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollCreation.jsp 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,10 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<html> + <head> + <title><s:text name="pollen.poll.pollCreation.title" /></title> + <s:head /> + </head> + <body> + </body> +</html> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollForm.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollForm.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollForm.jsp 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,10 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<html> + <head> + <title><s:text name="pollen.poll.pollForm.title" /></title> + <s:head /> + </head> + <body> + </body> +</html> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollLinks.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollLinks.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollLinks.jsp 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,10 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<html> + <head> + <title><s:text name="pollen.ui.poll.links.title" /></title> + <s:head /> + </head> + <body> + </body> +</html> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollModification.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollModification.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollModification.jsp 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,10 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<html> + <head> + <title><s:text name="pollen.poll.pollModification.title" /></title> + <s:head /> + </head> + <body> + </body> +</html> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/results.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/results.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/results.jsp 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,11 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> + +<html> + <head> + <title><s:text name="pollen.poll.results.title" /></title> + <s:head /> + </head> + <body> + </body> +</html> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/voteForPoll.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/voteForPoll.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/voteForPoll.jsp 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,10 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<html> + <head> + <title><s:text name="pollen.poll.voteForPoll.title" /></title> + <s:head /> + </head> + <body> + </body> +</html> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/lists.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/lists.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/lists.jsp 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,10 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <title><s:text name="pollen.user.lists.title" /></title> + <s:head /> + </head> + <body> + </body> +</html> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/pollsCreated.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/pollsCreated.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/pollsCreated.jsp 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,10 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<html> + <head> + <title><s:text name="pollen.user.pollsCreated.title" /></title> + <s:head /> + </head> + <body> + </body> +</html> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/pollsParticipated.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/pollsParticipated.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/pollsParticipated.jsp 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,10 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<html> + <head> + <title><s:text name="pollen.user.pollsParticipated.title" /></title> + <s:head /> + </head> + <body> + </body> +</html> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/profile.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/profile.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/profile.jsp 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,10 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<html> + <head> + <title><s:text name="pollen.user.profile.title" /></title> + <s:head /> + </head> + <body> + </body> +</html> \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/register.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/register.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/register.jsp 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,46 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> +<html> + <head> + <title><s:text name="pollen.user.register.title" /></title> + <s:head /> + </head> + <body> + <h1 class="titleCreation"><s:text name="pollen.user.register.title" /></h1> + <s:form action="register"> + <div id="po-user-register-form-error"> + <s:actionerror /> + </div> + + <fieldset> + <legend><s:text name="pollen.user.register.connectionInfo" /></legend> + <div> + <s:textfield key="pollen.user.register.login" name="login" /> + </div> + <div> + <s:textfield key="pollen.user.register.password" name="password" /> + </div> + <div> + <s:textfield key="pollen.user.register.passwordVerify" name="passwordVerify" /> + </div> + </fieldset> + + <fieldset> + <legend><s:text name="pollen.user.register.userInfo" /></legend> + <div> + <s:textfield key="pollen.user.register.email" name="email" /> + </div> + <div> + <s:textfield key="pollen.user.register.firstName" name="firstName" /> + </div> + <div> + <s:textfield key="pollen.user.register.lastName" name="lastName" /> + </div> + </fieldset> + + <div class="buttons"> + <s:submit key="pollen.user.register.submit" name="submit" /> + </div> + </s:form> + </body> +</html> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/simple/form-common.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/simple/form-common.ftl (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/simple/form-common.ftl 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,64 @@ +<#-- +/* + * $Id: form.ftl 590812 2007-10-31 20:32:54Z apetrelli $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#if (parameters.validate?default(false) == false)><#rt/> + <#if parameters.onsubmit??><#rt/> + ${tag.addParameter('onsubmit', "${parameters.onsubmit}") } + </#if> +</#if> +<form<#rt/> +<#if parameters.id??> + id="${parameters.id?html}"<#rt/> +</#if> +<#if parameters.onsubmit??> + onsubmit="${parameters.onsubmit?html}"<#rt/> +</#if> +<#if parameters.onreset??> + onreset="${parameters.onreset?html}"<#rt/> +</#if> +<#if parameters.action??> + action="${parameters.action?html}"<#rt/> +</#if> +<#if parameters.target??> + target="${parameters.target?html}"<#rt/> +</#if> +<#if parameters.method??> + method="${parameters.method?html}"<#rt/> +<#else> + method="post"<#rt/> +</#if> +<#if parameters.enctype??> + enctype="${parameters.enctype?html}"<#rt/> +</#if> +<#if parameters.cssClass??> + class="${parameters.cssClass?html}"<#rt/> +</#if> +<#if parameters.cssStyle??> + style="${parameters.cssStyle?html}"<#rt/> +</#if> +<#if parameters.title??> + title="${parameters.title?html}"<#rt/> +</#if> +<#if parameters.acceptcharset??> + accept-charset="${parameters.acceptcharset?html}"<#rt/> +</#if> +<#include "/${parameters.templateDir}/simple/dynamic-attributes.ftl" /> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/controlheader-core.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/controlheader-core.ftl (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/controlheader-core.ftl 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,66 @@ +<#-- +/* + * $Id: controlheader-core.ftl 720258 2008-11-24 19:05:16Z musachy $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#-- + Only show message if errors are available. + This will be done if ActionSupport is used. +--> +<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/> +<#if hasFieldErrors> +<#list fieldErrors[parameters.name] as error> + + <span class="errorMessage">${error?html}</span><#t/> + <#if parameters.labelposition?default("") == 'top'> + <br /> + </#if> + +</#list> +</#if> +<#-- + if the label position is top, + then give the label it's own row in the table +--> +<#if parameters.label??> + <label <#t/> +<#if parameters.id??> + for="${parameters.id?html}" <#t/> +</#if> +<#if hasFieldErrors> + class="errorLabel"<#t/> +<#else> + class="label"<#t/> +</#if> + ><#t/> +<#if parameters.required?default(false) && parameters.requiredposition?default("right") != 'right'> + <span class="required">*</span><#t/> +</#if> +${parameters.label?html}<#t/> +<#if parameters.required?default(false) && parameters.requiredposition?default("right") == 'right'> + <span class="required">*</span><#t/> +</#if> +${parameters.labelseparator?default(":")?html}<#t/> +<#include "/${parameters.templateDir}/xhtml/tooltip.ftl" /> +</label><#t/> +</#if> +<#if parameters.labelposition?default("") == 'top'> + <br /> +</#if> \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/file.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/file.ftl (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/file.ftl 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,24 @@ +<#-- +/* + * $Id: file.ftl 590812 2007-10-31 20:32:54Z apetrelli $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" /> +<#include "/${parameters.templateDir}/simple/file.ftl" /> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/form-close.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/form-close.ftl (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/form-close.ftl 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,34 @@ +<#-- +/* + * $Id: form-close.ftl 590812 2007-10-31 20:32:54Z apetrelli $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${parameters.templateDir}/simple/form-close.ftl" /> +<#include "/${parameters.templateDir}/xhtml/form-close-validate.ftl" /> +<#if parameters.focusElement?if_exists != ""> +<script type="text/javascript"> + StrutsUtils.addOnLoad(function() { + var element = document.getElementById("${parameters.focusElement?html}"); + if(element) { + element.focus(); + } + }); +</script> +</#if> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/form.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/form.ftl (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/form.ftl 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,32 @@ +<#-- +/* + * $Id: form.ftl 720258 2008-11-24 19:05:16Z musachy $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${parameters.templateDir}/xhtml/form-validate.ftl" /> +<#include "/${parameters.templateDir}/simple/form-common.ftl" /> +<#if (parameters.validate?default(false))> + onreset="${parameters.onreset?default('clearErrorMessages(this);clearErrorLabels(this);')}" +<#else> + <#if parameters.onreset??> + onreset="${parameters.onreset?html}" + </#if> +</#if> +> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/password.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/password.ftl (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/password.ftl 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,24 @@ +<#-- +/* + * $Id: password.ftl 590812 2007-10-31 20:32:54Z apetrelli $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" /> +<#include "/${parameters.templateDir}/simple/password.ftl" /> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/submit-close.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/submit-close.ftl (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/submit-close.ftl 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1 @@ +<#include "/${parameters.templateDir}/simple/submit-close.ftl" /> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/submit.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/submit.ftl (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/submit.ftl 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,23 @@ +<#-- +/* + * $Id: submit.ftl 720258 2008-11-24 19:05:16Z musachy $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${parameters.templateDir}/simple/submit.ftl" /> Added: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/text.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/text.ftl (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/text.ftl 2011-02-25 11:09:37 UTC (rev 3066) @@ -0,0 +1,24 @@ +<#-- +/* + * $Id: text.ftl 590812 2007-10-31 20:32:54Z apetrelli $ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> +<#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" /> +<#include "/${parameters.templateDir}/simple/text.ftl" />

1 0