Author: tchemit Date: 2012-01-21 14:05:10 +0100 (Sat, 21 Jan 2012) New Revision: 3099 Url: http://chorem.org/repositories/revision/pollen/3099 Log: user managment Added: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/ShowUser.java branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/showUser.jsp branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/updateUser.jsp Removed: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/userPreferences.jsp 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/RegisterUser.java 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/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/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 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/registerUser.jsp branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/common.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-services/src/main/java/org/chorem/pollen/services/UserService.java 2012-01-20 21:42:18 UTC (rev 3098) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/UserService.java 2012-01-21 13:05:10 UTC (rev 3099) @@ -71,7 +71,7 @@ } } - public void createUser(UserAccount user) throws UserLoginAlreadyUsedException, UserEmailAlreadyUsedException { + public UserAccount createUser(UserAccount user) throws UserLoginAlreadyUsedException, UserEmailAlreadyUsedException { try { UserAccountDAO dao = @@ -92,14 +92,14 @@ ); user.setTopiaId(userAccount.getTopiaId()); copyUserAccount(user, userAccount); + return userAccount; - } catch (TopiaException e) { throw new PollenTechnicalException(e); } } - public void updateUser(UserAccount user, + public UserAccount updateUser(UserAccount user, String newPassword, boolean byAdmin) throws UserEmailAlreadyUsedException, UserInvalidPasswordException { @@ -139,6 +139,7 @@ } copyUserAccount(user, userToUpdate); + return 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/RegisterUser.java =================================================================== --- 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) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/RegisterUser.java 2012-01-21 13:05:10 UTC (rev 3099) @@ -23,7 +23,6 @@ */ 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; @@ -59,17 +58,20 @@ this.password2 = password2; } - @InputConfig(methodName = "input") + public String getPageLogo() { + return "Creation"; + } + @Override public String execute() throws Exception { UserService service = newService(UserService.class); try { - service.createUser(user); + UserAccount createdUser = service.createUser(user); getTransaction().commitTransaction(); - getPollenSession().setUserAccount(user); + getPollenSession().setUserAccount(createdUser); return SUCCESS; } catch (UserLoginAlreadyUsedException e) { addFieldError("user.login", _("pollen.error.user.login.already.used")); Copied: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/ShowUser.java (from rev 3098, 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/java/org/chorem/pollen/ui/actions/ShowUser.java (rev 0) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/ShowUser.java 2012-01-21 13:05:10 UTC (rev 3099) @@ -0,0 +1,46 @@ +/* + * #%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 org.chorem.pollen.entity.UserAccount; + +/** + * Show user account. + * + * @author tchemit <chemit@codelutin.com> + * @since 2.0 + */ +public class ShowUser extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + public String getPageLogo() { + return "Creation"; + } + + public UserAccount getUser() { + return getPollenSession().getUserAccount(); + } + +} Modified: 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/java/org/chorem/pollen/ui/actions/UpdateUser.java 2012-01-20 21:42:18 UTC (rev 3098) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/UpdateUser.java 2012-01-21 13:05:10 UTC (rev 3099) @@ -23,13 +23,11 @@ */ 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. @@ -47,6 +45,10 @@ protected String newPassword2; + public String getPageLogo() { + return "Creation"; + } + public UserAccount getUser() { if (user == null) { user = new UserAccountImpl(); @@ -70,17 +72,28 @@ this.newPassword2 = newPassword2; } - @InputConfig(methodName = "input") + public String input() throws Exception { + UserAccount userAccount = getPollenSession().getUserAccount(); + UserService userService = newService(UserService.class); + user = userService.getEntityById(UserAccount.class, userAccount.getTopiaId()); + return INPUT; + } + @Override - public String execute() throws TopiaException { + public String execute() throws Exception { + // let's push back admin property to user to save + user.setAdmin(getPollenSession().getUserAccount().isAdmin()); + UserService service = newService(UserService.class); try { - service.updateUser(user, newPassword, false); + UserAccount updatedUser = + service.updateUser(user, newPassword, false); getTransaction().commitTransaction(); - getPollenSession().setUserAccount(user); + // push back user to session + getPollenSession().setUserAccount(updatedUser); return SUCCESS; } catch (UserEmailAlreadyUsedException e) { addFieldError("user.email", _("pollen.error.user.email.already.used")); 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 21:42:18 UTC (rev 3098) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-01-21 13:05:10 UTC (rev 3099) @@ -1,10 +1,18 @@ pollen.action.login=Log me In +pollen.action.modify=Modify pollen.action.register=Register +pollen.action.validate=Submit pollen.common.bugReport=Bug report +pollen.common.email=Em@il +pollen.common.firstName=First name +pollen.common.lastName=Last name pollen.common.license=Licence pollen.common.login=Login +pollen.common.newPassword=New password +pollen.common.newPassword2=Reenter new passworsd pollen.common.or=or pollen.common.password=Password +pollen.common.password2=Renter your password pollen.common.userSupport=User support pollen.error.email.required=You must provide a email pollen.error.login.required=You must provide a login @@ -13,6 +21,7 @@ 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= pollen.error.user.login.already.used=This login is already used pollen.fieldset.connexionInformation=Information de connexion pollen.fieldset.userInformation=Informations de l'utilisateur @@ -32,4 +41,5 @@ pollen.menu.preferences=My account pollen.menu.register=Register pollen.title.login=Page de login +pollen.title.myAccount=My account 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 21:42:18 UTC (rev 3098) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-01-21 13:05:10 UTC (rev 3099) @@ -1,10 +1,18 @@ pollen.action.login=M'identifier +pollen.action.modify=Modifier pollen.action.register=S'enregistrer +pollen.action.validate=Valider pollen.common.bugReport=Rapport de bug +pollen.common.email=Em@il +pollen.common.firstName=Prénom +pollen.common.lastName=Nom pollen.common.license=Licence -pollen.common.login=Login +pollen.common.login=Identifiant +pollen.common.newPassword=Nouveau mot de passe +pollen.common.newPassword2=Répétez votre nouveau mot de passe pollen.common.or=ou pollen.common.password=Mot de passe +pollen.common.password2=Répétez votre mot de passe pollen.common.userSupport=Support utilisateur pollen.error.email.required=Courriel obligatoire pollen.error.login.required=Login obligatoire @@ -13,6 +21,7 @@ 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= pollen.error.user.login.already.used=Le login saisie est déjà utilisé par un autre utilisateur pollen.fieldset.connexionInformation=Information de connexion pollen.fieldset.userInformation=Informations de l'utilisateur @@ -32,4 +41,5 @@ pollen.menu.preferences=Mon compte pollen.menu.register=Inscrivez-vous pollen.title.login=Page de login -pollen.title.register=Enregistrement +pollen.title.myAccount=Mon compte +pollen.title.register=S'enregistrer Modified: 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/RegisterUser-validation.xml 2012-01-20 21:42:18 UTC (rev 3098) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/RegisterUser-validation.xml 2012-01-21 13:05:10 UTC (rev 3099) @@ -43,7 +43,7 @@ <field name="password2"> - <field-validator type="requiredstring"> + <field-validator type="requiredstring" short-circuit="true"> <message key="pollen.error.password2.required"/> </field-validator> Modified: 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/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml 2012-01-20 21:42:18 UTC (rev 3098) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml 2012-01-21 13:05:10 UTC (rev 3099) @@ -41,14 +41,10 @@ </field> - <field name="password2"> + <field name="newPassword2"> - <field-validator type="requiredstring"> - <message key="pollen.error.password2.required"/> - </field-validator> - <field-validator type="fieldexpression"> - <param name="expression">password2.equals(user.password)</param> + <param name="expression">newPassword == null || newPassword == null || newPassword2.equals(newPassword)</param> <message key="pollen.error.passwords.not.equals"/> </field-validator> 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 21:42:18 UTC (rev 3098) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/struts.xml 2012-01-21 13:05:10 UTC (rev 3099) @@ -123,14 +123,20 @@ <action name="registerUser" class="org.chorem.pollen.ui.actions.RegisterUser"> <result name="input">/WEB-INF/jsp/registerUser.jsp</result> - <result>/WEB-INF/jsp/home.jsp</result> + <result type="redirectAction">home</result> </action> - <!-- user preferences --> + <!-- show user account --> + <action name="showUser" + class="org.chorem.pollen.ui.actions.ShowUser"> + <result>/WEB-INF/jsp/showUser.jsp</result> + </action> + + <!-- modify user account --> <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> + <result name="input">/WEB-INF/jsp/updateUser.jsp</result> + <result type="redirectAction">showUser</result> </action> <!-- logout --> 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 21:42:18 UTC (rev 3098) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-01-21 13:05:10 UTC (rev 3099) @@ -84,7 +84,7 @@ <div class="top_left${pageLogo}"></div> <ul class="top_middle${pageLogo}"> <li> - <s:a action="updateUser" method="input"> + <s:a action="showUser"> <s:text name="pollen.menu.preferences"/> </s:a> </li> @@ -105,13 +105,18 @@ <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"/> + <label for="connection_login"> + <s:text name="pollen.common.login"/> : + </label> + <s:textfield key="login" size="10" required="true" theme="simple"/> </li> <li> + <label for="connection_password"> + <s:text name="pollen.common.password"/> : + </label> <s:password key="password" label="%{getText('pollen.common.password')}" size="10" - required="true"/> + required="true" theme="simple"/> </li> <li> <s:submit id="submitform" action="login" key="pollen.action.login" @@ -197,7 +202,8 @@ </div> <!-- Corps de la page --> -<div id="corps" class="cleanBoth clearfix"> +<%--<div id="corps" class="cleanBoth clearfix">--%> +<div id="corps"> <!-- Barre d'adresse --> <div id="po-header-addressBar" class="${pageLogo}Address"> Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/registerUser.jsp =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/registerUser.jsp 2012-01-20 21:42:18 UTC (rev 3098) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/registerUser.jsp 2012-01-21 13:05:10 UTC (rev 3099) @@ -26,8 +26,10 @@ <title><s:text name="pollen.title.register"/></title> -<s:form method="POST"> +<h1 class="title${pageLogo}"><s:text name="pollen.title.register"/></h1> +<s:form method="POST" key="registerForm"> + <fieldset> <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> @@ -40,10 +42,9 @@ <legend><s:text name="pollen.fieldset.userInformation"/></legend> <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"/> + <s:textfield name="user.firstName" key="pollen.common.firstName"/> + <s:textfield name="user.lastName" key="pollen.common.lastName"/> </fieldset> <br/> - <s:submit action="registerUser" key="pollen.action.register" align="right"/> + <s:submit action="registerUser" key="pollen.action.register" align="center"/> </s:form> Copied: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/showUser.jsp (from rev 3098, 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/showUser.jsp (rev 0) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/showUser.jsp 2012-01-21 13:05:10 UTC (rev 3099) @@ -0,0 +1,50 @@ +<%-- + #%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.myAccount"/></title> + +<h1 class="title${pageLogo}"><s:text name="pollen.title.myAccount"/></h1> + +<s:form method="GET"> + + <fieldset> + <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> + + <s:hidden key="user.topiaId" label="" /> + <s:label name="user.login" key="pollen.common.login"/> + </fieldset> + + <fieldset> + <legend><s:text name="pollen.fieldset.userInformation"/></legend> + + <s:label name="user.email" key="pollen.common.email" /> + <s:label name="user.firstName" key="pollen.common.firstName" /> + <s:label name="user.lastName" key="pollen.common.lastName" /> + </fieldset> + <br/> + <s:submit action="updateUser" method="input" + key="pollen.action.modify" align="center"/> +</s:form> Copied: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/updateUser.jsp (from rev 3098, 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/updateUser.jsp (rev 0) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/updateUser.jsp 2012-01-21 13:05:10 UTC (rev 3099) @@ -0,0 +1,53 @@ +<%-- + #%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.myAccount"/></title> + +<h1 class="title${pageLogo}"><s:text name="pollen.title.myAccount"/></h1> + +<s:form method="POST"> + + <fieldset> + <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> + + <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.password" + required="true"/> + <s:password name="newPassword" key="pollen.common.newPassword"/> + <s:password name="newPassword2" key="pollen.common.newPassword2"/> + </fieldset> + + <fieldset> + <legend><s:text name="pollen.fieldset.userInformation"/></legend> + + <s:textfield name="user.email" key="pollen.common.email" required="true"/> + <s:textfield name="user.firstName" key="pollen.common.firstName"/> + <s:textfield name="user.lastName" key="pollen.common.lastName"/> + </fieldset> + <br/> + <s:submit action="updateUser" key="pollen.action.validate" align="center"/> +</s:form> Property changes on: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/updateUser.jsp ___________________________________________________________________ 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/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 21:42:18 UTC (rev 3098) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/userPreferences.jsp 2012-01-21 13:05:10 UTC (rev 3099) @@ -1,52 +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.preferences"/></title> - -<s:form method="POST"> - - <fieldset> - <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> - - <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="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="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="updateUser" key="pollen.action.updateUser" align="right"/> -</s:form> Modified: 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 2012-01-20 21:42:18 UTC (rev 3098) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/common.css 2012-01-21 13:05:10 UTC (rev 3099) @@ -62,6 +62,27 @@ * For struts */ + + +/*.wwgrp {*/ + /*float: none;*/ +/*}*/ + +fieldset, hr , .cleanBoth{ + clear: both +} +.wwlbl { + float: left; + clear: both; + width: 300px; + /*# text-align: right;*/ +} +.wwctrl { + float: left; +} + + + .wwerr { clear: both; float: left;