Merge remote-tracking branch 'nicolasdanelon/master' into next

diff --git a/inc/shaarli.css b/inc/shaarli.css
index f54135249a80da97a14fdc64179db6ae3af94d81..fcd5c6a2b436944ee74f31a9f19019eb51b41873 100644 (file)
--- a/inc/shaarli.css
+++ b/inc/shaarli.css
@@ -348,6 +348,16 @@ h1 {
     font-size: inherit;
 }
 
+#headerform label {
+    margin-right: 10px;
+}
+
+#headerform label[for=longlastingsession] {
+    display: block;
+    width: 100%;
+    margin-top: 5px;
+}
+
 #toolsdiv {
     color: #ffffff;
     padding: 5px 5px 5px 5px;
@@ -984,6 +994,20 @@ div.dailyNoEntry {
        margin: 3px;
     }
 
+    #headerform label {
+    width: 100%;
+    display: block;
+    height: auto;
+    line-height: 25px;
+    padding-bottom: 10px;
+    }
+
+    #headerform label input[type=text],
+    #headerform label input[type=password]{
+    float: right;
+    width: 70%;
+    }
+
     .searchform, .tagfilter {
        display: block !important;
        margin: 0px 3px 7px 0px !important;

diff --git a/tpl/loginform.html b/tpl/loginform.html
index 954f6f1fea1c52befe066a73c7ee6f1bf8d7af80..91b948ddbca52fb54e4f74faa11ccb8777893546 100644 (file)
--- a/tpl/loginform.html
+++ b/tpl/loginform.html
@@ -10,10 +10,12 @@
     You have been banned from login after too many failed attempts. Try later.
 {else}
     <form method="post" name="loginform">
-    Login: <input type="text" name="login" tabindex="1">&nbsp;&nbsp;&nbsp;
-    Password : <input type="password" name="password" tabindex="2">
-    <input type="submit" value="Login" class="bigbutton" tabindex="4"><br>
-    <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="3"><label for="longlastingsession">&nbsp;Stay signed in (Do not check on public computers)</label>
+    <label for="login">Login: <input type="text" id="login" name="login" tabindex="1"></label>
+    <label for="password">Password: <input type="password" id="password" name="password" tabindex="2"></label>
+    <input type="submit" value="Login" class="bigbutton" tabindex="4">
+    <label for="longlastingsession">
+    <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="3">
+    Stay signed in (Do not check on public computers)</label>
     <input type="hidden" name="token" value="{$token}">
     {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl|htmlspecialchars}">{/if}
     </form>