From vbriand@users.chorem.org Fri Jan 21 15:54:13 2011
From: vbriand@users.chorem.org
To: bow-commits@list.chorem.org
Subject:
 [Bow-commits] r175 - in trunk/src/main: resources/i18n webapp/css	webapp/jsp
Date: Fri, 21 Jan 2011 15:54:13 +0100
Message-ID: <20110121145413.599EF15AF5@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7363808679718168220=="

--===============7363808679718168220==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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 br=
oken 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/resources/i18n/bow_fr_FR.properties	2011-01-21 11:22:45 UT=
C (rev 174)
+++ trunk/src/main/resources/i18n/bow_fr_FR.properties	2011-01-21 14:54:13 UT=
C (rev 175)
@@ -28,7 +28,7 @@
 bow.login.email.wrongformat=3DVotre adresse email est invalide
 bow.login.password=3DMot de passe
 bow.login.password.required=3DVeuillez entrer votre mot de passe
-bow.login.repeatPassword=3DRetapez votre mot de passe
+bow.login.repeatPassword=3DConfirmation
 bow.login.repeatPassword.required=3DVeuillez retaper votre mot de passe
 bow.login.submit=3DConnexion
 bow.login.title=3DConnexion

Modified: trunk/src/main/webapp/css/connexion.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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;
 }
=20
-#formFrame form p{
+#formFrame form table td label{
     color:#804561;
     font-size:16px;
     font-weight:bold;
@@ -101,7 +101,7 @@
     font-size: 12px;
 }
=20
-#formFrame #register{
+#formFrame #registerLink, #formFrame #loginLink{
     bottom:50px;
     font-size:14px;
 }
@@ -117,7 +117,7 @@
 	font-size: 10px;
 }
=20
-input[type=3D"submit"] {
+input[type=3D"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=3D"submit"]{
+	position:absolute;
+	bottom:40px;
+	right:30px;
+}
+
+#forgotPassword{
+	margin-top:50px;
+}
+
+#register{
+	margin-top:35px;
+}

Modified: trunk/src/main/webapp/jsp/forgotPassword.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3D"bow.forgotpwd.title" /></h1>
             <s:form action=3D"forgotPassword">
                 <p>
-                	<s:textfield key=3D"bow.login.email" name=3D"email" />
+                	<s:textfield key=3D"bow.login.email" name=3D"email" labelpo=
sition=3D"top" labelSeparator=3D" :" />
                 	<s:submit key=3D"bow.forgotpwd.submit" />
                 </p>
             </s:form>
-            <s:a action=3D"login_input"><s:text name=3D"bow.login.title" /><=
/s:a>
+            <s:a action=3D"login_input" id=3D"loginLink"><s:text name=3D"bow=
.login.title" /></s:a>
 		</div>
 	</div>
   </body>

Modified: trunk/src/main/webapp/jsp/login.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3D"content">
-    <div id=3D"formFrame">
-      <h1><s:text name=3D"bow.login.title" /></h1>
-      <s:form action=3D"login">
-	  	<p>
-	  		<!-- <label for=3D"login_email" class=3D"label"><s:text name=3D"bow.log=
in.email" /> :</label>
-	  	    <input type=3D"text" name=3D"email" value=3D"" id=3D"login_email" />=
<br /><br />
- 	 	 	<label for=3D"login_password" class=3D"label"><s:text name=3D"bow.logi=
n.password" /> :</label>
- 	 	 	<input type=3D"password" name=3D"password" id=3D"login_password" /></t=
d>
-	  		<s:submit key=3D"bow.login.submit" /> -->
-
-	  		<s:textfield key=3D"bow.login.email" name=3D"email" /><br /><br />
-	  		<s:password key=3D"bow.login.password" name=3D"password" /><br /><br />
-	  		<s:submit key=3D"bow.login.submit" />
-		</p>
-      </s:form>
-      <s:a action=3D"register_input"><s:text name=3D"bow.register.title" /><=
/s:a><br />
-      <s:a action=3D"forgotPassword_input"><s:text name=3D"bow.forgotpwd.tit=
le" /></s:a>
-    </div>
-  </div>
+	<div id=3D"content">
+	  	<div id=3D"formFrame">
+	    	<h1><s:text name=3D"bow.login.title" /></h1>
+	    	<s:form action=3D"login">
+		  		<s:textfield key=3D"bow.login.email" name=3D"email" labelposition=3D"t=
op" labelSeparator=3D" :" /><br /><br />
+		  		<s:password key=3D"bow.login.password" name=3D"password" labelposition=
=3D"top" labelSeparator=3D" :" /><br /><br />
+				<s:submit key=3D"bow.login.submit" />
+	    	</s:form>
+	    	<s:a action=3D"register_input" id=3D"registerLink"><s:text name=3D"bow=
.register.title" /></s:a><br />
+	    	<s:a action=3D"forgotPassword_input" id=3D"forgotPwd"><s:text name=3D"=
bow.forgotpwd.title" /></s:a>
+	    </div>
+	</div>
   </body>
 </html>

Modified: trunk/src/main/webapp/jsp/register.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3D"bow.register.title" /></h1>
 	    	<s:form action=3D"register">
 		    	<p>
-			    	<s:textfield key=3D"bow.login.email" name=3D"email" />
-					<s:password key=3D"bow.login.password" name=3D"password" />
-					<s:password key=3D"bow.login.repeatPassword" name=3D"repeatPassword" />
+			    	<s:textfield key=3D"bow.login.email" name=3D"email" labelposition=3D=
"top" labelSeparator=3D" :" />
+					<s:password key=3D"bow.login.password" name=3D"password" labelposition=
=3D"top" labelSeparator=3D" :" />
+					<s:password key=3D"bow.login.repeatPassword" name=3D"repeatPassword" la=
belposition=3D"top" labelSeparator=3D" :" />
 			    	<s:submit key=3D"bow.register.submit" />
 				</p>
 		    </s:form>
-		    <s:a action=3D"login_input"><s:text name=3D"bow.login.title" /></s:a>
+		    <s:a action=3D"login_input" id=3D"loginLink"><s:text name=3D"bow.login=
.title" /></s:a>
 		</div>
     </div>
   </body>


--===============7363808679718168220==--