Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 17:31:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Same width for all picto of menu

Browse Source
This commit is contained in:
Laurent Destailleur
2021-02-06 11:56:27 +01:00
parent c1eba5a885
commit 3dedd81f37
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3267,7 +3267,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'group', 'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'group',
'help', 'holiday', 'help', 'holiday',
'intervention', 'label', 'language', 'link', 'list', 'listlight', 'loan', 'lot', 'intervention', 'label', 'language', 'link', 'list', 'listlight', 'loan', 'lot',
'map-marker-alt', 'member', 'money-bill-alt', 'mrp', 'note', 'next', 'margin', 'map-marker-alt', 'member', 'money-bill-alt', 'mrp', 'note', 'next',
'object_accounting', 'object_account', 'object_accountline', 'object_action', 'object_barcode', 'object_bill', 'object_billa', 'object_billd', 'object_bom', 'object_accounting', 'object_account', 'object_accountline', 'object_action', 'object_barcode', 'object_bill', 'object_billa', 'object_billd', 'object_bom',
'object_category', 'object_conversation', 'object_bookmark', 'object_bug', 'object_clock', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_folder', 'object_category', 'object_conversation', 'object_bookmark', 'object_bug', 'object_clock', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_folder',
'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser', 'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
@@ -3364,7 +3364,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$fakey = 'fa-'.$pictowithouttext; $fakey = 'fa-'.$pictowithouttext;
} }
if (in_array($pictowithouttext, array('payment', 'loan'))) { if (in_array($pictowithouttext, array('payment', 'loan'))) {
$fasize = '0.85em'; $fasize = '0.80em';
} }
// Define $marginleftonlyshort // Define $marginleftonlyshort

14
htdocs/core/modules/DolibarrModules.class.php
View File

@@ -353,15 +353,13 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/** /**
* Enables a module. * Enables a module.
* Inserts all informations into database * Inserts all informations into database.
* *
* @param array $array_sql SQL requests to be executed when enabling module * @param array $array_sql SQL requests to be executed when enabling module
* @param string $options String with options when disabling module: * @param string $options String with options when disabling module:
* - 'noboxes' = Do not insert boxes - * - 'noboxes' = Do not insert boxes
* 'newboxdefonly' = For boxes, insert def of * - 'newboxdefonly' = For boxes, insert def of boxes only and not boxes activation
* boxes only and not boxes activation * @return int 1 if OK, 0 if KO
*
* @return int 1 if OK, 0 if KO
*/ */
protected function _init($array_sql, $options = '') protected function _init($array_sql, $options = '')
{ {

2
htdocs/core/modules/modMargin.class.php
View File

@@ -107,7 +107,7 @@ class modMargin extends DolibarrModules
'fk_menu'=>'fk_mainmenu=billing', // Put 0 if this is a top menu 'fk_menu'=>'fk_mainmenu=billing', // Put 0 if this is a top menu
'type'=>'left', // This is a Top menu entry 'type'=>'left', // This is a Top menu entry
'titre'=>'Margins', 'titre'=>'Margins',
'prefix' => '<span class="fas fa-money-check-alt infobox-bank_account paddingright pictofixedwidth" style="font-size: 0.85em;"></span>', 'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
'mainmenu'=>'billing', 'mainmenu'=>'billing',
'leftmenu'=>'margins', 'leftmenu'=>'margins',
'url'=>'/margin/index.php', 'url'=>'/margin/index.php',

1
htdocs/install/upgrade2.php
View File

@@ -477,6 +477,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
'MAIN_MODULE_FACTURE'=>'newboxdefonly', 'MAIN_MODULE_FACTURE'=>'newboxdefonly',
'MAIN_MODULE_FOURNISSEUR'=>'newboxdefonly', 'MAIN_MODULE_FOURNISSEUR'=>'newboxdefonly',
'MAIN_MODULE_HOLIDAY'=>'newboxdefonly', 'MAIN_MODULE_HOLIDAY'=>'newboxdefonly',
'MAIN_MODULE_MARGIN'=>'menuonly',
'MAIN_MODULE_OPENSURVEY'=>'newboxdefonly', 'MAIN_MODULE_OPENSURVEY'=>'newboxdefonly',
'MAIN_MODULE_PAYBOX'=>'newboxdefonly', 'MAIN_MODULE_PAYBOX'=>'newboxdefonly',
'MAIN_MODULE_PRINTING'=>'newboxdefonly', 'MAIN_MODULE_PRINTING'=>'newboxdefonly',

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

@@ -1937,7 +1937,8 @@ span.widthpictotitle.pictotitle {
} }
.pictofixedwidth { .pictofixedwidth {
text-align: left; text-align: left;
width: 16px; width: 18px;
padding-right: 0;
} }
.colorthumb { .colorthumb {