This commit is contained in:
Laurent Destailleur 2018-01-23 09:00:03 +01:00
parent c969d58907
commit f1b63d7cbf
5 changed files with 12 additions and 15 deletions

View File

@ -119,7 +119,8 @@ if ($disablenofollow) echo '</a>';
<tr> <tr>
<td class="nowrap center valignmiddle"> <td class="nowrap center valignmiddle">
<?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">
<input type="text" id="username" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user" size="20" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" /> <input type="text" id="username" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user" size="20" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" />
</span> </span>
</td> </td>
@ -128,7 +129,8 @@ if ($disablenofollow) echo '</a>';
<tr> <tr>
<td class="nowrap center valignmiddle"> <td class="nowrap center valignmiddle">
<?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">
<input id="password" placeholder="<?php echo $langs->trans("Password"); ?>" name="password" class="flat input-icon-password" type="password" size="20" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="<?php echo empty($conf->global->MAIN_LOGIN_ENABLE_PASSWORD_AUTOCOMPLETE)?'off':'on'; ?>" /> <input id="password" placeholder="<?php echo $langs->trans("Password"); ?>" name="password" class="flat input-icon-password" type="password" size="20" 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> </td></tr>

View File

@ -82,6 +82,8 @@ if ($disablenofollow) echo '</a>';
<img alt="Logo" title="" src="<?php echo $urllogo; ?>" id="img_logo" /> <img alt="Logo" title="" src="<?php echo $urllogo; ?>" id="img_logo" />
</div> </div>
<br>
<div id="login_right"> <div id="login_right">
<table summary="Login pass" class="centpercent"> <table summary="Login pass" class="centpercent">
@ -89,7 +91,8 @@ if ($disablenofollow) echo '</a>';
<!-- Login --> <!-- Login -->
<tr> <tr>
<td valign="bottom" class="nowrap center"> <td valign="bottom" class="nowrap center">
<span class="span-icon-user"> <!-- <span class="span-icon-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" size="20" 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" size="20" value="<?php echo dol_escape_htmltag($username); ?>" tabindex="1" />
</span> </span>
</td> </td>
@ -125,7 +128,8 @@ if (! empty($morelogincontent)) {
<table class="login_table_securitycode centpercent"><tr> <table class="login_table_securitycode centpercent"><tr>
<td> <td>
<span class="span-icon-security"> <!-- <span class="span-icon-security"> -->
<span class="nofa">
<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security" type="text" size="12" maxlength="5" name="code" tabindex="3" /> <input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security" type="text" size="12" maxlength="5" name="code" tabindex="3" />
</span> </span>
</td> </td>
@ -146,7 +150,7 @@ if (! empty($morelogincontent)) {
<div id="login_line2" style="clear: both"> <div id="login_line2" style="clear: both">
<!-- Button "Regenerate and Send password" --> <!-- Button "Regenerate and Send password" -->
<br><input type="submit" <?php echo $disabled; ?> class="button" name="password" value="<?php echo $langs->trans('SendNewPassword'); ?>" tabindex="4" /> <br><input type="submit" <?php echo $disabled; ?> class="button" name="button_password" value="<?php echo $langs->trans('SendNewPassword'); ?>" tabindex="4" />
<br> <br>
<div align="center" style="margin-top: 8px;"> <div align="center" style="margin-top: 8px;">

View File

@ -1731,7 +1731,6 @@ form#login {
max-width: 530px; max-width: 530px;
color: #aaa !important; color: #aaa !important;
padding-bottom: 20px; padding-bottom: 20px;
/* text-shadow: 1px 1px 1px #FFF; */
} }
.login_table label { .login_table label {
text-shadow: 1px 1px 1px #FFF; text-shadow: 1px 1px 1px #FFF;
@ -1759,7 +1758,7 @@ form#login {
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: 5px;
margin-top: 5px; margin-top: 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 {
@ -2982,9 +2981,6 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
.thumbstat150 { .thumbstat150 {
flex: 1 1 110px; flex: 1 1 110px;
} }
.boxstats, .boxstats130 {
width: 90px;
}
.dashboardlineindicator { .dashboardlineindicator {
float: left; float: left;
padding-left: 5px; padding-left: 5px;

View File

@ -3053,9 +3053,6 @@ div .tdtop {
.thumbstat150 { .thumbstat150 {
flex: 1 1 110px; flex: 1 1 110px;
} }
.boxstats, .boxstats130 {
width: 90px;
}
.dashboardlineindicator { .dashboardlineindicator {
float: left; float: left;
padding-left: 5px; padding-left: 5px;

View File

@ -133,12 +133,10 @@ if ($action == 'buildnewpassword' && $username)
{ {
$message = '<div class="ok">'.$langs->trans("PasswordChangeRequestSent",$edituser->login,dolObfuscateEmail($edituser->email)).'</div>'; $message = '<div class="ok">'.$langs->trans("PasswordChangeRequestSent",$edituser->login,dolObfuscateEmail($edituser->email)).'</div>';
//$message.=$newpassword;
$username=''; $username='';
} }
else else
{ {
//$message = '<div class="ok">'.$langs->trans("PasswordChangedTo",$newpassword).'</div>';
$message.= '<div class="error">'.$edituser->error.'</div>'; $message.= '<div class="error">'.$edituser->error.'</div>';
} }
} }