From 0832c25b5b3b2f393d017d0b12e07174a1b49c64 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 28 Feb 2021 11:48:35 +0100 Subject: [PATCH] Look and feel v14 --- htdocs/asset/card.php | 2 +- htdocs/asset/class/asset.class.php | 6 ++++-- htdocs/asset/class/asset_type.class.php | 2 +- htdocs/asset/list.php | 2 +- htdocs/asset/type.php | 21 ++++++++++++++------- htdocs/compta/index.php | 4 ++-- htdocs/compta/sociales/list.php | 2 +- htdocs/core/lib/accounting.lib.php | 6 +++--- htdocs/core/lib/functions.lib.php | 9 +++++---- htdocs/core/menus/standard/eldy.lib.php | 2 +- 10 files changed, 33 insertions(+), 23 deletions(-) diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php index cb57581a6be..e4bf739515f 100644 --- a/htdocs/asset/card.php +++ b/htdocs/asset/card.php @@ -143,7 +143,7 @@ llxHeader('', $title, $help_url); // Part to create if ($action == 'create') { - print load_fiche_titre($langs->trans("NewAsset"), '', 'accountancy'); + print load_fiche_titre($langs->trans("NewAsset"), '', $object->picto); print '
'; print ''; diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php index 984dde7389b..48f66ae5ccf 100644 --- a/htdocs/asset/class/asset.class.php +++ b/htdocs/asset/class/asset.class.php @@ -313,9 +313,11 @@ class Asset extends CommonObject } $result = ''; - $companylink = ''; - $label = ''.$langs->trans("Asset").''; + $label = img_picto('', $this->picto).' '.$langs->trans("Asset").''; + if (isset($this->status)) { + $label .= ' '.$this->getLibStatut(5); + } $label .= '
'; $label .= ''.$langs->trans('Ref').': '.$this->ref; diff --git a/htdocs/asset/class/asset_type.class.php b/htdocs/asset/class/asset_type.class.php index d0fa0a9c585..7354b8dfd15 100644 --- a/htdocs/asset/class/asset_type.class.php +++ b/htdocs/asset/class/asset_type.class.php @@ -42,7 +42,7 @@ class AssetType extends CommonObject /** * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png */ - public $picto = 'invoice'; + public $picto = 'asset'; /** * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php index 9cd00f181c1..e0beefd688f 100644 --- a/htdocs/asset/list.php +++ b/htdocs/asset/list.php @@ -370,7 +370,7 @@ print ''; $newcardbutton = dolGetButtonTitle($langs->trans('NewAsset'), '', 'fa fa-plus-circle', dol_buildpath('/asset/card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd); -print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1); +print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1); // Add code for pre mass action (confirmation or email presend form) $topicmail = "SendAssetsRef"; diff --git a/htdocs/asset/type.php b/htdocs/asset/type.php index 5955548b5e2..9d7e848b6d3 100644 --- a/htdocs/asset/type.php +++ b/htdocs/asset/type.php @@ -230,7 +230,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') { $newcardbutton = dolGetButtonTitle($langs->trans('NewAssetType'), '', 'fa fa-plus-circle', dol_buildpath('/asset/type.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd); - print_barre_liste($langs->trans("AssetsTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'accountancy', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("AssetsTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit); $moreforfilter = ''; @@ -296,13 +296,20 @@ if (!$rowid && $action != 'create' && $action != 'edit') { print ''; if ($user->rights->asset->write) { - print 'rowid.'">'.img_edit().''; + print 'rowid.'">'.img_edit().''; } else { print ' '; } print ""; $i++; } + + // If no record found + if ($num == 0) { + $colspan = 6; + print ''.$langs->trans("NoRecordFound").''; + } + print ""; print ''; @@ -324,7 +331,7 @@ if ($action == 'create') { $formaccounting = new FormAccounting($db); } - print load_fiche_titre($langs->trans("NewAssetType")); + print load_fiche_titre($langs->trans("NewAssetType"), '', $object->picto); print ''; print ''; @@ -417,7 +424,7 @@ if ($rowid > 0) { $head = asset_type_prepare_head($object); - print dol_get_fiche_head($head, 'card', $langs->trans("AssetType"), -1, 'setup'); + print dol_get_fiche_head($head, 'card', $langs->trans("AssetType"), -1, 'asset'); $linkback = ''.$langs->trans("BackToList").''; @@ -432,10 +439,10 @@ if ($rowid > 0) { print '
'; print '
'; - print ''; + print '
'; print ''; - print '
'; + print ''; print $langs->trans("AccountancyCodeAsset"); print ''; if (!empty($conf->accounting->enabled)) { @@ -534,7 +541,7 @@ if ($rowid > 0) { print ''; - print ''; + print ''; print ''; diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 7cc15d7f9a7..9e25cc3deee 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -930,7 +930,7 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user print '
'.$langs->trans("Ref").''.$object->id.'
'.$langs->trans("Ref").''.$object->id.'
'.$langs->trans("Label").'
'; print ''; - print ''; print '
'; + print ''; print $commandestatic->getNomUrl(1); print ''; @@ -1085,7 +1085,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire) { print ''; print ''; - print ''; print ''; + print ''; if (!$i) { $totalarray['nbfield']++; } diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php index c697b93e5bb..6b2526477b3 100644 --- a/htdocs/core/lib/accounting.lib.php +++ b/htdocs/core/lib/accounting.lib.php @@ -203,11 +203,11 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build foreach ($moreparam as $key => $value) { print ''; } - print '
'; + print ''; print $tmpinvoice->getNomUrl(1, ''); print ''; diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php index 5b3ca650077..dff6a887f0f 100644 --- a/htdocs/compta/sociales/list.php +++ b/htdocs/compta/sociales/list.php @@ -529,7 +529,7 @@ while ($i < min($num, $limit)) { // Date if (!empty($arrayfields['cs.date_ech']['checked'])) { - print ''.dol_print_date($db->jdate($obj->date_ech), 'day').''.dol_print_date($db->jdate($obj->date_ech), 'day').'
'; + print '
'; // Ligne de titre print ''; - print ''; + print ''; print ''; @@ -216,7 +216,7 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build // Calculation mode if ($calcmode) { print ''; - print ''; + print ''; if (!$variante) { print '
'.$langs->trans("Name").''.$langs->trans("Name").''; print $nom; print '
'.$langs->trans("CalculationMode").''.$langs->trans("CalculationMode").''; } else { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 673ad8206e7..f1b8f93a8ee 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3414,14 +3414,15 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ $pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto); if (empty($srconly) && in_array($pictowithouttext, array( '1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected', - 'accountancy', 'account', 'accountline', 'action', 'add', 'address', 'angle-double-down', 'angle-double-up', 'bank_account', 'barcode', 'bank', 'bill', 'billa', 'billr', 'billd', 'bookmark', 'bom', 'building', + 'accountancy', 'account', 'accountline', 'action', 'add', 'address', 'angle-double-down', 'angle-double-up', 'asset', + 'bank_account', 'barcode', 'bank', 'bill', 'billa', 'billr', 'billd', 'bookmark', 'bom', 'building', 'cash-register', 'category', 'chart', 'check', 'clock', 'close_title', 'cog', 'company', 'contact', 'contract', 'cron', 'cubes', 'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'edit', 'ellipsis-h', 'email', 'eraser', 'external-link-alt', 'external-link-square-alt', 'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'group', 'help', 'holiday', 'intervention', 'label', 'language', 'link', 'list', 'listlight', 'loan', 'lot', 'long-arrow-alt-right', 'margin', 'map-marker-alt', 'member', 'meeting', 'money-bill-alt', 'movement', '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_asset', '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_folder', 'object_folder-open','object_generic', 'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser', @@ -3462,7 +3463,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ } $arrayconvpictotofa = array( - 'account'=>'university', 'accountline'=>'receipt', 'accountancy'=>'search-dollar', 'action'=>'calendar-alt', 'add'=>'plus-circle', 'address'=> 'address-book', + 'account'=>'university', 'accountline'=>'receipt', 'accountancy'=>'search-dollar', 'action'=>'calendar-alt', 'add'=>'plus-circle', 'address'=> 'address-book', 'asset'=>'money-check-alt', 'bank_account'=>'university', 'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'supplier_invoicea'=>'file-excel', 'billd'=>'file-medical', 'supplier_invoiced'=>'file-medical', 'bom'=>'shapes', 'chart'=>'chart-line', 'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'conversation'=>'comments', 'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd', @@ -3544,7 +3545,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ // Add CSS $arrayconvpictotomorcess = array( - 'action'=>'infobox-action', 'account'=>'infobox-bank_account', 'accountline'=>'infobox-bank_account', 'accountancy'=>'infobox-bank_account', + 'action'=>'infobox-action', 'account'=>'infobox-bank_account', 'accountline'=>'infobox-bank_account', 'accountancy'=>'infobox-bank_account', 'asset'=>'infobox-bank_account', 'bank_account'=>'bg-infobox-bank_account', 'bill'=>'infobox-commande', 'billa'=>'infobox-commande', 'billd'=>'infobox-commande', 'cash-register'=>'infobox-bank_account', 'contract'=>'infobox-contrat', 'check'=>'font-status4', 'conversation'=>'infobox-contrat', diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 749765886b4..fecc57a74e7 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -1185,7 +1185,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM //$newmenu->add("/accountancy/index.php?leftmenu=accountancy", $langs->trans("MenuAccountancy"), 0, $permtoshowmenu, '', $mainmenu, 'accountancy'); // Configuration - $newmenu->add("/accountancy/index.php?leftmenu=accountancy_admin", $langs->trans("Setup"), 0, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin', 1, '', '', '', img_picto('', 'setup', 'class="paddingright pictofixedwidth"')); + $newmenu->add("/accountancy/index.php?leftmenu=accountancy_admin", $langs->trans("Setup"), 0, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin', 1, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"')); if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/', $leftmenu)) { $newmenu->add("/accountancy/admin/index.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("General"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_general', 10);