lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Philippe GRAND 2014-12-16 13:57:16 +01:00
commit 97b58e57df
3 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/core/tpl/login.tpl.php
View File

@ -89,17 +89,17 @@ $(document).ready(function () {
<table class="left centpercent" summary="Login pass"> <table class="left centpercent" summary="Login pass">
<!-- Login --> <!-- Login -->
<tr> <tr>
<td valign="middle" class="nowrap"> <td valign="middle" class="nowrap center">
<span class="span-icon-user"> <span class="span-icon-user">
<input type="text" id="username" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user" size="15" 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>
</tr> </tr>
<!-- Password --> <!-- Password -->
<tr> <tr>
<td valign="middle" class="nowrap"> <td valign="middle" class="nowrap center">
<span class="span-icon-password"> <span class="span-icon-password">
<input id="password" placeholder="<?php echo $langs->trans("Password"); ?>" name="password" class="flat input-icon-password" type="password" size="15" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="off" /> <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="off" />
</span> </span>
</td></tr> </td></tr>
<?php <?php
@ -115,20 +115,24 @@ if (! empty($hookmanager->resArray['options'])) {
?> ?>
<?php <?php
if ($captcha) { if ($captcha) {
// TODO: provide accessible captha variants // Add a variable param to force not using cache (jmobile)
$php_self = preg_replace('/[&\?]time=(\d+)/','',$php_self); // Remove param time
if (preg_match('/\?/',$php_self)) $php_self.='&time='.dol_print_date(dol_now(),'dayhourlog');
else $php_self.='?time='.dol_print_date(dol_now(),'dayhourlog');
// TODO: provide accessible captcha variants
?> ?>
<!-- Captcha --> <!-- Captcha -->
<tr> <tr>
<td valign="top" class="nowrap none" align="left"> <td valign="top" class="nowrap none center">
<table class="login_table_securitycode" style="width: 100px;"><tr> <table class="login_table_securitycode"><tr>
<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" 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>
<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"><?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></table>
</td></tr> </td></tr>
@ -158,7 +162,7 @@ if ($forgetpasslink || $helpcenterlink)
if ($dol_use_jmobile) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$dol_use_jmobile; if ($dol_use_jmobile) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$dol_use_jmobile;
echo '<br>'; echo '<br>';
echo '<div align="center" style="margin-top: 4px;">'; echo '<div align="center" style="margin-top: 8px;">';
if ($forgetpasslink) { if ($forgetpasslink) {
echo '<a class="alogin" href="'.DOL_URL_ROOT.'/user/passwordforgotten.php'.$moreparam.'">('; echo '<a class="alogin" href="'.DOL_URL_ROOT.'/user/passwordforgotten.php'.$moreparam.'">(';
echo $langs->trans('PasswordForgotten'); echo $langs->trans('PasswordForgotten');

21
htdocs/core/tpl/passwordforgotten.tpl.php
View File

@ -71,13 +71,13 @@ $(document).ready(function () {
<div id="login_right"> <div id="login_right">
<table class="left" summary="Login pass"> <table summary="Login pass" class="centpercent">
<!-- Login --> <!-- Login -->
<tr> <tr>
<td valign="bottom" class="nowrap"> <td valign="bottom" class="nowrap center">
<span class="span-icon-user"> <span class="span-icon-user">
<input type="text" placeholder="<?php echo $langs->trans("Login"); ?>" <?php echo $disabled; ?> id="username" name="username" class="flat input-icon-user" size="15" value="<?php echo dol_escape_htmltag($login); ?>" 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($login); ?>" tabindex="1" />
</span> </span>
</td> </td>
</tr> </tr>
@ -94,19 +94,24 @@ if (! empty($hookmanager->resArray['options'])) {
} }
?> ?>
<?php if ($captcha) { ?> <?php if ($captcha) {
// Add a variable param to force not using cache (jmobile)
$php_self = preg_replace('/[&\?]time=(\d+)/','',$php_self); // Remove param time
if (preg_match('/\?/',$php_self)) $php_self.='&time='.dol_print_date(dol_now(),'dayhourlog');
else $php_self.='?time='.dol_print_date(dol_now(),'dayhourlog');
?>
<!-- Captcha --> <!-- Captcha -->
<tr> <tr>
<td valign="top" class="nowrap none" align="left"> <td valign="top" class="nowrap none center">
<table class="login_table_securitycode" style="width: 100px;"><tr> <table class="login_table_securitycode centpercent"><tr>
<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" 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>
<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"><?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></table>
</td></tr> </td></tr>
@ -127,7 +132,7 @@ if (! empty($hookmanager->resArray['options'])) {
<br><input id="password" type="submit" <?php echo $disabled; ?> class="button" name="password" value="<?php echo $langs->trans('SendNewPassword'); ?>" tabindex="4" /> <br><input id="password" type="submit" <?php echo $disabled; ?> class="button" name="password" value="<?php echo $langs->trans('SendNewPassword'); ?>" tabindex="4" />
<br> <br>
<div align="center" style="margin-top: 4px;"> <div align="center" style="margin-top: 8px;">
<?php <?php
$moreparam=''; $moreparam='';
if (! empty($conf->dol_hide_topmenu)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_topmenu='.$conf->dol_hide_topmenu; if (! empty($conf->dol_hide_topmenu)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;

7
htdocs/theme/eldy/style.css.php
View File

@ -854,7 +854,7 @@ form#login {
vertical-align: middle; vertical-align: middle;
} }
.login_table_title { .login_table_title {
max-width: 560px; max-width: 530px;
color: #888888; color: #888888;
text-shadow: 1px 1px 1px #FFF; text-shadow: 1px 1px 1px #FFF;
} }
@ -866,7 +866,7 @@ form#login {
margin-right: 10px; margin-right: 10px;
padding-left:6px; padding-left:6px;
padding-right:6px; padding-right:6px;
padding-top:12px; padding-top:16px;
padding-bottom:12px; padding-bottom:12px;
max-width: 560px; max-width: 560px;
@ -978,10 +978,11 @@ img.login, img.printer, img.entity {
background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/lock.png',1); ?>); background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/lock.png',1); ?>);
background-repeat: no-repeat; background-repeat: no-repeat;
} }
/*
.span-icon-user input, .span-icon-password input { .span-icon-user input, .span-icon-password input {
margin-right: 30px; margin-right: 30px;
width: 98%;
} }
*/
/* ============================================================================== */ /* ============================================================================== */
/* Menu gauche */ /* Menu gauche */