Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/7.0' into 7.0

Browse Source
This commit is contained in:
Juanjo Menent 2019-01-05 13:05:50 +01:00
commit 7908550937
4 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/actions_massactions.inc.php
View File

@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2015-2017 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2018 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2019 Ferran Marcet <fmarcet@2byte.es>
*
* 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
@ -680,6 +681,7 @@ if ($massaction == 'confirm_createbills')
}
$id = $objecttmp->id; // For builddoc action
$object = $objecttmp;
// Builddoc
$donotredirect = 1;

1
htdocs/core/lib/ajax.lib.php
View File

@ -400,6 +400,7 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $
if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return '';
if (empty($conf->use_javascript_ajax)) return '';
if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && ! defined('REQUIRE_JQUERY_MULTISELECT')) return '';
if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) return '';
if (empty($minLengthToAutocomplete)) $minLengthToAutocomplete=0;

40
htdocs/core/lib/usergroups.lib.php
View File

@ -458,6 +458,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
print '</td>';
print '</tr>';
}
// Background color THEME_ELDY_BACKBODY
@ -503,6 +504,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
print ' &nbsp; ('.$langs->trans("Default").': <strong>ffffff</strong>) ';
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
print '</td>';
print '</tr>';
}
// TopMenuBackgroundColor
@ -550,6 +552,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
print '</td>';
print '</tr>';
}
// LeftMenuBackgroundColor
@ -597,6 +600,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
print '</td>';
print '</tr>';
}
// TextTitleColor
@ -678,6 +682,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
print '</td>';
print '</tr>';
}
// BackgroundTableLineEvenColor
@ -706,6 +711,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
print ' &nbsp; ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
print '</td>';
print '</tr>';
}
// Text LinkColor
@ -755,6 +761,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
print ' &nbsp; ('.$langs->trans("Default").': <strong><span style="color: #000078">000078</span></strong>) ';
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
print '</td>';
print '</tr>';
}
// Use Hover
@ -801,5 +808,38 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
print '</tr>';
}
// Use MAIN_OPTIMIZEFORTEXTBROWSER
if ($foruserprofile)
{
$default=$langs->trans('No');
print '<tr class="oddeven">';
print '<td>'.$langs->trans("MAIN_OPTIMIZEFORTEXTBROWSER").'</td>';
print '<td colspan="'.($colspan-1).'">';
if ($edit)
{
print $form->selectyesno('MAIN_OPTIMIZEFORTEXTBROWSER', $fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER, 1);
}
else
{
if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
{
print yn($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER);
}
else
{
print yn(1);
if (empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) print ' ('.$langs->trans("ForcedByGlobalSetup").')';
}
}
print ' &nbsp; ('.$langs->trans("Default").': <strong>'.yn(0).'</strong>) ';
print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORTEXTBROWSERDesc"));
print '</td>';
print '</tr>';
}
else
{
// TODO
}
print '</table>';
}

6
htdocs/user/param_ihm.php
View File

@ -142,6 +142,12 @@ if (empty($reshook)) {
$tabparam["THEME_ELDY_USE_HOVER"] = 0;
}
if (GETPOST('MAIN_OPTIMIZEFORTEXTBROWSER')) {
$tabparam["MAIN_OPTIMIZEFORTEXTBROWSER"] = 1;
} else {
$tabparam["MAIN_OPTIMIZEFORTEXTBROWSER"] = 0;
}
$result = dol_set_user_param($db, $conf, $object, $tabparam);
header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $id);