diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php index 4fa799bb8c3..bd1b2e821c4 100644 --- a/htdocs/core/lib/security2.lib.php +++ b/htdocs/core/lib/security2.lib.php @@ -293,7 +293,7 @@ function dol_loginfunction($langs,$conf,$mysoc) if (function_exists("imagecreatefrompng") && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) { $captcha=1; - $captcha_refresh=img_picto($langs->trans("Refresh"),'refresh'); + $captcha_refresh=img_picto($langs->trans("Refresh"),'refresh','id="captcha_refresh_img"'); } // Extra link diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index f67bb97d284..85f5bff41f4 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -293,7 +293,7 @@ div.tmenu { white-space: nowrap; border-left: 0px; padding: 0px; - margin: 10px 0px 10px 0px; + margin: 5px 0px 10px 0px; font-size: 13px; background-image : url(); height: 22px; @@ -527,7 +527,7 @@ li.tmenu a.tmenudisabled { div.login_block { position: absolute; : 5px; - top: 6px; + top: 2px; font-weight: bold; display: none; @@ -1372,13 +1372,12 @@ tr.liste_titre { white-space: nowrap; } -tr.liste_titre:first-child { +tr.liste_titre { background-image: url(); background-position: top right; } -th.liste_titre_sel, td.liste_titre_sel, -tr.liste_titre:first-child td { +th.liste_titre_sel, td.liste_titre_sel, th.liste_titre { color: #FFFFFF !important; } @@ -2199,6 +2198,7 @@ div#logoBox { width: 100%; height: auto; margin-top: 30px; + text-align: center; } div#parameterBox { @@ -2258,6 +2258,10 @@ img#captcha { margin-left: 200px; } +#captcha_refresh_img { + margin-bottom: 6px; +} + div#infoLogin { width: 100%; height: auto; diff --git a/htdocs/theme/bureau2crea/tpl/login.tpl.php b/htdocs/theme/bureau2crea/tpl/login.tpl.php index d3e7119cda6..cb830ef1cf4 100644 --- a/htdocs/theme/bureau2crea/tpl/login.tpl.php +++ b/htdocs/theme/bureau2crea/tpl/login.tpl.php @@ -18,27 +18,44 @@ header('Cache-Control: Public, must-revalidate'); header("Content-type: text/html; charset=".$conf->file->character_set_client); + ?> - - - - - - - + - - - + + -<?php echo $langs->trans('Login'); ?> - - - -global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER; ?> - - + + +'.$langs->trans('Login').' '.$title.''."\n"; +print ''."\n"; +if (constant('JS_JQUERY_UI')) print ''."\n"; // JQuery +else print ''."\n"; // JQuery +// JQuery. Must be before other includes +print ''."\n"; +if (constant('JS_JQUERY')) print ''."\n"; +else print ''."\n"; +print ' +'."\n"; +if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER; +print ' +'; + +?> @@ -287,7 +304,7 @@ jQuery(document).ready(function () { -global->MAIN_HTML_FOOTER; ?> +global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER; ?> diff --git a/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php b/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php index c1391ece604..2733d1793d2 100644 --- a/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php +++ b/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php @@ -1,5 +1,6 @@ + * Copyright (C) 2011-2012 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,29 +18,47 @@ */ header('Cache-Control: Public, must-revalidate'); header("Content-type: text/html; charset=".$conf->file->character_set_client); + ?> - - + - - - -Dolibarr Authentification - - - -'."\n"; +else print ''."\n"; +print ' +'."\n"; +if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER; +print ' +'; - +?> - +
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index 783a2d24923..86b263807bd 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -235,7 +235,7 @@ if (! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_ if (function_exists("imagecreatefrompng") && ! $disabled) { $captcha = 1; - $captcha_refresh = img_picto($langs->trans("Refresh"),'refresh'); + $captcha_refresh = img_picto($langs->trans("Refresh"),'refresh','id="captcha_refresh_img"'); } include($template_dir.'passwordforgotten.tpl.php'); // To use native PHP