Fix quickconnect form misalignement

git-svn-id: http://piwigo.org/svn/trunk@892 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 32 insertions, 17 deletions

diff --git a/template/yoga/category.tpl b/template/yoga/category.tpl
index d728e8856..ed3b93fef 100644
--- a/template/yoga/category.tpl
+++ b/template/yoga/category.tpl
@@ -67,21 +67,23 @@
     <!-- BEGIN quickconnect -->
     <hr />
     <form method="post" action="{F_IDENTIFY}" id="quickconnect">
-      <p>
-	<input type="hidden" name="redirect" value="{U_REDIRECT}">
-	<label for="username">{L_USERNAME}:</label>
-	<input type="text" name="username" id="username" size="15" value="">
-      </p>
-      <p>
-	<label for="password">{L_PASSWORD}:</label>
-	<input type="password" name="password" id="password" size="15">
-      </p>
-      <!-- BEGIN remember_me -->
-      <p>
-	<input type="checkbox" name="remember_me" id="remember_me" value="1">
-	<label for="remember_me">{L_REMEMBER_ME}</label>
-      </p>
-      <!-- END remember_me -->
+      <ul>
+        <li>
+	  <input type="hidden" name="redirect" value="{U_REDIRECT}">
+	  <label for="username">{L_USERNAME}</label>
+	  <input type="text" name="username" id="username" size="15" value="">
+        </li>
+        <li>
+	  <label for="password">{L_PASSWORD}</label>
+	  <input type="password" name="password" id="password" size="15">
+        </li>
+        <!-- BEGIN remember_me -->
+        <li>
+	  <label for="remember_me">{L_REMEMBER_ME}</label>
+	  <input type="checkbox" name="remember_me" id="remember_me" value="1">
+        </li>
+        <!-- END remember_me -->
+      </ul>
       <p><input type="submit" name="login" value="{L_SUBMIT}"></p>
     </form>
     <!-- END quickconnect -->
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index d4f4f19dc..9d0b62d6a 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -59,6 +59,7 @@ HR.separation {
 }
 
 /** General defaults **/
+INPUT {margin: 0;}
 ul, dl, li { text-align: left;}
 /* for debugging purpose */
 pre { text-align:left; }
@@ -193,13 +194,13 @@ FORM.filter INPUT[type="submit"] {
   margin-top: 1em;
 }
 
-FORM.properties UL {
+FORM.properties UL, FORM#quickconnect UL {
   list-style-type: none;
   margin: 0;
   padding: 0;
 }
 
-FORM.properties LI {
+FORM.properties LI, FORM#quickconnect UL  {
   margin-bottom: 0.5em;
   padding: 0;
   line-height: 1.8em;
@@ -213,6 +214,18 @@ FORM.properties LABEL {
   padding: 0 0.5em 0 0;
 }
 
+FORM#quickconnect LABEL {
+  float: left;
+  width: 30%;
+  text-align: right;
+  margin: 0.5em 0 0 0;
+  padding: 0 0.5em 0 0;
+}
+
+FORM#quickconnect INPUT {
+  margin-top: 0.5em;
+}
+
 FORM.properties LABEL.mandatory {
   font-weight: bold;
 }