diff --git a/dev/initdemo/documents_demo/mycompany/logos/background_dolibarr.jpg b/dev/initdemo/documents_demo/mycompany/logos/background_dolibarr.jpg new file mode 100644 index 00000000000..6c4cc11460d Binary files /dev/null and b/dev/initdemo/documents_demo/mycompany/logos/background_dolibarr.jpg differ diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 741a6157dcd..8181f0598f2 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -316,7 +316,7 @@ print '
'; print ''."\n"; print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -333,7 +333,14 @@ foreach ($boxtoadd as $box) { print ''."\n"; print ''."\n"; print ''."\n"; - print ''."\n"; + print ''."\n"; // For each possible position, an activation link is displayed if the box is not already active for that position print '
'.$langs->trans("Box").''.$langs->trans("Box").''.$langs->trans("Note").'/'.$langs->trans("Parameters").''.$langs->trans("SourceFile").''.$langs->trans("ActivatableOn").'
'.img_object("", $logo, 'height="14px"').' '.$langs->transnoentitiesnoconv($box->boxlabel); if (!empty($box->class) && preg_match('/graph_/', $box->class)) { - print ' ('.$langs->trans("Graph").')'; + print img_picto('', 'graph', 'class="paddingleft"'); + } + if (!empty($box->version)) { + if ($box->version == 'experimental') { + print ' ('.$langs->trans("Experimental").')'; + } elseif ($box->version == 'development') { + print ' ('.$langs->trans("Development").')'; + } } print ''; @@ -344,7 +351,7 @@ foreach ($boxtoadd as $box) { print ($box->note ? $box->note : ' '); } print ''.$box->sourcefile.''.dol_escape_htmltag($box->sourcefile).''; @@ -375,7 +382,7 @@ print '
'; print ''."\n"; print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -395,7 +402,14 @@ foreach ($boxactivated as $key => $box) { print ''; print ''; print '
'.$langs->trans("Box").''.$langs->trans("Box").''.$langs->trans("Note").'/'.$langs->trans("Parameters").''.$langs->trans("ActivatableOn").''.$langs->trans("PositionByDefault").'
'.img_object("", $logo, 'height="14px"').' '.$langs->transnoentitiesnoconv($box->boxlabel); if (!empty($box->class) && preg_match('/graph_/', $box->class)) { - print ' ('.$langs->trans("Graph").')'; + print img_picto('', 'graph', 'class="paddingleft"'); + } + if (!empty($box->version)) { + if ($box->version == 'experimental') { + print ' ('.$langs->trans("Experimental").')'; + } elseif ($box->version == 'development') { + print ' ('.$langs->trans("Development").')'; + } } print ''; diff --git a/htdocs/core/boxes/box_accountancy_last_manual_entries.php b/htdocs/core/boxes/box_accountancy_last_manual_entries.php index 13b4d92a36f..123f9894e1e 100644 --- a/htdocs/core/boxes/box_accountancy_last_manual_entries.php +++ b/htdocs/core/boxes/box_accountancy_last_manual_entries.php @@ -33,7 +33,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; class box_accountancy_last_manual_entries extends ModeleBoxes { public $boxcode = "accountancy_last_manual_entries"; - public $boximg = "object_invoice"; + public $boximg = "accounting"; public $boxlabel = "BoxLastManualEntries"; public $depends = array("accounting"); diff --git a/htdocs/core/boxes/box_accountancy_suspense_account.php b/htdocs/core/boxes/box_accountancy_suspense_account.php index aa648270b97..f40c6e8a41b 100644 --- a/htdocs/core/boxes/box_accountancy_suspense_account.php +++ b/htdocs/core/boxes/box_accountancy_suspense_account.php @@ -33,7 +33,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; class box_accountancy_suspense_account extends ModeleBoxes { public $boxcode = "accountancy_suspense_account"; - public $boximg = "object_invoice"; + public $boximg = "accounting"; public $boxlabel = "BoxSuspenseAccount"; public $depends = array("accounting"); diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php index 519cb2cd306..2736028d668 100644 --- a/htdocs/core/boxes/box_funnel_of_prospection.php +++ b/htdocs/core/boxes/box_funnel_of_prospection.php @@ -36,6 +36,8 @@ class box_funnel_of_prospection extends ModeleBoxes public $boxlabel = "BoxTitleFunnelOfProspection"; public $depends = array("projet"); + public $version = 'development'; + /** * @var DoliDB Database handler. */ diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php index b7b9d979174..45cc02ac67e 100644 --- a/htdocs/core/boxes/modules_boxes.php +++ b/htdocs/core/boxes/modules_boxes.php @@ -495,12 +495,12 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box } // We set info of modules - $widget[$j]['picto'] = $objMod->picto ?img_object('', $objMod->picto) : img_object('', 'generic'); + $widget[$j]['picto'] = $objMod->picto ? img_object('', $objMod->picto) : img_object('', 'generic'); $widget[$j]['file'] = $files[$key]; $widget[$j]['fullpath'] = $fullpath[$key]; $widget[$j]['relpath'] = $relpath[$key]; $widget[$j]['iscoreorexternal'] = $iscoreorexternal[$key]; - //$widget[$j]['version'] = $objMod->getVersion(); + $widget[$j]['version'] = empty($objMod->version) ? '' : $objMod->version; $widget[$j]['status'] = img_picto($langs->trans("Active"), 'tick'); if ($disabledbyname > 0 || $disabledbymodule > 1) { $widget[$j]['status'] = ''; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 3f261adef3e..7782e7c2a07 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3511,7 +3511,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ 'bank_account', 'barcode', 'bank', 'bill', 'billa', 'billr', 'billd', 'bookmark', 'bom', 'building', 'cash-register', 'category', 'chart', 'check', 'clock', 'close_title', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'cron', 'cubes', 'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'edit', 'ellipsis-h', 'email', 'eraser', 'establishment', 'external-link-alt', 'external-link-square-alt', - 'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'autofill', 'folder', 'folder-open', 'folder-plus', 'globe', 'globe-americas', 'grip', 'grip_title', 'group', + 'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'autofill', 'folder', 'folder-open', 'folder-plus', + 'globe', 'globe-americas', 'graph', 'grip', 'grip_title', 'group', 'help', 'holiday', 'images', 'info', 'intervention', 'inventory', 'intracommreport', 'label', 'language', 'link', 'list', 'listlight', 'loan', 'lot', 'long-arrow-alt-right', @@ -3564,10 +3565,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ 'chart'=>'chart-line', 'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'collab'=>'people-arrows', 'conversation'=>'comments', 'country'=>'globe-americas', 'cron'=>'business-time', 'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd', 'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins', - 'accounting'=>'chart-line', 'category'=>'tag', 'dollyrevert'=>'dolly', + 'accounting'=>'search-dollar', 'category'=>'tag', 'dollyrevert'=>'dolly', 'hrm'=>'user-tie', 'margin'=>'calculator', 'members'=>'user-friends', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'lot'=>'barcode', 'email'=>'at', 'establishment'=>'building', - 'edit'=>'pencil-alt', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'question-circle', + 'edit'=>'pencil-alt', 'graph'=>'chart-line', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'question-circle', 'generic'=>'file', 'holiday'=>'umbrella-beach', 'info'=>'info-circle', 'inventory'=>'boxes', 'intracommreport'=>'globe-europe', 'label'=>'layer-group', 'loan'=>'money-bill-alt', 'member'=>'user-alt', 'meeting'=>'chalkboard-teacher', 'mrp'=>'cubes', 'next'=>'arrow-alt-circle-right', diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index a12c6132a1d..af750194a25 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -2607,7 +2607,7 @@ table.login_table_securitycode tr td { } div.backgroundsemitransparent { - background:rgba(255,255,255,0.6); + background:rgba(255,255,255,0.68); padding-left: 10px; padding-right: 10px; }