Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 11:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16288 from FHenry/dev_EventOrganisation_setuppage

Browse Source 
wip : Event Organization module - PR-1 - setup page  #FoundationFunding
This commit is contained in:
Laurent Destailleur
2021-02-15 15:59:19 +01:00
committed by GitHub
parent 3ec515e106 ad9f58d246
commit d183a7eedf
14 changed files with 1332 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3245,7 +3245,6 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0, $alt = '', $morecss = '', $marginleftonlyshort = 2)
{
global $conf, $langs;
// We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_URL_ROOT/theme/$conf->theme/img/$picto
$url = DOL_URL_ROOT;
$theme = isset($conf->theme) ? $conf->theme : null;
@@ -3296,7 +3295,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'error', 'warning',
'recruitmentcandidature', 'recruitmentjobposition', 'resource',
'shapes', 'supplier_proposal', 'supplier_order', 'supplier_invoice', 'user-cog',
'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda'
'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda',
'eventorganization', 'object_eventorganization'
)
)) {
$pictowithouttext = str_replace('object_', '', $pictowithouttext);
@@ -3341,7 +3341,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'title_agenda'=>'calendar-alt',
'uparrow'=>'mail-forward', 'vcard'=>'address-card',
'jabber'=>'comment-o',
'website'=>'globe-americas'
'website'=>'globe-americas',
'eventorganization'=>'id-badge'
);
if ($pictowithouttext == 'off') {
$fakey = 'fa-square';