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

New: Add option dol_hide_topmenu and dol_hide_leftmenu onto login page.

Browse Source
This commit is contained in:
Laurent Destailleur 2013-02-24 18:16:26 +01:00
parent fe4ef69360
commit 234e171e9d
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -28,7 +28,8 @@ For developers:
- Renamed some database fields, code variables and parameters from french to english. - Renamed some database fields, code variables and parameters from french to english.
- First change to manage margins on contracts. - First change to manage margins on contracts.
- Add hook getFormMail. - Add hook getFormMail.
- New: Add option dol_hide_topmenu and dol_hide_leftmenu onto login page.
For translators: For translators:
- Update language files. - Update language files.

7
htdocs/core/lib/security2.lib.php
View File

@ -292,13 +292,18 @@ function dol_loginfunction($langs,$conf,$mysoc)
// Google AD // Google AD
$main_google_ad_client = ((! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))?1:0); $main_google_ad_client = ((! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))?1:0);
// Set jquery theme
$dol_loginmesg = (! empty($_SESSION["dol_loginmesg"])?$_SESSION["dol_loginmesg"]:''); $dol_loginmesg = (! empty($_SESSION["dol_loginmesg"])?$_SESSION["dol_loginmesg"]:'');
$favicon=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/favicon.ico'; $favicon=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/favicon.ico';
$jquerytheme = 'smoothness'; $jquerytheme = 'smoothness';
if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME; if (! empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
// Set dol_hide_topmenu and dol_hide_leftmenu
$dol_hide_topmenu=GETPOST('dol_hide_topmenu');
$dol_hide_leftmenu=GETPOST('dol_hide_leftmenu');
include $template_dir.'login.tpl.php'; // To use native PHP // Include login page template
include $template_dir.'login.tpl.php';
$_SESSION["dol_loginmesg"] = ''; $_SESSION["dol_loginmesg"] = '';

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

@ -89,8 +89,8 @@ $(document).ready(function () {
<input type="hidden" name="dst_second" id="dst_second" value="" /> <input type="hidden" name="dst_second" id="dst_second" value="" />
<input type="hidden" name="screenwidth" id="screenwidth" value="" /> <input type="hidden" name="screenwidth" id="screenwidth" value="" />
<input type="hidden" name="screenheight" id="screenheight" value="" /> <input type="hidden" name="screenheight" id="screenheight" value="" />
<input type="hidden" name="dol_hide_topmenu" id="dol_hide_topmenu" value="" /> <input type="hidden" name="dol_hide_topmenu" id="dol_hide_topmenu" value="<?php echo $dol_hide_topmenu; ?>" />
<input type="hidden" name="dol_hide_leftmenu" id="dol_hide_leftmenu" value="" /> <input type="hidden" name="dol_hide_leftmenu" id="dol_hide_leftmenu" value="<?php echo $dol_hide_leftmenu; ?>" />
<table class="login_table_title" summary="<?php echo dol_escape_htmltag($title); ?>" cellpadding="0" cellspacing="0" border="0" align="center"> <table class="login_table_title" summary="<?php echo dol_escape_htmltag($title); ?>" cellpadding="0" cellspacing="0" border="0" align="center">
<tr class="vmenu"><td align="center"><?php echo $title; ?></td></tr> <tr class="vmenu"><td align="center"><?php echo $title; ?></td></tr>

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

@ -188,7 +188,7 @@ print '*/'."\n";
/* ============================================================================== */ /* ============================================================================== */
body { body {
<?php if (GETPOST("optioncss") == 'print') { ?> <?php if (GETPOST("optioncss") == 'print' || ! empty($conf->browser->phone)) { ?>
background-color: #FFFFFF; background-color: #FFFFFF;
<?php } else { ?> <?php } else { ?>
background: <?php print $colorbackbody; ?>; background: <?php print $colorbackbody; ?>;