diff options
author | nodiscc <nodiscc@gmail.com> | 2015-06-23 15:03:01 +0200 |
---|---|---|
committer | nodiscc <nodiscc@gmail.com> | 2015-06-23 15:03:01 +0200 |
commit | adb1d6c213e64f7a6f4559adbc4d1f69f5a74e62 (patch) | |
tree | 562b0df6cb613a1bfe8b8c3caffb3ee82df67ecd | |
parent | 578a84bda0679720f21271ef34de58106c0646fe (diff) | |
parent | 25c46408a3d5101801574703775cdfd2a0df8d4f (diff) | |
download | Shaarli-adb1d6c213e64f7a6f4559adbc4d1f69f5a74e62.tar.gz Shaarli-adb1d6c213e64f7a6f4559adbc4d1f69f5a74e62.tar.zst Shaarli-adb1d6c213e64f7a6f4559adbc4d1f69f5a74e62.zip |
Merge remote-tracking branch 'nicolasdanelon/master' into next
-rw-r--r-- | inc/shaarli.css | 24 | ||||
-rw-r--r-- | tpl/loginform.html | 10 |
2 files changed, 30 insertions, 4 deletions
diff --git a/inc/shaarli.css b/inc/shaarli.css index f5413524..fcd5c6a2 100644 --- a/inc/shaarli.css +++ b/inc/shaarli.css | |||
@@ -348,6 +348,16 @@ h1 { | |||
348 | font-size: inherit; | 348 | font-size: inherit; |
349 | } | 349 | } |
350 | 350 | ||
351 | #headerform label { | ||
352 | margin-right: 10px; | ||
353 | } | ||
354 | |||
355 | #headerform label[for=longlastingsession] { | ||
356 | display: block; | ||
357 | width: 100%; | ||
358 | margin-top: 5px; | ||
359 | } | ||
360 | |||
351 | #toolsdiv { | 361 | #toolsdiv { |
352 | color: #ffffff; | 362 | color: #ffffff; |
353 | padding: 5px 5px 5px 5px; | 363 | padding: 5px 5px 5px 5px; |
@@ -984,6 +994,20 @@ div.dailyNoEntry { | |||
984 | margin: 3px; | 994 | margin: 3px; |
985 | } | 995 | } |
986 | 996 | ||
997 | #headerform label { | ||
998 | width: 100%; | ||
999 | display: block; | ||
1000 | height: auto; | ||
1001 | line-height: 25px; | ||
1002 | padding-bottom: 10px; | ||
1003 | } | ||
1004 | |||
1005 | #headerform label input[type=text], | ||
1006 | #headerform label input[type=password]{ | ||
1007 | float: right; | ||
1008 | width: 70%; | ||
1009 | } | ||
1010 | |||
987 | .searchform, .tagfilter { | 1011 | .searchform, .tagfilter { |
988 | display: block !important; | 1012 | display: block !important; |
989 | margin: 0px 3px 7px 0px !important; | 1013 | margin: 0px 3px 7px 0px !important; |
diff --git a/tpl/loginform.html b/tpl/loginform.html index 954f6f1f..91b948dd 100644 --- a/tpl/loginform.html +++ b/tpl/loginform.html | |||
@@ -10,10 +10,12 @@ | |||
10 | You have been banned from login after too many failed attempts. Try later. | 10 | You have been banned from login after too many failed attempts. Try later. |
11 | {else} | 11 | {else} |
12 | <form method="post" name="loginform"> | 12 | <form method="post" name="loginform"> |
13 | Login: <input type="text" name="login" tabindex="1"> | 13 | <label for="login">Login: <input type="text" id="login" name="login" tabindex="1"></label> |
14 | Password : <input type="password" name="password" tabindex="2"> | 14 | <label for="password">Password: <input type="password" id="password" name="password" tabindex="2"></label> |
15 | <input type="submit" value="Login" class="bigbutton" tabindex="4"><br> | 15 | <input type="submit" value="Login" class="bigbutton" tabindex="4"> |
16 | <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="3"><label for="longlastingsession"> Stay signed in (Do not check on public computers)</label> | 16 | <label for="longlastingsession"> |
17 | <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="3"> | ||
18 | Stay signed in (Do not check on public computers)</label> | ||
17 | <input type="hidden" name="token" value="{$token}"> | 19 | <input type="hidden" name="token" value="{$token}"> |
18 | {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl|htmlspecialchars}">{/if} | 20 | {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl|htmlspecialchars}">{/if} |
19 | </form> | 21 | </form> |