diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index 61d398b1b48..a8455abcb31 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -34,6 +34,23 @@ print ' print ''."\n"; if (constant('JS_JQUERY_UI')) print ''."\n"; // JQuery else print ''."\n"; // JQuery +// CSS forced by modules (relative url starting with /) +if (isset($conf->modules_parts['css'])) +{ + $arraycss=(array) $conf->modules_parts['css']; + foreach($arraycss as $modcss => $filescss) + { + $filescss=(array) $filescss; // To be sure filecss is an array + foreach($filescss as $cssfile) + { + // cssfile is a relative path + print ''."\n"; + } + } +} // JQuery. Must be before other includes $ext='.js'; if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) $ext='.jgz'; @@ -98,10 +115,12 @@ $(document).ready(function () { resArray['options'])) { - foreach ($hookmanager->resArray['options'] as $option) + foreach ($hookmanager->resArray['options'] as $format => $option) { - echo ''; - echo $option; + if ($format == 'table') { + echo ''; + echo $option; + } } } ?> diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php index d1a8ae622f1..e786e4ce69a 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl.php +++ b/htdocs/core/tpl/passwordforgotten.tpl.php @@ -34,6 +34,23 @@ print ' print ''."\n"; if (constant('JS_JQUERY_UI')) print ''."\n"; // JQuery else print ''."\n"; // JQuery +// CSS forced by modules (relative url starting with /) +if (isset($conf->modules_parts['css'])) +{ + $arraycss=(array) $conf->modules_parts['css']; + foreach($arraycss as $modcss => $filescss) + { + $filescss=(array) $filescss; // To be sure filecss is an array + foreach($filescss as $cssfile) + { + // cssfile is a relative path + print ''."\n"; + } + } +} // JQuery. Must be before other includes $ext='.js'; if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) $ext='.jgz'; @@ -72,10 +89,12 @@ print ' resArray['options'])) { - foreach ($hookmanager->resArray['options'] as $option) + foreach ($hookmanager->resArray['options'] as $format => $option) { - echo ''; - echo $option; + if ($format == 'table') { + echo ''; + echo $option; + } } } ?> diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index bba333bf69e..475428486d2 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -35,6 +35,7 @@ if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1); if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); +session_cache_limiter(FALSE); require_once '../../main.inc.php'; diff --git a/htdocs/theme/bureau2crea/tpl/login.tpl.php b/htdocs/theme/bureau2crea/tpl/login.tpl.php index 2fd9af9b9d7..67c96b12da7 100644 --- a/htdocs/theme/bureau2crea/tpl/login.tpl.php +++ b/htdocs/theme/bureau2crea/tpl/login.tpl.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2009-2012 Regis Houssin * * 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 @@ -33,6 +33,23 @@ print ' print ''."\n"; if (constant('JS_JQUERY_UI')) print ''."\n"; // JQuery else print ''."\n"; // JQuery +// CSS forced by modules (relative url starting with /) +if (isset($conf->modules_parts['css'])) +{ + $arraycss=(array) $conf->modules_parts['css']; + foreach($arraycss as $modcss => $filescss) + { + $filescss=(array) $filescss; // To be sure filecss is an array + foreach($filescss as $cssfile) + { + // cssfile is a relative path + print ''."\n"; + } + } +} // JQuery. Must be before other includes $ext='.js'; if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) $ext='.jgz'; @@ -97,10 +114,12 @@ $(document).ready(function () { resArray['options'])) { - foreach ($hookmanager->resArray['options'] as $option) + foreach ($hookmanager->resArray['options'] as $format => $option) { - echo ''; - echo $option; + if ($format == 'div') { + echo ''; + echo $option; + } } } ?> diff --git a/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php b/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php index 956263634e4..f4aae42360a 100644 --- a/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php +++ b/htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php @@ -34,6 +34,23 @@ print ' print ''."\n"; if (constant('JS_JQUERY_UI')) print ''."\n"; // JQuery else print ''."\n"; // JQuery +// CSS forced by modules (relative url starting with /) +if (isset($conf->modules_parts['css'])) +{ + $arraycss=(array) $conf->modules_parts['css']; + foreach($arraycss as $modcss => $filescss) + { + $filescss=(array) $filescss; // To be sure filecss is an array + foreach($filescss as $cssfile) + { + // cssfile is a relative path + print ''."\n"; + } + } +} // JQuery. Must be before other includes $ext='.js'; if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) $ext='.jgz'; @@ -59,14 +76,19 @@ print '
-
id="username" name="username" class="flat" size="15" maxlength="25" value="" tabindex="1" />
+
+ + id="username" name="username" class="flat" size="15" maxlength="25" value="" tabindex="1" /> +
resArray['options'])) { - foreach ($hookmanager->resArray['options'] as $option) + foreach ($hookmanager->resArray['options'] as $format => $option) { - echo ''; - echo $option; + if ($format == 'div') { + echo ''; + echo $option; + } } } ?> diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index b1de66d6a96..4c4f2a225b8 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -176,6 +176,9 @@ else $conf->css = "/theme/".$conf->theme."/style.css.php?lang=".$langs->defaultlang; $conf_css = DOL_URL_ROOT.$conf->css; +$jquerytheme = 'smoothness'; +if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME; + if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/login_background.png')) { $login_background = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/login_background.png'; @@ -199,25 +202,27 @@ $rowspan=2; $urllogo=DOL_URL_ROOT.'/theme/login_logo.png'; if (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) { - $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=companylogo&file='.urlencode('thumbs/'.$mysoc->logo_small); + $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=companylogo&file='.urlencode('thumbs/'.$mysoc->logo_small); } elseif (! empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) { - $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=companylogo&file='.urlencode($mysoc->logo); - $width=128; -}elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png')) - { - $urllogo=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png'; -}elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png')) - { - $urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png'; + $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=companylogo&file='.urlencode($mysoc->logo); + $width=128; +} +elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png')) +{ + $urllogo=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.png'; +} +elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png')) +{ + $urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png'; } // Security graphical code if (function_exists("imagecreatefrompng") && ! $disabled) { - $captcha = 1; - $captcha_refresh = img_picto($langs->trans("Refresh"),'refresh','id="captcha_refresh_img"'); + $captcha = 1; + $captcha_refresh = img_picto($langs->trans("Refresh"),'refresh','id="captcha_refresh_img"'); } // Execute hook getPasswordForgottenPageOptions