diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index 54a4ff9f1d2..4dfe52dafb6 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -67,7 +67,7 @@ if (! empty($user->rights->categorie->creer)) { $newcardbutton.= dolGetButtonTitle($langs->trans('NewCategory'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/categories/card.php?action=create&type='.$type.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type='.$type)); } -print load_fiche_titre($title, $newcardbutton); +print load_fiche_titre($title, $newcardbutton, 'object_category'); //print ''; //print '
'; @@ -197,7 +197,7 @@ print ''; print ''; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 45ddc03e98d..f6279cc992e 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3132,11 +3132,11 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ if (empty($srconly) && in_array($pictowithouttext, array( '1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected', - 'address', 'barcode', 'bank', 'bookmark', 'building', 'cash-register', 'check', 'close_title', 'cubes', 'delete', 'dolly', 'edit', 'ellipsis-h', - 'filter', 'file-code', 'grip', 'grip_title', 'language', 'list', 'listlight', 'note', - 'object_phoning', 'object_phoning_fax', 'object_email', - 'object_bookmark', 'object_list', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser', - 'object_cash-register', + 'object_accounting', 'object_category', 'address', 'barcode', 'bank', 'bookmark', 'building', 'cash-register', 'check', 'close_title', 'cubes', 'delete', 'dolly', 'edit', 'ellipsis-h', + 'filter', 'file-code', 'folder', 'folder-open', 'grip', 'grip_title', 'language', 'list', 'listlight', 'note', + 'object_barcode', 'object_phoning', 'object_phoning_fax', 'object_email', + 'object_bookmark', 'object_generic', 'object_list', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser', + 'object_cash-register', 'object_printer', 'object_technic', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize', 'stats', 'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'wrench', 'globe', 'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp', @@ -3159,12 +3159,15 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ $arrayconvpictotofa = array( 'address'=> 'address-book', 'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins', 'accountancy'=>'money-check-alt', + 'accounting'=>'chart-line', 'category'=>'tag', 'hrm'=>'umbrella-beach', 'members'=>'users', 'ticket'=>'ticket-alt', 'generic'=>'folder-open', 'globe'=>'external-link-alt', 'phoning'=>'phone', 'phoning_fax'=>'fax', 'email'=>'at', + 'generic'=>'file', 'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star', 'stats' => 'chart-bar', 'bank'=>'university', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil', 'filter'=>'filter', 'split'=>'code-branch', 'list'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarmonth'=>'calendar-alt', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table', 'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle', + 'printer'=>'print', 'technic'=>'cogs', 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach', 'title_agenda'=>'calendar-alt', 'preview'=>'binoculars', 'project'=>'sitemap' ); @@ -3224,6 +3227,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ $fakey = 'fa-crop'; $facolor = '#444'; } + elseif ($pictowithouttext == 'generic') { + $fakey = 'fa-file'; + $fa = 'far'; + } elseif ($pictowithouttext == 'note') { $fakey = 'fa-sticky-note'; $fa = 'far'; diff --git a/htdocs/paybox/img/object_paybox.png b/htdocs/paybox/img/object_paybox.png index 31216440458..4bd819f5b3d 100644 Binary files a/htdocs/paybox/img/object_paybox.png and b/htdocs/paybox/img/object_paybox.png differ diff --git a/htdocs/paypal/img/object_paypal.png b/htdocs/paypal/img/object_paypal.png index 13807b34920..872a0356ac5 100644 Binary files a/htdocs/paypal/img/object_paypal.png and b/htdocs/paypal/img/object_paypal.png differ diff --git a/htdocs/stripe/img/index.html b/htdocs/stripe/img/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/stripe/img/object_stripe.png b/htdocs/stripe/img/object_stripe.png deleted file mode 100644 index 82bd4145dab..00000000000 Binary files a/htdocs/stripe/img/object_stripe.png and /dev/null differ diff --git a/htdocs/theme/eldy/img/object_stripe.png b/htdocs/theme/eldy/img/object_stripe.png index 82bd4145dab..4106bb6b2ee 100644 Binary files a/htdocs/theme/eldy/img/object_stripe.png and b/htdocs/theme/eldy/img/object_stripe.png differ diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php index 0bcfe977871..59cc20d36a0 100644 --- a/htdocs/theme/eldy/info-box.inc.php +++ b/htdocs/theme/eldy/info-box.inc.php @@ -76,6 +76,10 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> .info-box-icon > img { max-width: 100%; } +.info-box-module .info-box-icon > img { + max-width: 70%; +} + .info-box-icon-text{ box-sizing: border-box; display: block; diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php index fb011e63e69..16c35052b11 100644 --- a/htdocs/theme/md/info-box.inc.php +++ b/htdocs/theme/md/info-box.inc.php @@ -60,6 +60,9 @@ span.info-box-icon-text { /* hide box text number due to problems */ .info-box-icon > img { max-width: 100%; } +.info-box-module .info-box-icon > img { + max-width: 70%; +} .info-box-content { padding: 5px 10px; margin-left: 90px;
'.$langs->trans("Categories").''; if (!empty($conf->use_javascript_ajax)) { - print ''; + print ''; } print '