Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

FIX #11931 #11963

Browse Source
This commit is contained in:
Laurent Destailleur
2019-09-27 11:51:34 +02:00
parent 6c3d191727
commit f96c9c3bb5
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/index.php
View File

@@ -43,7 +43,7 @@ $wikihelp='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones'
llxHeader('', $langs->trans("Setup"), $wikihelp); llxHeader('', $langs->trans("Setup"), $wikihelp);
print load_fiche_titre($langs->trans("SetupArea"), '', 'tools_title'); print load_fiche_titre($langs->trans("SetupArea"), '', 'tools');
if (! empty($conf->global->MAIN_MOTD_SETUPPAGE)) if (! empty($conf->global->MAIN_MOTD_SETUPPAGE))

6
htdocs/core/lib/functions.lib.php
View File

@@ -3015,7 +3015,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
//if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on'))) //if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))
if (empty($srconly) && in_array($pictowithoutext, array( if (empty($srconly) && in_array($pictowithoutext, array(
'bank', 'close_title', 'delete', 'edit', 'ellipsis-h', 'filter', 'grip', 'grip_title', 'list', 'listlight', 'note', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize', 'bank', 'close_title', 'delete', 'edit', 'ellipsis-h', 'filter', 'grip', 'grip_title', 'list', 'listlight', 'note', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize',
'note', 'setup', 'tools_title', 'sign-out', 'split', 'switch_off', 'switch_on', 'unlink', 'uparrow', '1downarrow', '1uparrow', '1leftarrow', '1rightarrow', 'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', '1downarrow', '1uparrow', '1leftarrow', '1rightarrow',
'jabber','skype','twitter','facebook','linkedin', 'jabber','skype','twitter','facebook','linkedin',
'chevron-left','chevron-right','chevron-down','chevron-top' 'chevron-left','chevron-right','chevron-down','chevron-top'
) )
@@ -3029,10 +3029,6 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$fakey = 'fa-cog'; $fakey = 'fa-cog';
$fasize = '1.4em'; $fasize = '1.4em';
} }
elseif ($pictowithoutext == 'tools_title') {
$fakey = 'fa-tools';
$fasize = '2.4em';
}
elseif ($pictowithoutext == 'switch_off') { elseif ($pictowithoutext == 'switch_off') {
$fakey = 'fa-toggle-off'; $fakey = 'fa-toggle-off';
$facolor = '#999'; $facolor = '#999';

2
htdocs/theme/eldy/global.inc.php
View File

@@ -3500,7 +3500,7 @@ div.boximport {
.fieldrequired { font-weight: bold; color: #000055; } .fieldrequired { font-weight: bold; color: #000055; }
.widthpictotitle { width: 40px; text-align: <?php echo $left; ?>; } .widthpictotitle { width: 40px; font-size: 1.5em; text-align: <?php echo $left; ?>; }
.dolgraphtitle { margin-top: 6px; margin-bottom: 4px; } .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; }
.dolgraphtitlecssboxes { /* margin: 0px; */ } .dolgraphtitlecssboxes { /* margin: 0px; */ }

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

@@ -3536,7 +3536,7 @@ div.boximport {
.fieldrequired { font-weight: bold; color: #000055; } .fieldrequired { font-weight: bold; color: #000055; }
.widthpictotitle { width: 40px; text-align: <?php echo $left; ?>; } .widthpictotitle { width: 40px; font-size: 1.4em; text-align: <?php echo $left; ?>; }
.dolgraphtitle { margin-top: 6px; margin-bottom: 4px; } .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; }
.dolgraphtitlecssboxes { /* margin: 0px; */ } .dolgraphtitlecssboxes { /* margin: 0px; */ }