From 1400d0dd932cf9f73eab4e53a6375b2b1428e85b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 28 Dec 2025 19:59:23 +0100 Subject: [PATCH] Debug v23 --- htdocs/core/tpl/login.tpl.php | 19 +++++++++++++------ htdocs/core/tpl/passwordforgotten.tpl.php | 2 +- htdocs/core/tpl/passwordreset.tpl.php | 2 +- htdocs/theme/eldy/global.inc.php | 1 + htdocs/theme/md/style.css.php | 1 + 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index f1648667642..af33c58c7b5 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -52,6 +52,8 @@ if (!defined('NOBROWSERNOTIF')) { * @var string $titletruedolibarrversion * @var string $urllogo * @var int<0,1> $forgetpasslink + * @var string $morelogincontent + * @var string $moreloginextracontent */ // Protection to avoid direct call of template if (empty($conf) || !is_object($conf)) { @@ -301,7 +303,7 @@ if ($disablenofollow) { } ?> -" name="username" class="flat input-icon-user minwidth150 input-nobottom" value="" tabindex="1" autofocus="autofocus" autocapitalize="off" autocomplete="on" spellcheck="false" autocorrect="off" /> +" name="username" class="flat input-icon-user minwidth150 input-nobottom" value="" tabindex="1" autofocus="autofocus" autocapitalize="off" autocomplete="on" spellcheck="false" /> @@ -396,7 +398,7 @@ if (!empty($morelogincontent)) { file->main_authentication) || $conf->file->main_authentication != 'googleoauth') { ?>
- +
@@ -450,22 +452,27 @@ if (getDolGlobalInt('MAIN_AUTHENTICATION_OIDC_ON', 0) > 0 && isset($conf->file-> $langs->load("users"); print '
'; - print '
'; if (!getDolGlobalString("MAIN_AUTHENTICATION_OPENID_URL")) { $url = openid_connect_get_url(); } else { $url = getDolGlobalString('MAIN_AUTHENTICATION_OPENID_URL').'&state=' . openid_connect_get_state(); } + if (!empty($url)) { - print ''.$langs->trans("LoginUsingOpenID").''; + print ''; + print '
'; + print $langs->trans("LoginUsingOpenID"); + print '
'; + print '
'; } else { $langs->load("errors"); + print '
'; print ''.$langs->trans("ErrorOpenIDSetupNotComplete", 'MAIN_AUTHENTICATION_OPENID_URL').''; + print '
'; } print '
'; - print '
'; } if (isset($conf->file->main_authentication) && preg_match('/google/', $conf->file->main_authentication) && strpos($conf->browser->ua, 'DoliDroid') === false) { @@ -605,7 +612,7 @@ if (!empty($morelogincontent) && is_array($morelogincontent)) { // Can add extra content $parameters = array(); $dummyobject = new stdClass(); -$result = $hookmanager->executeHooks('getLoginPageExtraContent', $parameters, $dummyobject, $action); +$hookmanager->executeHooks('getLoginPageExtraContent', $parameters, $dummyobject, $action); print $hookmanager->resPrint; ?> diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php index 01bb34a5759..3c8951a34db 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl.php +++ b/htdocs/core/tpl/passwordforgotten.tpl.php @@ -262,7 +262,7 @@ if (!empty($morelogincontent)) {
-
class="button small" id="button_password" name="button_password" value="trans('SendNewPassword'); ?>" tabindex="4" /> +
class="butAction butActionlogin small" id="button_password" name="button_password" value="trans('SendNewPassword'); ?>" tabindex="4" />
diff --git a/htdocs/core/tpl/passwordreset.tpl.php b/htdocs/core/tpl/passwordreset.tpl.php index 63b80a8d77a..b581a993670 100644 --- a/htdocs/core/tpl/passwordreset.tpl.php +++ b/htdocs/core/tpl/passwordreset.tpl.php @@ -308,7 +308,7 @@ if (!empty($morelogincontent)) {
-
class="button small" name="button_password" value="trans('Save'); ?>" tabindex="4" /> +
class="butAction butActionLogin small" name="button_password" value="trans('Save'); ?>" tabindex="4" />
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 57ddd6bdd15..bb3e2be89a8 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -3600,6 +3600,7 @@ table.login_table_securitycode tr td { #img_logo, .img_logo { max-width: 160px; max-height: 90px; + border-radius: 4px; } div.backgroundsemitransparent { diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index f23fdb34a24..362e9ab8262 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -3676,6 +3676,7 @@ table.login_table_securitycode tr td { #img_logo, .img_logo { max-width: 160px; max-height: 90px; + border-radius: 4px; } .loginbuttonexternal { width: 300px;