diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index d8fb296860e..51d4f737899 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -76,7 +76,9 @@ if (isset($conf->modules_parts['css'])) } } } -print ''."\n"; +if (! empty($conf_css)) print ''."\n"; + +// JQuery. Must be before other js includes $ext='.js'; print ''."\n"; if (constant('JS_JQUERY')) print ''."\n"; @@ -159,7 +161,7 @@ if (! empty($hookmanager->resArray['options'])) { ?> -   trans('SecurityCode'); ?> + trans('SecurityCode'); ?> diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php index c349ac5b125..6ff14bb21f7 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl.php +++ b/htdocs/core/tpl/passwordforgotten.tpl.php @@ -31,9 +31,34 @@ print ''.$langs->trans('Login').' '.$title.''."\n"; -print ''."\n"; +print ''."\n"; +$jquerytheme = 'smoothness'; +if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME; if (constant('JS_JQUERY_UI')) print ''."\n"; // JQuery else print ''."\n"; // JQuery +print ''."\n"; // Tooltip +print ''."\n"; // JNotify +// jQuery jMobile +if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || GETPOST('dol_use_jmobile')) +{ + print ''."\n"; +} +print ''."\n"; +// Includes CSS for Dolibarr theme +$themepath=dol_buildpath((empty($conf->global->MAIN_FORCETHEMEDIR)?'':$conf->global->MAIN_FORCETHEMEDIR).$conf->css,1); +$themesubdir=''; +if (! empty($conf->modules_parts['theme'])) // This slow down +{ + foreach($conf->modules_parts['theme'] as $reldir) + { + if (file_exists(dol_buildpath($reldir.$conf->css, 0))) + { + $themepath=dol_buildpath($reldir.$conf->css, 1); + $themesubdir=$reldir; + break; + } + } +} // CSS forced by modules (relative url starting with /) if (isset($conf->modules_parts['css'])) { @@ -51,13 +76,19 @@ if (isset($conf->modules_parts['css'])) } } } -// JQuery. Must be before other includes +if (! empty($conf_css)) print ''."\n"; + +// JQuery. Must be before other js includes $ext='.js'; print ''."\n"; if (constant('JS_JQUERY')) print ''."\n"; else print ''."\n"; print ''."\n"; -print ''."\n"; +// jQuery jMobile +if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || GETPOST('dol_use_jmobile')) +{ + print ''."\n"; +} if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER; print ''; @@ -95,7 +126,7 @@ $(document).ready(function () { - + @@ -115,7 +146,7 @@ if (! empty($hookmanager->resArray['options'])) { - +
    id="username" name="username" class="flat" size="15" maxlength="40" value="" tabindex="1" />
  trans('SecurityCode'); ?>
trans('SecurityCode'); ?> @@ -145,9 +176,15 @@ if (! empty($hookmanager->resArray['options'])) {
- - trans('BackToLoginPage').')'; ?> - + dol_hide_topmenu)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_topmenu='.$conf->dol_hide_topmenu; + if (! empty($conf->dol_hide_leftmenu)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_hide_leftmenu='.$conf->dol_hide_leftmenu; + if (! empty($conf->dol_no_mouse_hover)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_no_mouse_hover='.$conf->dol_no_mouse_hover; + if (! empty($conf->dol_use_jmobile)) $moreparam.=(strpos($moreparam,'?')===false?'?':'&').'dol_use_jmobile='.$conf->dol_use_jmobile; + + print '('.$langs->trans('BackToLoginPage').')'; + ?>
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index f2e00ef7c7e..112f38caded 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -55,6 +55,13 @@ $conf->entity = (GETPOST('entity') ? GETPOST('entity') : 1); $hookmanager->initHooks(array('passwordforgottenpage')); +if (GETPOST('dol_hide_leftmenu') || ! empty($_SESSION['dol_hide_leftmenu'])) $conf->dol_hide_leftmenu=1; +if (GETPOST('dol_hide_topmenu') || ! empty($_SESSION['dol_hide_topmenu'])) $conf->dol_hide_topmenu=1; +if (GETPOST('dol_optimize_smallscreen') || ! empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen=1; +if (GETPOST('dol_no_mouse_hover') || ! empty($_SESSION['dol_no_mouse_hover'])) $conf->dol_no_mouse_hover=1; +if (GETPOST('dol_use_jmobile') || ! empty($_SESSION['dol_use_jmobile'])) $conf->dol_use_jmobile=1; + + /** * Actions */