This commit is contained in:
Laurent Destailleur 2018-09-13 16:39:50 +02:00
parent ca85356b45
commit 78e983a1f5
4 changed files with 63 additions and 33 deletions

View File

@ -123,26 +123,29 @@ if ($disablenofollow) echo '</a>';
<div id="login_right"> <div id="login_right">
<table class="left centpercent" title="<?php echo $langs->trans("EnterLoginDetail"); ?>"> <div class="tagtable left centpercent" title="<?php echo $langs->trans("EnterLoginDetail"); ?>">
<!-- Login --> <!-- Login -->
<tr> <div class="trinputlogin">
<td class="nowrap center valignmiddle"> <div class="tagtd nowrap center valignmiddle tdinputlogin">
<?php if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?><label for="username" class="hidden"><?php echo $langs->trans("Login"); ?></label><?php } ?> <?php if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?><label for="username" class="hidden"><?php echo $langs->trans("Login"); ?></label><?php } ?>
<!-- <span class="span-icon-user">--> <!-- <span class="span-icon-user">-->
<span class="fa fa-user"> <span class="fa fa-user">
<input type="text" id="username" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" />
</span> </span>
</td> <input type="text" id="username" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" />
</tr> </div>
</div>
<!-- Password --> <!-- Password -->
<tr> <div class="trinputlogin">
<td class="nowrap center valignmiddle"> <div class="tagtd nowrap center valignmiddle tdinputlogin">
<?php if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?><label for="password" class="hidden"><?php echo $langs->trans("Password"); ?></label><?php } ?> <?php if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?><label for="password" class="hidden"><?php echo $langs->trans("Password"); ?></label><?php } ?>
<!--<span class="span-icon-password">--> <!--<span class="span-icon-password">-->
<span class="fa fa-key"> <span class="fa fa-key">
<input id="password" placeholder="<?php echo $langs->trans("Password"); ?>" name="password" class="flat input-icon-password minwidth150" type="password" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="<?php echo empty($conf->global->MAIN_LOGIN_ENABLE_PASSWORD_AUTOCOMPLETE)?'off':'on'; ?>" />
</span> </span>
</td></tr> <input id="password" placeholder="<?php echo $langs->trans("Password"); ?>" name="password" class="flat input-icon-password minwidth150" type="password" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="<?php echo empty($conf->global->MAIN_LOGIN_ENABLE_PASSWORD_AUTOCOMPLETE)?'off':'on'; ?>" />
</div></div>
<?php <?php
if (! empty($morelogincontent)) { if (! empty($morelogincontent)) {
if (is_array($morelogincontent)) { if (is_array($morelogincontent)) {
@ -168,10 +171,11 @@ if ($captcha) {
// TODO: provide accessible captcha variants // TODO: provide accessible captcha variants
?> ?>
<!-- Captcha --> <!-- Captcha -->
<tr> <div class="trinputlogin">
<td class="nowrap none center"> <div class="tagtd nowrap none center valignmiddle tdinputlogin">
<table class="login_table_securitycode centpercent"><tr> <table class="login_table_securitycode centpercent">
<tr class="valignmiddle">
<td> <td>
<span class="span-icon-security"> <span class="span-icon-security">
<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security width100" type="text" maxlength="5" name="code" tabindex="3" /> <input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security width100" type="text" maxlength="5" name="code" tabindex="3" />
@ -179,12 +183,14 @@ if ($captcha) {
</td> </td>
<td><img src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" /></td> <td><img src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" /></td>
<td><a href="<?php echo $php_self; ?>" tabindex="4" data-role="button"><?php echo $captcha_refresh; ?></a></td> <td><a href="<?php echo $php_self; ?>" tabindex="4" data-role="button"><?php echo $captcha_refresh; ?></a></td>
</tr></table> </tr>
</td></tr>
<?php } ?>
</table> </table>
</div></div>
<?php } ?>
</div>
</div> <!-- end div login-right --> </div> <!-- end div login-right -->
</div> <!-- end div login-line1 --> </div> <!-- end div login-line1 -->

View File

@ -97,17 +97,17 @@ if ($disablenofollow) echo '</a>';
<div id="login_right"> <div id="login_right">
<table summary="Login pass" class="centpercent"> <div class="tagtable centpercent" title="Login pass" >
<!-- Login --> <!-- Login -->
<tr> <div class="trinputlogin">
<td valign="bottom" class="nowrap center"> <div class="tagtd center valignmiddle tdinputlogin">
<!-- <span class="span-icon-user">--> <!-- <span class="span-icon-user">-->
<span class="fa fa-user"> <span class="fa fa-user">
<input type="text" placeholder="<?php echo $langs->trans("Login"); ?>" <?php echo $disabled; ?> id="username" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($username); ?>" tabindex="1" /> <input type="text" placeholder="<?php echo $langs->trans("Login"); ?>" <?php echo $disabled; ?> id="username" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($username); ?>" tabindex="1" />
</span> </span>
</td> </div>
</tr> </div>
<?php <?php
if (! empty($morelogincontent)) { if (! empty($morelogincontent)) {
@ -134,10 +134,11 @@ if (! empty($morelogincontent)) {
else $php_self.='?time='.dol_print_date(dol_now(),'dayhourlog'); else $php_self.='?time='.dol_print_date(dol_now(),'dayhourlog');
?> ?>
<!-- Captcha --> <!-- Captcha -->
<tr> <div class="trinputlogin">
<td class="tdtop nowrap none center"> <div class="tdinputlogin nowrap none center valignmiddle tdinputlogin">
<table class="login_table_securitycode centpercent"><tr class="valignmiddle"> <table class="login_table_securitycode centpercent">
<tr class="valignmiddle">
<td> <td>
<!-- <span class="span-icon-security"> --> <!-- <span class="span-icon-security"> -->
<span class="nofa"> <span class="nofa">
@ -148,7 +149,7 @@ if (! empty($morelogincontent)) {
<td><a href="<?php echo $php_self; ?>" tabindex="4"><?php echo $captcha_refresh; ?></a></td> <td><a href="<?php echo $php_self; ?>" tabindex="4"><?php echo $captcha_refresh; ?></a></td>
</tr></table> </tr></table>
</td></tr> </div></div>
<?php } ?> <?php } ?>
</table> </table>

View File

@ -1884,16 +1884,27 @@ if (! empty($conf->global->MAIN_LOGIN_BACKGROUND)) {
} }
.login_table input#username, .login_table input#password, .login_table input#securitycode { .login_table input#username, .login_table input#password, .login_table input#securitycode {
border: none; border: none;
border-bottom: solid 1px rgba(180,180,180,.4); /* border-bottom: solid 1px rgba(180,180,180,.4); */
padding: 5px; padding: 5px;
margin-left: 5px; margin-left: 5px;
margin-top: 5px; margin-top: 5px;
margin-bottom: 5px;
} }
.login_table input#username:focus, .login_table input#password:focus, .login_table input#securitycode:focus { .login_table input#username:focus, .login_table input#password:focus, .login_table input#securitycode:focus {
outline: none !important; outline: none !important;
/* box-shadow: none; }
-webkit-box-shadow: 0 0 0 50px #FFF inset; .login_table .trinputlogin {
box-shadow: 0 0 0 50px #FFF inset;*/ margin: 8px;
}
.login_table .tdinputlogin {
background-color: #fff;
border: 2px solid #ccc;
min-width: 200px;
border-radius: 2px;
}
.login_table .tdinputlogin .fa {
padding-left: 10px;
width: 14px;
} }
.login_main_message { .login_main_message {
text-align: center; text-align: center;

View File

@ -1875,17 +1875,29 @@ form#login {
} }
.login_table input#username, .login_table input#password, .login_table input#securitycode{ .login_table input#username, .login_table input#password, .login_table input#securitycode{
border: none; border: none;
border-bottom: solid 1px rgba(180,180,180,.4); /* border-bottom: solid 1px rgba(180,180,180,.4); */
padding: 5px; padding: 5px;
margin-left: 18px; margin-left: 18px;
margin-top: 5px; margin-top: 5px;
margin-bottom: 5px;
} }
.login_table input#username:focus, .login_table input#password:focus, .login_table input#securitycode:focus { .login_table input#username:focus, .login_table input#password:focus, .login_table input#securitycode:focus {
outline: none !important; outline: none !important;
/* box-shadow: none;
-webkit-box-shadow: 0 0 0 50px #FFF inset;
box-shadow: 0 0 0 50px #FFF inset;*/
} }
.login_table .trinputlogin {
margin: 8px;
}
.login_table .tdinputlogin {
background-color: #fff;
border: 2px solid #ccc;
min-width: 200px;
border-radius: 2px;
}
.login_table .tdinputlogin .fa {
padding-left: 10px;
width: 14px;
}
.login_main_message { .login_main_message {
text-align: center; text-align: center;
max-width: 570px; max-width: 570px;