Author: tchemit Date: 2012-01-20 22:42:18 +0100 (Fri, 20 Jan 2012) New Revision: 3098 Url: http://chorem.org/repositories/revision/pollen/3098 Log: - apply legacy style - fix user service Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/UpdateUser.java branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/common.css branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/main.css branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/favicon.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/1downarrow.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/1leftarrow.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/1rightarrow.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/1uparrow.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/2leftarrow.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/2rightarrow.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/7ter.jpg branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/close.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/copy.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/count.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/delete.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/edit.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/editSmall.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/exclamation.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/export.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/feed.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/feed2.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/gplv3.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/help.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/import.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/lutin.gif branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollenCreation_en.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollenCreation_fr.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollenVoteCounting_en.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollenVoteCounting_fr.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollenVote_en.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollenVote_fr.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollen_en.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollen_fr.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/refresh-22px.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/rep1.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/rep2.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/rep3.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/save.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/smallCreation.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/smallVote.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/smallVoteCounting.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topleft_menu.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topleft_menuCreation.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topleft_menuIndex.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topleft_menuVote.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topleft_menuVoteCounting.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topright_menu.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topright_menuCreation.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topright_menuIndex.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topright_menuVote.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topright_menuVoteCounting.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/true.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/undo.png branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/vote.png Removed: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/UserPreferences.java branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/includes/ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/login.jsp branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/pollen.css Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/UserService.java branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/Login.java branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/RegisterUser.java branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/struts.xml branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/userPreferences.jsp branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/screen.css branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollen.png Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/UserService.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/UserService.java 2012-01-20 16:48:46 UTC (rev 3097) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/UserService.java 2012-01-20 21:42:18 UTC (rev 3098) @@ -23,12 +23,10 @@ */ package org.chorem.pollen.services; -import com.google.common.collect.Lists; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenBinderHelper; -import org.chorem.pollen.PollenBusinessException; import org.chorem.pollen.PollenDAOHelper; import org.chorem.pollen.PollenException; import org.chorem.pollen.PollenTechnicalException; @@ -103,26 +101,27 @@ public void updateUser(UserAccount user, String newPassword, - boolean byAdmin) throws PollenBusinessException, UserEmailAlreadyUsedException { + boolean byAdmin) throws UserEmailAlreadyUsedException, UserInvalidPasswordException { - ServiceUserImpl service = new ServiceUserImpl(); try { UserAccountDAO dao = PollenDAOHelper.getUserAccountDAO(getTransaction()); + UserAccount userToUpdate = dao.findByTopiaId(user.getTopiaId()); + // Do not manage password for an admin update // neither if password was not asked to change if (!byAdmin && StringUtils.isNotEmpty(newPassword)) { // Check the password -// String encodedPassword = context.encodePassword(user.getPassword()); - String encodedPassword = encodePassword(user.getPassword()); + String encodedPassword = encodePassword(user.getPassword()); + if (!encodedPassword.equals(userToUpdate.getPassword())) { + throw new UserInvalidPasswordException(); + } -// checkPassword(dao, user.getLogin(), encodedPassword); - - - + String newEncodedPassword = encodePassword(newPassword); + userToUpdate.setPassword(newEncodedPassword); } // In case of email change, check if an other user has not already @@ -131,14 +130,16 @@ TopiaQuery query = dao.createQuery(). addWhere(UserAccount.PROPERTY_LOGIN, TopiaQuery.Op.NEQ, user.getLogin()); - query.addEquals(UserAccount.PROPERTY_EMAIL, StringUtils.lowerCase(user.getEmail())); + query.addEquals(UserAccount.PROPERTY_EMAIL, + StringUtils.lowerCase(user.getEmail())); // existing user found if (dao.existByQuery(query)) { throw new UserEmailAlreadyUsedException(); } - service.executeUpdateUser(getTransaction(), Lists.newArrayList(), user, byAdmin); + copyUserAccount(user, userToUpdate); + } catch (TopiaException e) { throw new PollenTechnicalException(e); } Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/Login.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/Login.java 2012-01-20 16:48:46 UTC (rev 3097) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/Login.java 2012-01-20 21:42:18 UTC (rev 3098) @@ -59,7 +59,7 @@ this.password = password; } - @InputConfig(methodName = "input") + @InputConfig(resultName = "error") @Override public String execute() throws Exception { @@ -70,12 +70,12 @@ getPollenSession().setUserAccount(userAccount); return SUCCESS; } catch (UserNotFoundException e) { - addFieldError("login", _("pollen.error.user.login.not.found")); + addActionError(_("pollen.error.user.bad.login.or.password")); } catch (UserInvalidPasswordException e) { - addFieldError("password", _("pollen.error.user.invalid.password")); + addActionError(_("pollen.error.user.bad.login.or.password")); } // if error go back to input - return INPUT; + return ERROR; } } Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-01-20 16:48:46 UTC (rev 3097) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-01-20 21:42:18 UTC (rev 3098) @@ -23,6 +23,7 @@ */ package org.chorem.pollen.ui.actions; +import com.google.common.collect.Lists; import com.opensymphony.xwork2.ActionContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,6 +43,7 @@ import javax.servlet.http.HttpServletRequest; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; import java.util.Map; /** @@ -80,7 +82,7 @@ return applicationContext; } - protected PollenConfiguration getConfiguration() { + public PollenConfiguration getConfiguration() { return getEchoBaseApplicationContext().getConfiguration(); } @@ -99,6 +101,10 @@ protected transient TopiaContext transaction; + public String getPageLogo() { + return "Index"; + } + public PollenSession getPollenSession() { if (pollenSession == null) { @@ -187,6 +193,17 @@ return result; } + public static final List<String> SAFE_LANGUAGES = + Lists.newArrayList("en", "fr"); + + public String getSafeLanguage() { + String language = getLocale().getLanguage(); + if (!SAFE_LANGUAGES.contains(language)) { + language = SAFE_LANGUAGES.get(0); + } + return language; + } + protected SimpleDateFormat getDateFormat() { if (dateFormat == null) { dateFormat = new SimpleDateFormat("dd/MM/yyyy"); Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/RegisterUser.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/RegisterUser.java 2012-01-20 16:48:46 UTC (rev 3097) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/RegisterUser.java 2012-01-20 21:42:18 UTC (rev 3098) @@ -81,6 +81,7 @@ // reset password user.setPassword(null); + password2 = null; return INPUT; } Copied: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/UpdateUser.java (from rev 3097, branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/UserPreferences.java) =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/UpdateUser.java (rev 0) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/UpdateUser.java 2012-01-20 21:42:18 UTC (rev 3098) @@ -0,0 +1,100 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions; + +import com.opensymphony.xwork2.interceptor.annotations.InputConfig; +import org.chorem.pollen.entity.UserAccount; +import org.chorem.pollen.entity.UserAccountImpl; +import org.chorem.pollen.services.UserEmailAlreadyUsedException; +import org.chorem.pollen.services.UserInvalidPasswordException; +import org.chorem.pollen.services.UserService; +import org.nuiton.topia.TopiaException; + +/** + * Update a user. + * + * @author tchemit <chemit@codelutin.com> + * @since 2.0 + */ +public class UpdateUser extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + protected UserAccount user; + + protected String newPassword; + + protected String newPassword2; + + public UserAccount getUser() { + if (user == null) { + user = new UserAccountImpl(); + } + return user; + } + + public String getNewPassword() { + return newPassword; + } + + public void setNewPassword(String newPassword) { + this.newPassword = newPassword; + } + + public String getNewPassword2() { + return newPassword2; + } + + public void setNewPassword2(String newPassword2) { + this.newPassword2 = newPassword2; + } + + @InputConfig(methodName = "input") + @Override + public String execute() throws TopiaException { + + UserService service = newService(UserService.class); + + try { + service.updateUser(user, newPassword, false); + getTransaction().commitTransaction(); + + getPollenSession().setUserAccount(user); + return SUCCESS; + } catch (UserEmailAlreadyUsedException e) { + addFieldError("user.email", _("pollen.error.user.email.already.used")); + } catch (UserInvalidPasswordException e) { + addFieldError("user.password", _("pollen.error.user.invalid.password")); + } + + // if error go back to input + + // reset password + user.setPassword(null); + newPassword = newPassword2 = null; + + return INPUT; + } + +} Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/UpdateUser.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/UserPreferences.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/UserPreferences.java 2012-01-20 16:48:46 UTC (rev 3097) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/UserPreferences.java 2012-01-20 21:42:18 UTC (rev 3098) @@ -1,35 +0,0 @@ -/* - * #%L - * Pollen :: UI (strust2) - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui.actions; - -/** - * Register a new user. - * - * @author tchemit <chemit@codelutin.com> - * @since 2.0 - */ -public class UserPreferences extends PollenActionSupport { - - private static final long serialVersionUID = 1L; -} Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-01-20 16:48:46 UTC (rev 3097) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-01-20 21:42:18 UTC (rev 3098) @@ -1,16 +1,35 @@ pollen.action.login=Log me In pollen.action.register=Register +pollen.common.bugReport=Bug report +pollen.common.license=Licence +pollen.common.login=Login +pollen.common.or=or +pollen.common.password=Password +pollen.common.userSupport=User support pollen.error.email.required=You must provide a email pollen.error.login.required=You must provide a login pollen.error.password.required=Your must provide a password pollen.error.password2.required=You must repeat your password for confirmation pollen.error.passwords.not.equals=Les deux mots de passe saisis non identiques +pollen.error.user.bad.login.or.password=Login or password invalid. pollen.error.user.email.already.used=This email is already used -pollen.error.user.invalid.password=Invalid password pollen.error.user.login.already.used=This login is already used -pollen.error.user.login.not.found=User login not found pollen.fieldset.connexionInformation=Information de connexion pollen.fieldset.userInformation=Informations de l'utilisateur +pollen.label.contact.administrator=Send an email to an administrator pollen.legend.login=Login +pollen.menu.admin=Administration +pollen.menu.createPoll=Create a poll +pollen.menu.displayCreatedPolls=Created polls +pollen.menu.displayParticipatedPolls=Participated polls +pollen.menu.displayVotingLists=Voting lists +pollen.menu.home=Home +pollen.menu.login=Log in +pollen.menu.logout=Log out +pollen.menu.managePolls=Manage Polls +pollen.menu.manageUsers=Manage Users +pollen.menu.polls=Polls +pollen.menu.preferences=My account +pollen.menu.register=Register pollen.title.login=Page de login pollen.title.register=Register Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-01-20 16:48:46 UTC (rev 3097) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-01-20 21:42:18 UTC (rev 3098) @@ -1,16 +1,35 @@ pollen.action.login=M'identifier pollen.action.register=S'enregistrer +pollen.common.bugReport=Rapport de bug +pollen.common.license=Licence +pollen.common.login=Login +pollen.common.or=ou +pollen.common.password=Mot de passe +pollen.common.userSupport=Support utilisateur pollen.error.email.required=Courriel obligatoire pollen.error.login.required=Login obligatoire pollen.error.password.required=Mot de passe obligatoire pollen.error.password2.required=Mot de passe répété obligatoire pollen.error.passwords.not.equals=Les deux mots de passe saisis non identiques +pollen.error.user.bad.login.or.password=Mauvais identifiant ou mot de passe. pollen.error.user.email.already.used=Le courriel saisi est déjà utilisé par un autre utilisateur -pollen.error.user.invalid.password=Mot de passe non valide pollen.error.user.login.already.used=Le login saisie est déjà utilisé par un autre utilisateur -pollen.error.user.login.not.found=Utilisateur non trouvé pollen.fieldset.connexionInformation=Information de connexion pollen.fieldset.userInformation=Informations de l'utilisateur +pollen.label.contact.administrator=Contacter un administrateur pollen.legend.login=Login +pollen.menu.admin=Administration +pollen.menu.createPoll=Créer une sondage +pollen.menu.displayCreatedPolls=Sondages créés +pollen.menu.displayParticipatedPolls=Sondages participés +pollen.menu.displayVotingLists=Listes de votants +pollen.menu.home=Accueil +pollen.menu.login=Identifiez-vous +pollen.menu.logout=Déconnexion +pollen.menu.managePolls=Gérer les sondages +pollen.menu.manageUsers=Gérer les utilisateurs +pollen.menu.polls=Sondages +pollen.menu.preferences=Mon compte +pollen.menu.register=Inscrivez-vous pollen.title.login=Page de login pollen.title.register=Enregistrement Copied: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml (from rev 3097, branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/RegisterUser-validation.xml) =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml (rev 0) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml 2012-01-20 21:42:18 UTC (rev 3098) @@ -0,0 +1,65 @@ +<!-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="user.login"> + + <field-validator type="requiredstring"> + <message key="pollen.error.login.required"/> + </field-validator> + </field> + + <field name="user.password"> + + <field-validator type="requiredstring"> + <message key="pollen.error.password.required"/> + </field-validator> + + </field> + + <field name="password2"> + + <field-validator type="requiredstring"> + <message key="pollen.error.password2.required"/> + </field-validator> + + <field-validator type="fieldexpression"> + <param name="expression">password2.equals(user.password)</param> + <message key="pollen.error.passwords.not.equals"/> + </field-validator> + + </field> + + <field name="user.email"> + + <field-validator type="requiredstring"> + <message key="pollen.error.email.required"/> + </field-validator> + + </field> + +</validators> Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/struts.xml =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/struts.xml 2012-01-20 16:48:46 UTC (rev 3097) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/struts.xml 2012-01-20 21:42:18 UTC (rev 3098) @@ -93,6 +93,19 @@ <result>/WEB-INF/jsp/home.jsp</result> + <!--<interceptor-ref name="i18nStack"/>--> + <!--<!– remove the request_locale parameter from request –>--> + <!--<interceptor-ref name="paramRemover">--> + <!--<param name="paramNames">request_locale</param>--> + <!--</interceptor-ref>--> + </action> + + <!-- change lang--> + <action name="changeLang" + class="org.chorem.pollen.ui.actions.PollenActionSupport"> + + <result type="redirectAction">home</result> + <interceptor-ref name="i18nStack"/> <!-- remove the request_locale parameter from request --> <interceptor-ref name="paramRemover"> @@ -102,8 +115,8 @@ <!-- login --> <action name="login" class="org.chorem.pollen.ui.actions.Login"> - <result name="input">/WEB-INF/jsp/login.jsp</result> - <result>/WEB-INF/jsp/home.jsp</result> + <result name="error">/WEB-INF/jsp/home.jsp</result> + <result type="redirectAction">home</result> </action> <!-- register user --> @@ -114,8 +127,8 @@ </action> <!-- user preferences --> - <action name="userPreferences" - class="org.chorem.pollen.ui.actions.UserPreferences"> + <action name="updateUser" + class="org.chorem.pollen.ui.actions.UpdateUser"> <result name="input">/WEB-INF/jsp/userPreferences.jsp</result> <result>/WEB-INF/jsp/home.jsp</result> </action> Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-01-20 16:48:46 UTC (rev 3097) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-01-20 21:42:18 UTC (rev 3098) @@ -1,7 +1,7 @@ +<%@ page import="org.chorem.pollen.ui.actions.PollenActionSupport" %> <%-- - #%L +#%L Pollen :: UI (strust2) - $Id$ $HeadURL$ %% @@ -20,7 +20,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% - --%> +--%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> @@ -29,25 +29,231 @@ <%@ taglib prefix="d" uri="http://www.opensymphony.com/sitemesh/decorator" %> <html xmlns="http://www.w3.org/1999/xhtml"> -<%-- metas in head --%> -<%@ include file="/WEB-INF/includes/metas.jsp" %> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title>Pollen - <d:title default="Pollen"/></title> + <d:head/> + <%--<link rel="stylesheet" type="text/css" href="<s:url value='/css/pollen.css' />"/>--%> + <%--<link rel="stylesheet" type="text/css" href="<s:url value='/css/screen.css' />"/>--%> + <link rel="stylesheet" type="text/css" href="<s:url value='/css/main.css' />"/> + <link rel="stylesheet" type="text/css" href="<s:url value='/css/common.css' />"/> + <link rel="icon" type="image/png" href="<s:url value='/favicon.png' />"/> + <sj:head jqueryui="true" jquerytheme="cupertino"/> +</head> -<body> +<s:set var="user" value="%{#session.pollenSession.userAccount}"/> +<s:set var="userExists" value="%{#user != null}"/> +<s:set var="userIsAdmin" value="%{#userExists && #user.admin}"/> -<%-- header --%> -<%@ include file="/WEB-INF/includes/header.jsp" %> +<body id="${pageLogo}Body"> -<%-- body --%> -<h2><d:title default="Pollen"/></h2> +<!-- Langue --> +<div id="po-header-localization" class="${pageLogo}Localization"> + <s:a title="Contacter un administrateur" + href="mailto:%{configuration.adminEmail}"> + <img src="<s:url value='/img/contact.png' />" alt="Contact"/> + </s:a> + | Date - Heure | + <s:a action="changeLang" id="localeFr"> + <s:param name="request_locale">fr_FR</s:param> + <img src="<s:url value='/img/fr.png' />" alt="Français"/> + </s:a> | <s:a action="changeLang" id="localeEn"> + <s:param name="request_locale">en_GB</s:param> + <img src="<s:url value='/img/en.png' />" alt="English"/> +</s:a> +</div> -<div id="body"> +<!-- Entête de la page --> +<p id="po-header-logo"> + <s:a action="home"> + <img src="<s:url value='/img/pollen%{pageLogo}_%{safeLanguage}.png' />" + alt="Pollen"/> + </s:a> +</p> - <d:body/> +<div id="top" class="${pageLogo}"> + <!-- Login --> + <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="updateUser" method="input"> + <s:text name="pollen.menu.preferences"/> + </s:a> + </li> + <li> + <s:a action="logout"><s:text name="pollen.menu.logout"/></s:a> + </li> + </ul> + </div> + </span> + </s:if> + <s:else> + <span onClick="$('#login_menu').toggle()"><s:text + name="pollen.menu.login"/></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 id="connection" action="login" method="POST"> + <ul class="top_middle${pageLogo}"> + <li> + <s:textfield key="login" label="%{getText('pollen.common.login')}" + size="10" required="true"/> + </li> + <li> + <s:password key="password" + label="%{getText('pollen.common.password')}" size="10" + required="true"/> + </li> + <li> + <s:submit id="submitform" action="login" key="pollen.action.login" + align="right"/> + </li> + </ul> + </s:form> + </div> + <s:text name="pollen.common.or"/> + <s:a action="registerUser" method="input"> + <s:text name="pollen.menu.register"/> + </s:a> + </s:else> + + </div> + + <!-- Menu --> + <ul id="menu"> + <li class="menu_elt"> + <s:a action="home"> + <s:text name="pollen.menu.home"/> + </s:a> + </li> + <li class="menu_elt" onmouseout="$('#menu1').hide()" + onmouseover="$('#menu1').show()"> + <a><s:text name="pollen.menu.polls"/></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="createPoll" method="input"> + <s:text name="pollen.menu.createPoll"/> + </s:a> + </li> + <s:if test="userExists"> + <li> + <s:a action="displayCreatedPolls" method="input"> + <s:text name="pollen.menu.displayCreatedPolls"/> + </s:a> + </li> + <li> + <s:a action="displayParticipatedPolls" method="input"> + <s:text name="pollen.menu.displayParticipatedPolls"/> + </s:a> + </li> + <li> + <s:a action="displayVotingLists" method="input"> + <s:text name="pollen.menu.displayVotingLists"/> + </s:a> + </li> + </s:if> + </ul> + </div> + </li> + <s:if test="userExists"> + <s:if test="userIsAdmin"> + <li class="menu_elt" onmouseout="$('#menu2').hide()" + onmouseover="$('#menu2').show()"> + <a><s:text name="pollen.menu.admin"/></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="managePolls" method="input"> + <s:text name="pollen.menu.managePolls"/> + </s:a> + </li> + <li> + <s:a action="manageUsers" method="input"> + <s:text name="pollen.menu.manageUsers"/> + </s:a> + </li> + </ul> + </div> + </li> + </s:if> + </s:if> + </ul> </div> -<%-- footer --%> -<%@ include file="/WEB-INF/includes/footer.jsp" %> +<!-- Corps de la page --> +<div id="corps" class="cleanBoth clearfix"> + <!-- Barre d'adresse --> + <div id="po-header-addressBar" class="${pageLogo}Address"> + <%--<t:loop t:source="addressBar.items" t:value="item">--%> + <%-->--%> + <%--<strong>--%> + <%--<t:if test="item.address">--%> + <%--<a t:type="pagelink" t:page="prop:item.address" href="index">${item.name}</a>--%> + <%--<p:else>--%> + <%--${item.name}--%> + <%--</p:else>--%> + <%--</t:if>--%> + <%--</strong>--%> + <%--</t:loop>--%> + </div> + + <!-- Contenu --> + <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"/>--%> + + <s:if test="hasActionMessages()"> + <div class="fb-message"> + <s:actionmessage/> + </div> + </s:if> + + <s:if test="hasActionErrors()"> + <div class="fb-error"> + <s:actionerror/> + </div> + </s:if> + <d:body/> + </div> +</div> + +<!-- Pied de page --> +<div id="po-footer" class="${pageLogo}" xml:space="preserve"> + <a href="http://maven-site.chorem.org/pollen">Pollen</a> + <a href="http://www.chorem.org/projects/pollen/files"> + <%=PollenActionSupport.getApplicationVersion()%> + </a> - + <a href="http://www.gnu.org/licenses/gpl.html"> + <s:text name="pollen.common.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.common.bugReport"/> + </a> - + <a href="http://list.chorem.org/cgi-bin/mailman/listinfo/pollen-users"> + <s:text name="pollen.common.userSupport"/> + </a> +</div> + </body> </html> Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp 2012-01-20 16:48:46 UTC (rev 3097) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp 2012-01-20 21:42:18 UTC (rev 3098) @@ -25,4 +25,19 @@ <%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<h2><s:text name="pollen.title.welcome"/></h2> +<br/> +<div class="center" style="margin-bottom:20px;"> + <img src="<s:url value='/img/pollen_%{safeLanguage}.png' />" alt="Pollen logo"/> +</div> + +<div class="center"> + <s:a action="createForm"> + <img src="<s:url value='/img/smallCreation_%{safeLanguage}.png' />" alt="poll creation"/> + </s:a> + <s:a action="createForm"> + <img src="<s:url value='/img/smallVote_%{safeLanguage}.png' />" alt="vote"/> + </s:a> + <s:a action="createForm"> + <img src="<s:url value='/img/smallVoteCounting_%{safeLanguage}.png' />" alt="voteCounting"/> + </s:a> +</div> \ No newline at end of file Deleted: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/login.jsp =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/login.jsp 2012-01-20 16:48:46 UTC (rev 3097) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/login.jsp 2012-01-20 21:42:18 UTC (rev 3098) @@ -1,40 +0,0 @@ -<%-- - #%L - Pollen :: UI (strust2) - - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 2012 CodeLutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> -<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> - -<title><s:text name="pollen.title.login"/></title> - -<s:form method="POST"> - <fieldset> - <legend> - <s:text name="pollen.legend.login"/> - </legend> - <s:hidden key="redirectAction" label=""/> - <s:textfield name="login" key="pollen.common.login" required="true"/> - <s:password name="password" key="pollen.common.password" required="true"/> - </fieldset> - <br/> - <s:submit action="login" key="pollen.action.login" align="right"/> -</s:form> Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/userPreferences.jsp =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/userPreferences.jsp 2012-01-20 16:48:46 UTC (rev 3097) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/userPreferences.jsp 2012-01-20 21:42:18 UTC (rev 3098) @@ -31,21 +31,22 @@ <fieldset> <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> - <s:textfield name="login" key="pollen.common.login" required="true"/> - <s:password name="oldPassword" key="pollen.common.oldPassword" + <s:hidden key="user.topiaId" label="" /> + <s:textfield name="user.login" key="pollen.common.login" required="true"/> + <s:password name="user.password" key="pollen.common.oldPassword" required="true"/> - <s:password name="password" key="pollen.common.password"/> - <s:password name="password2" key="pollen.common.password2"/> + <s:password name="newPassword" key="pollen.common.password"/> + <s:password name="newPassword2" key="pollen.common.password2"/> </fieldset> <fieldset> <legend><s:text name="pollen.fieldset.userInformation"/></legend> - <s:textfield name="email" key="pollen.common.email" required="true"/> - <s:textfield name="lastname" key="pollen.common.lastname" required="true"/> - <s:textfield name="firstname" key="pollen.common.firstname" + <s:textfield name="user.email" key="pollen.common.email" required="true"/> + <s:textfield name="user.lastname" key="pollen.common.lastname" required="true"/> + <s:textfield name="user.firstname" key="pollen.common.firstname" required="true"/> </fieldset> <br/> - <s:submit action="registerUser" key="pollen.action.register" align="right"/> + <s:submit action="updateUser" key="pollen.action.updateUser" align="right"/> </s:form> Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/common.css =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/common.css (rev 0) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/common.css 2012-01-20 21:42:18 UTC (rev 3098) @@ -0,0 +1,126 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +.fleft { + float: left; +} + +.fright { + float: right; +} + +.clearfix { + display:block; +} + +.clearfix:after { + content:"."; + display:block; + height:0; + clear:both; + visibility:hidden; +} + +.hidden { + display: none; +} + +.display { + display: block; +} + +.center { + text-align: center; +} + +.selected { + background-color: yellow; +} + +/* + * For struts +*/ + +.wwerr { + clear: both; + float: left; +} + +.required { + color: #880000; + font-style: italic; +} + +div.errorMessage{ + clear: both; + float: left; +} + +.errorMessage { + background: url("../img/exclamation.png") no-repeat ; + list-style: none; + font-style: italic; + padding-left: 25px; + color: #000; + border-color: #f00; + margin-left:0px; +} + +.info_success { + background: no-repeat scroll 8px 5px #DFFFDF; + border: 2px solid #9FCF9F; + width: 800px; + margin-bottom: 5px; +} +.info_success ul{ + margin: 5px; + padding-left: 5px; +} +.info_success li{ + background: url("../img/true.png") no-repeat ; + list-style: none; + font-style: italic; + padding-left: 25px; + color: #005F00; + margin-left:0px; +} + +.info_error { + background: no-repeat scroll 8px 5px #FFE3E3; + border: 2px solid #DD0000; + width: 800px; + margin-bottom: 5px; +} +.info_error ul{ + margin: 5px; + padding-left: 5px; +} +.info_error li{ + background: url("../img/exclamation.png") no-repeat ; + list-style: none; + font-style: italic; + padding-left: 25px; + color: #880000; + margin-left:0px; +} \ No newline at end of file Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/common.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/main.css =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/main.css (rev 0) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/main.css 2012-01-20 21:42:18 UTC (rev 3098) @@ -0,0 +1,469 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +body { + background-color: #FFF; + background-repeat: no-repeat; + background-position: bottom right; + background-attachment: fixed; + border: none; + font-family: "Trebuchet MS", Arial, sans-serif; + font-size: small; + width: 1000px; + margin: auto; +} + +#CreationBody { + background-image: url("../img/bigCreation.png"); +} + +#VoteBody { + background-image: url("../img/bigVote.png"); +} + +#VoteCountingBody { + background-image: url("../img/bigVoteCounting.png"); +} + +body a { + color: #727a7e; +} + +body a img { + border: none; +} + +body ul { + list-style-type: none; + margin: 0px; + padding: 0px; +} + +/*Haut de page*/ +.CreationLocalization, .VoteLocalization, +.VoteCountingLocalization { + margin-top: 82px; +} + +.IndexLocalization { + margin-top: 10px; +} + +#po-header-localization { + text-align: right; + margin-bottom: 1px; +} + +#po-header-localization a { + text-decoration: none; +} + +#po-header-logo { + float: left; + margin-top: -102px; + margin-right: 10px; +} + +#po-header-connection { + float: right; + vertical-align: top; + position: relative; + margin-right: 10px; + text-align: right; +} + +#po-header-connection form { + margin: 0px; + padding: 0px; + width: 200px; +} + +#po-header-connection a, +#po-header-connection span { + padding: 1px; + padding-left: 5px; + padding-right: 5px; + text-decoration: none; + cursor: pointer; +} + +#po-header-connection a:hover, +#po-header-connection span:hover { + -moz-border-radius: 10px; + background-color: #000; + color: #fff; +} + +.Index { + background-color: #ff0; + color: #000; +} + +.Creation { + background-color: #32b5c9; + color: #000; +} + +.Vote { + background-color: #55cb00; + color: #000; +} + +.VoteCounting { + background-color: #ff1920; + color: #000; +} + +#top { + padding: 7px; + text-align: left; + vertical-align: middle; +} + +#top a { + color: #000; + text-decoration: none; +} + +#menu { + display: inline; +} + +#menu li { + cursor: pointer; +} + +#menu li a { + padding: 1px; + padding-left: 5px; + padding-right: 5px; +} + +#menu li a:hover { + -moz-border-radius: 10px; + background-color: #000; + color: #fff; +} + +.menu_elt { + display: inline; + margin-right: 40px; + position: relative; +} + +/** DROPDOWN MENU **/ +.dropdown_menu { + padding-top: 9px; + position: absolute; + z-index: 20; +} + +.dropdown_menu .top_leftIndex { + height: 16px; + width: 16px; + border: none; + background-image: url("../img/topleft_menuIndex.png"); + background-repeat: no-repeat; + background-position: left; + float: left; +} + +.dropdown_menu .top_rightIndex { + height: 16px; + width: 16px; + border: none; + background-image: url("../img/topright_menuIndex.png"); + background-repeat: no-repeat; + background-position: right; + float: right; +} + +.dropdown_menu .top_middleIndex { + margin: 15px; + margin-bottom: 0px; + margin-top: 0px; + background-color: #ff0; + border-top: none; + -moz-border-radius-bottomright: 15px; + -moz-border-radius-bottomleft: 15px; + padding: 10px; + padding-top: 0px; + min-width: 140px; +} + +.dropdown_menu .top_leftCreation { + height: 16px; + width: 16px; + border: none; + background-image: url("../img/topleft_menuCreation.png"); + background-repeat: no-repeat; + background-position: left; + float: left; +} + +.dropdown_menu .top_rightCreation { + height: 16px; + width: 16px; + border: none; + background-image: url("../img/topright_menuCreation.png"); + background-repeat: no-repeat; + background-position: right; + float: right; +} + +.dropdown_menu .top_middleCreation { + margin: 15px; + margin-bottom: 0px; + margin-top: 0px; + background-color: #32b5c9; + border-top: none; + -moz-border-radius-bottomright: 15px; + -moz-border-radius-bottomleft: 15px; + padding: 10px; + padding-top: 0px; + min-width: 140px; +} + +.dropdown_menu .top_leftVote { + height: 16px; + width: 16px; + border: none; + background-image: url("../img/topleft_menuVote.png"); + background-repeat: no-repeat; + background-position: left; + float: left; +} + +.dropdown_menu .top_rightVote { + height: 16px; + width: 16px; + border: none; + background-image: url("../img/topright_menuVote.png"); + background-repeat: no-repeat; + background-position: right; + float: right; +} + +.dropdown_menu .top_middleVote { + margin: 15px; + margin-bottom: 0px; + margin-top: 0px; + background-color: #55cb00; + border-top: none; + -moz-border-radius-bottomright: 15px; + -moz-border-radius-bottomleft: 15px; + padding: 10px; + padding-top: 0px; + min-width: 140px; +} + +.dropdown_menu .top_leftVoteCounting { + height: 16px; + width: 16px; + border: none; + background-image: url("../img/topleft_menuVoteCounting.png"); + background-repeat: no-repeat; + background-position: left; + float: left; +} + +.dropdown_menu .top_rightVoteCounting { + height: 16px; + width: 16px; + border: none; + background-image: url("../img/topright_menuVoteCounting.png"); + background-repeat: no-repeat; + background-position: right; + float: right; +} + +.dropdown_menu .top_middleVoteCounting { + margin: 15px; + margin-bottom: 0px; + margin-top: 0px; + background-color: #ff1920; + border-top: none; + -moz-border-radius-bottomright: 15px; + -moz-border-radius-bottomleft: 15px; + padding: 10px; + padding-top: 0px; + min-width: 140px; +} + +.dropdown_menu li { + z-index: 25; + padding: 3px; + display: block; + letter-spacing: 0px; +} + +#menu1 { + top: 12px; + left: -45px; +} + +#menu2 { + top: 12px; + left: -45px; +} + +#login_menu { + top: 12px; + right: -10px; +} + +#compte_menu { + top: 12px; + right: -25px; +} + +HTML>BODY DIV.t-error LI { + margin-left: 10px; +} + +/* Le corps de la page */ +#corps { + text-align: justify; + color: #000; + border: none; + min-height: 300px; +} + +#corps h1,h2,h3,h4 { + text-align: center; +} + +#corps .titleIndex { + color: #fc0; + font-weight: bold; +} + +/* TODO : refactor titleCreation usage by titlePoll */ +#corps .titlePoll, +#corps .titleCreation { + color: #32b5c9; + font-weight: bold; +} + +#corps .titleVote { + color: #55cb00; + font-weight: bold; +} + +#corps .titleVoteCounting { + color: #ff1920; + font-weight: bold; +} + +#corps h2 { + color: #727a7e; +} + +#po-header-addressBar { + padding: 5px; + margin-left: 350px; +} + +.IndexAddress { + background-color: #ffffaa; +} + +.CreationAddress { + background-color: #98dae4; +} + +.VoteAddress { + background-color: #b0f580; +} + +.VoteCountingAddress { + background-color: #ff8c8f; +} + +.content { + padding: 15px; +} + +/* Pied de page */ +#po-footer { + padding: 5px; + font-size: small; + text-align: center; + margin-top: 20px; +} + +#po-footer a, +#po-footer span { + color:#727a7e; +} + +/** old LoginComponent > Connexion page **/ +#loginCompForm fieldset { + border: 1px solid #aab; + padding: 15px; + padding-bottom: 10px; + width: 280px; + margin: auto; + margin-top: 20px; + vertical-align: top; + text-align: left; +} + +#loginCompForm div { + margin-bottom: 10px; +} + +#loginCompForm label { + display: block; + width: 100px; + float: left; +} + +#loginCompForm .buttons { + text-align: center; + margin-top: 20px; + padding-left: 0px; +} + +.fb-error { + width: 400px; + margin: auto; + text-align: center; + color: #000; + font-weight: bold; + padding: 3px; + border: solid; + border-color: #f00; + border-width: 2px; +} + +.fb-info { + width: 400px; + margin: auto; + text-align: center; + color: #000; + padding: 3px; + border: solid; + border-color: #000; + border-width: 2px; +} Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/main.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/pollen.css =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/pollen.css 2012-01-20 16:48:46 UTC (rev 3097) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/pollen.css 2012-01-20 21:42:18 UTC (rev 3098) @@ -1,158 +0,0 @@ -/* - * #%L - * Pollen :: UI (strust2) - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -/* global */ -body { - font-family: "Trebuchet MS",Arial,sans-serif; - width: 1000px; - margin: auto; - font-size: small; -} - -/* header */ -#po-header-localization{ - text-align:right; - margin-top: 10px; -} -#po-header-localization .po-contactlink { - width:20px; - background:url("../WEB-INF/img/contact.png") no-repeat center; -} -#po-header-localization .po-localelink { - width:20px; - background:url("../WEB-INF/img/en.png") no-repeat center; -} -#po-header-localization .po-localelink:lang(fr){ - background-image:url("../WEB-INF/img/fr.png") -} - -#po-header-logo{ - float: left; - margin-right: 10px; - margin-top: -100px; - width:350px; - height:153px; - background:url("../WEB-INF/img/pollenIndex_en.png") no-repeat; -} -html:lang(fr) #po-header-logo { - background-image:url("../WEB-INF/img/pollenIndex_fr.png") -} - -#po-header-menu{ - padding: 7px; - background-color: #FFFF00; -} -#po-header-menu #po-header-connection { - float:right; -} -#po-header-menu #po-header-connection #po-header-login-box{ - display:none; -} -#po-header-menu #po-header-connection-menu{ - margin:0; - padding:0; -} -#po-header-menu #po-header-connection-menu li{ - display:inline -} -#po-header-menu #po-header-connection span{ - cursor:pointer; - padding: 1px 5px; -} -#po-header-menu #po-header-connection span:hover{ - background-color: #000000; - border-radius: 10px 10px 10px 10px; - color: white; -} -#po-header-menu #po-header-connection a{ - color: black; - text-decoration:none; -} -#po-header-menu #po-header-connection a:hover{ - color: white; -} - -/* footer */ -#po-footer { - background-color: #FFFF00; - font-size: small; - margin-top: 20px; - padding: 5px; - text-align: center; - color: #727A7E; -} -#po-footer a{ - color: #727A7E; -} - -/* page content */ -.page #po-placebar { - background-color: #FFFFAA; - margin-left: 350px; - padding: 5px; -} -.page #po-placebar .pbitem { - font-weight:bold; -} -.page #po-placebar .pbitem:before{ - content:"> "; -} -.page .content { - padding: 15px; -} - -/* page : home page */ -#po-homelogo { - width:20px; - background:url("../WEB-INF/img/pollen.png") no-repeat center; - margin:auto; - width:260px; - height:200px; -} -#po-homeactions { - text-align:center; -} -#po-homeactions .createpoll{ - background:url("../WEB-INF/img/smallCreation_en.png") no-repeat center; - width:250px; - height:100px; -} -html:lang(fr) #po-homeactions .createpoll { - background-image:url("../WEB-INF/img/smallCreation_fr.png") -} -#po-homeactions .mypoll{ - background:url("../WEB-INF/img/smallVote_en.png") no-repeat center; - width:200px; - height:100px; -} -html:lang(fr) #po-homeactions .mypoll { - background-image:url("../WEB-INF/img/smallVote_fr.png") -} -#po-homeactions .votecounting{ - background:url("../WEB-INF/img/smallVoteCounting_en.png") no-repeat center; - width:250px; - height:100px; -} -html:lang(fr) #po-homeactions .votecounting { - background-image:url("../WEB-INF/img/smallVoteCounting_fr.png") -} \ No newline at end of file Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/screen.css =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/screen.css 2012-01-20 16:48:46 UTC (rev 3097) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/screen.css 2012-01-20 21:42:18 UTC (rev 3098) @@ -21,9 +21,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -* { - font-family: sans-serif; -} +/** {*/ + /*font-family: sans-serif;*/ +/*}*/ .inline { display:inline; @@ -45,24 +45,10 @@ font-size: 11px; } -#body { - /*min-height: 500px;*/ - float: left; - /*left: 275px;*/ - padding: 10px; - width: 99%; -} - .clearBoth { clear: both; } -#footer { - /*margin-top: 120px;*/ - clear: both; - text-align: center; -} - .hidden { display:none; } @@ -109,7 +95,7 @@ padding-left: 5px; } .info_error li{ - background: url("../images/exclamation.png") no-repeat ; + background: url("../img/exclamation.png") no-repeat ; list-style: none; font-style: italic; padding-left: 25px; @@ -118,7 +104,7 @@ } .errorMessage li{ - background: url("../images/exclamation.png") no-repeat ; + background: url("../img/exclamation.png") no-repeat ; list-style: none; font-style: italic; padding-left: 25px; @@ -129,6 +115,7 @@ .verticalAlignTop { vertical-align: top; } + fieldset, hr , .cleanBoth{ clear: both } @@ -152,7 +139,7 @@ float: left; } .errorMessage { - background: url("../images/exclamation.png") no-repeat ; + background: url("../img/exclamation.png") no-repeat ; list-style: none; font-style: italic; padding-left: 25px; @@ -173,77 +160,3 @@ .clearfix { display: block; } - -#footer { - /*background: url(../images/footer.png) repeat-x;*/ - /*height: 45px;*/ - /*padding: 10px 20px 15px 20px;*/ - /*margin: 30px 0;*/ - position: relative; - /*text-transform: uppercase;*/ - text-align:center; - /*color: #fff;*/ - /*font-size: 140%;*/ -} - -#footer ul { - width: 1000px; - margin: 0 auto; -} - -div#headerRight { - float:right; -} - -div#headerRight div { - float: right; -} - -#headerRight ul { - display:inline; - line-height: 20px; - padding: 0 5px; -} - -#headerRight li { - display:inline; - padding: 0 5px; -} - -ul.toolbar { - display:inline; - /*line-height: 20px;*/ - /*padding: 0 5px;*/ -} - -ul.toolbar li { - display:inline; - padding: 0 5px; -} - -#footer ul li { - display:inline; - list-style: none; - margin: 0 10px; - line-height: 30px; - padding: 0 5px; -} - -#footer ul li a { - /*color: #fff;*/ - text-decoration: none; -} - -#footer ul li a:hover { - /*color: #ffe600;*/ -} - -ul#mode_ul { - margin: 5px; - padding-left: 5px; -} -ul#mode_ul li{ - list-style: none; - padding-left: 25px; - margin-left:0px; -} Copied: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/favicon.png (from rev 3097, branches/pollen-2.0-beta-1/pollen-ui-tapestry/src/main/webapp/favicon.png) =================================================================== (Binary files differ) Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/1downarrow.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/1downarrow.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/1leftarrow.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/1leftarrow.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/1rightarrow.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/1rightarrow.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/1uparrow.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/1uparrow.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/2leftarrow.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/2leftarrow.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/2rightarrow.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/2rightarrow.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/7ter.jpg =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/7ter.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/close.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/close.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/copy.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/copy.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/count.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/count.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/delete.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/edit.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/editSmall.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/editSmall.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/exclamation.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/exclamation.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/export.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/export.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/feed.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/feed.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/feed2.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/feed2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/gplv3.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/gplv3.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/help.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/help.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/import.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/import.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/lutin.gif =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/lutin.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollen.png =================================================================== (Binary files differ) Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollenCreation_en.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollenCreation_en.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollenCreation_fr.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollenCreation_fr.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollenVoteCounting_en.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollenVoteCounting_en.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollenVoteCounting_fr.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollenVoteCounting_fr.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollenVote_en.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollenVote_en.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollenVote_fr.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollenVote_fr.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollen_en.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollen_en.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollen_fr.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/pollen_fr.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/refresh-22px.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/refresh-22px.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/rep1.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/rep1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/rep2.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/rep2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/rep3.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/rep3.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/save.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/save.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/smallCreation.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/smallCreation.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/smallVote.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/smallVote.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/smallVoteCounting.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/smallVoteCounting.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topleft_menu.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topleft_menu.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topleft_menuCreation.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topleft_menuCreation.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topleft_menuIndex.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topleft_menuIndex.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topleft_menuVote.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topleft_menuVote.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topleft_menuVoteCounting.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topleft_menuVoteCounting.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topright_menu.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topright_menu.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topright_menuCreation.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topright_menuCreation.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topright_menuIndex.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topright_menuIndex.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topright_menuVote.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topright_menuVote.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topright_menuVoteCounting.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/topright_menuVoteCounting.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/true.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/true.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/undo.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/undo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/vote.png =================================================================== (Binary files differ) Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/img/vote.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL