Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
nodiscc 2015-06-23 15:03:01 +02:00
commit adb1d6c213
2 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
inc/shaarli.css
View file

@ -348,6 +348,16 @@ h1 {
font-size: inherit; font-size: inherit;
} }
#headerform label {
margin-right: 10px;
}
#headerform label[for=longlastingsession] {
display: block;
width: 100%;
margin-top: 5px;
}
#toolsdiv { #toolsdiv {
color: #ffffff; color: #ffffff;
padding: 5px 5px 5px 5px; padding: 5px 5px 5px 5px;
@ -984,6 +994,20 @@ div.dailyNoEntry {
margin: 3px; 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 { .searchform, .tagfilter {
display: block !important; display: block !important;
margin: 0px 3px 7px 0px !important; margin: 0px 3px 7px 0px !important;

10
tpl/loginform.html
View file

@ -10,10 +10,12 @@
You have been banned from login after too many failed attempts. Try later. You have been banned from login after too many failed attempts. Try later.
{else} {else}
<form method="post" name="loginform"> <form method="post" name="loginform">
Login: <input type="text" name="login" tabindex="1">&nbsp;&nbsp;&nbsp; <label for="login">Login: <input type="text" id="login" name="login" tabindex="1"></label>
Password : <input type="password" name="password" tabindex="2"> <label for="password">Password: <input type="password" id="password" name="password" tabindex="2"></label>
<input type="submit" value="Login" class="bigbutton" tabindex="4"><br> <input type="submit" value="Login" class="bigbutton" tabindex="4">
<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="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}"> <input type="hidden" name="token" value="{$token}">
{if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl|htmlspecialchars}">{/if} {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl|htmlspecialchars}">{/if}
</form> </form>