r175 - in trunk/src/main: resources/i18n webapp/css webapp/jsp
Author: vbriand Date: 2011-01-21 15:54:13 +0100 (Fri, 21 Jan 2011) New Revision: 175 Url: http://chorem.org/repositories/revision/bow/175 Log: Fixed the design on the login, forgotPassword and register pages which was broken because Struts2 generates ugly "<table>"s everywhere Modified: trunk/src/main/resources/i18n/bow_fr_FR.properties trunk/src/main/webapp/css/connexion.css trunk/src/main/webapp/jsp/forgotPassword.jsp trunk/src/main/webapp/jsp/login.jsp trunk/src/main/webapp/jsp/register.jsp Modified: trunk/src/main/resources/i18n/bow_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-01-21 11:22:45 UTC (rev 174) +++ trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-01-21 14:54:13 UTC (rev 175) @@ -28,7 +28,7 @@ bow.login.email.wrongformat=Votre adresse email est invalide bow.login.password=Mot de passe bow.login.password.required=Veuillez entrer votre mot de passe -bow.login.repeatPassword=Retapez votre mot de passe +bow.login.repeatPassword=Confirmation bow.login.repeatPassword.required=Veuillez retaper votre mot de passe bow.login.submit=Connexion bow.login.title=Connexion Modified: trunk/src/main/webapp/css/connexion.css =================================================================== --- trunk/src/main/webapp/css/connexion.css 2011-01-21 11:22:45 UTC (rev 174) +++ trunk/src/main/webapp/css/connexion.css 2011-01-21 14:54:13 UTC (rev 175) @@ -78,10 +78,10 @@ color:#804561; width:225px; position:relative; - margin:15px auto; + margin:15px 15px -20px 0px; } -#formFrame form p{ +#formFrame form table td label{ color:#804561; font-size:16px; font-weight:bold; @@ -101,7 +101,7 @@ font-size: 12px; } -#formFrame #register{ +#formFrame #registerLink, #formFrame #loginLink{ bottom:50px; font-size:14px; } @@ -117,7 +117,7 @@ font-size: 10px; } -input[type="submit"] { +input[type="submit"]{ float:right; margin-top:20px; background:url('/bow/img/fdboutonV.jpg') repeat-x; @@ -127,5 +127,19 @@ font-weight:bold; border:none; width:auto; - padding: 2px; + padding:2px; } + +#formFrame input[type="submit"]{ + position:absolute; + bottom:40px; + right:30px; +} + +#forgotPassword{ + margin-top:50px; +} + +#register{ + margin-top:35px; +} Modified: trunk/src/main/webapp/jsp/forgotPassword.jsp =================================================================== --- trunk/src/main/webapp/jsp/forgotPassword.jsp 2011-01-21 11:22:45 UTC (rev 174) +++ trunk/src/main/webapp/jsp/forgotPassword.jsp 2011-01-21 14:54:13 UTC (rev 175) @@ -40,11 +40,11 @@ <h1><s:text name="bow.forgotpwd.title" /></h1> <s:form action="forgotPassword"> <p> - <s:textfield key="bow.login.email" name="email" /> + <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /> <s:submit key="bow.forgotpwd.submit" /> </p> </s:form> - <s:a action="login_input"><s:text name="bow.login.title" /></s:a> + <s:a action="login_input" id="loginLink"><s:text name="bow.login.title" /></s:a> </div> </div> </body> Modified: trunk/src/main/webapp/jsp/login.jsp =================================================================== --- trunk/src/main/webapp/jsp/login.jsp 2011-01-21 11:22:45 UTC (rev 174) +++ trunk/src/main/webapp/jsp/login.jsp 2011-01-21 14:54:13 UTC (rev 175) @@ -13,25 +13,17 @@ <s:head /> </head> <body> - <div id="content"> - <div id="formFrame"> - <h1><s:text name="bow.login.title" /></h1> - <s:form action="login"> - <p> - <!-- <label for="login_email" class="label"><s:text name="bow.login.email" /> :</label> - <input type="text" name="email" value="" id="login_email" /><br /><br /> - <label for="login_password" class="label"><s:text name="bow.login.password" /> :</label> - <input type="password" name="password" id="login_password" /></td> - <s:submit key="bow.login.submit" /> --> - - <s:textfield key="bow.login.email" name="email" /><br /><br /> - <s:password key="bow.login.password" name="password" /><br /><br /> - <s:submit key="bow.login.submit" /> - </p> - </s:form> - <s:a action="register_input"><s:text name="bow.register.title" /></s:a><br /> - <s:a action="forgotPassword_input"><s:text name="bow.forgotpwd.title" /></s:a> - </div> - </div> + <div id="content"> + <div id="formFrame"> + <h1><s:text name="bow.login.title" /></h1> + <s:form action="login"> + <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /><br /><br /> + <s:password key="bow.login.password" name="password" labelposition="top" labelSeparator=" :" /><br /><br /> + <s:submit key="bow.login.submit" /> + </s:form> + <s:a action="register_input" id="registerLink"><s:text name="bow.register.title" /></s:a><br /> + <s:a action="forgotPassword_input" id="forgotPwd"><s:text name="bow.forgotpwd.title" /></s:a> + </div> + </div> </body> </html> Modified: trunk/src/main/webapp/jsp/register.jsp =================================================================== --- trunk/src/main/webapp/jsp/register.jsp 2011-01-21 11:22:45 UTC (rev 174) +++ trunk/src/main/webapp/jsp/register.jsp 2011-01-21 14:54:13 UTC (rev 175) @@ -40,13 +40,13 @@ <h1><s:text name="bow.register.title" /></h1> <s:form action="register"> <p> - <s:textfield key="bow.login.email" name="email" /> - <s:password key="bow.login.password" name="password" /> - <s:password key="bow.login.repeatPassword" name="repeatPassword" /> + <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /> + <s:password key="bow.login.password" name="password" labelposition="top" labelSeparator=" :" /> + <s:password key="bow.login.repeatPassword" name="repeatPassword" labelposition="top" labelSeparator=" :" /> <s:submit key="bow.register.submit" /> </p> </s:form> - <s:a action="login_input"><s:text name="bow.login.title" /></s:a> + <s:a action="login_input" id="loginLink"><s:text name="bow.login.title" /></s:a> </div> </div> </body>
participants (1)
-
vbriand＠users.chorem.org