diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index 47bd51bdc98..ead5e767243 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -225,7 +225,7 @@ if (! empty($conf->global->MEMBER_ENABLE_PUBLIC))
{
print '
';
//print $langs->trans('FollowingLinksArePublic').'
';
- print img_picto('', 'object_globe.png').' '.$langs->trans('BlankSubscriptionForm').':
';
+ print img_picto('', 'globe').' '.$langs->trans('BlankSubscriptionForm').':
';
if ($conf->multicompany->enabled) {
$entity_qr='?entity='.$conf->entity;
} else {
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 65074cbe8f1..f3c16941ebc 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -161,13 +161,13 @@ $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain
// Show message
$message='';
$urlvcal=''.$urlwithroot.'/public/agenda/agendaexport.php?format=vcal&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'KEYNOTDEFINED').'';
-$message.=img_picto('', 'object_globe.png').' '.$langs->trans("WebCalUrlForVCalExport", 'vcal', $urlvcal);
+$message.=img_picto('', 'globe').' '.$langs->trans("WebCalUrlForVCalExport", 'vcal', $urlvcal);
$message.='
';
$urlical=''.$urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'KEYNOTDEFINED').'';
-$message.=img_picto('', 'object_globe.png').' '.$langs->trans("WebCalUrlForVCalExport", 'ical/ics', $urlical);
+$message.=img_picto('', 'globe').' '.$langs->trans("WebCalUrlForVCalExport", 'ical/ics', $urlical);
$message.='
';
$urlrss=''.$urlwithroot.'/public/agenda/agendaexport.php?format=rss&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'KEYNOTDEFINED').'';
-$message.=img_picto('', 'object_globe.png').' '.$langs->trans("WebCalUrlForVCalExport", 'rss', $urlrss);
+$message.=img_picto('', 'globe').' '.$langs->trans("WebCalUrlForVCalExport", 'rss', $urlrss);
$message.='
';
$message.='
';
print $message;
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index cb3f7ab2072..778f79ff4ce 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -172,13 +172,13 @@ $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain
// Show message
$message='';
$url=''.$urlwithroot.'/dav/fileserver.php';
-$message.=img_picto('', 'object_globe.png').' '.$langs->trans("WebDavServer", 'WebDAV', $url);
+$message.=img_picto('', 'globe').' '.$langs->trans("WebDavServer", 'WebDAV', $url);
$message.='
';
if (! empty($conf->global->DAV_ALLOW_PUBLIC_DIR))
{
$urlEntity = (! empty($conf->multicompany->enabled)?'?entity='.$conf->entity:'');
$url=''.$urlwithroot.'/dav/fileserver.php/public/'.$urlEntity.'';
- $message.=img_picto('', 'object_globe.png').' '.$langs->trans("WebDavServer", 'WebDAV public', $url);
+ $message.=img_picto('', 'globe').' '.$langs->trans("WebDavServer", 'WebDAV public', $url);
$message.='
';
}
print $message;
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 693ad3d1f47..ad7a2278991 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -553,7 +553,7 @@ if ($mode == 'searchkey')
//$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?key='.$key;
$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?q=key%3A'.$key;
- print ' '.img_picto('FixOnTransifex', 'object_globe').'';
+ print ' '.img_picto('FixOnTransifex', 'globe').'';
}
}
else
diff --git a/htdocs/api/admin/explorer.php b/htdocs/api/admin/explorer.php
index 278c2750cd4..0f541b93708 100644
--- a/htdocs/api/admin/explorer.php
+++ b/htdocs/api/admin/explorer.php
@@ -179,7 +179,7 @@ print '
';
$message='';
$url=''.$urlwithroot.'/api/index.php/login?login='.urlencode($user->login).'&password=yourpassword[&reset=1]';
$message.=$langs->trans("UrlToGetKeyToUseAPIs").':
';
-$message.=img_picto('', 'object_globe.png').' '.$url;
+$message.=img_picto('', 'globe').' '.$url;
print $message;
print '
';
print '
';
@@ -208,7 +208,7 @@ foreach($listofapis['v1'] as $key => $val)
//print $key.' - '.$val['classname'].' - '.$val['fullpath']." - ".DOL_MAIN_URL_ROOT.'/api/index.php/'.strtolower(preg_replace('/Api$/','',$val['classname']))."/xxx
\n";
$url=$urlwithroot.'/api/index.php/'.$key;
$url.='?api_key=token';
- print img_picto('', 'object_globe.png').' '.$method.' '.$url."
\n";
+ print img_picto('', 'globe').' '.$method.' '.$url."
\n";
}
}
}
diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index b005f257160..f8a354683e0 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -152,7 +152,7 @@ $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain
$message='';
$url=$urlwithroot.'/api/index.php/login?login=auserlogin&password=thepassword[&reset=1]';
$message.=$langs->trans("UrlToGetKeyToUseAPIs").':
';
-$message.=img_picto('', 'object_globe.png').' '.$url;
+$message.=img_picto('', 'globe').' '.$url;
print $message;
print '
';
print '
';
@@ -162,7 +162,7 @@ print ''.$langs->trans("ApiExporerIs").':
';
if (dol_is_dir(DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/explorer'))
{
$url=DOL_MAIN_URL_ROOT.'/api/index.php/explorer';
- print img_picto('', 'object_globe.png').' '.$url."
\n";
+ print img_picto('', 'globe').' '.$url."
\n";
}
else
{
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 77971439f75..6f8ea3a286d 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -242,7 +242,7 @@ print '';
print '';
print '';
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_bank.png', 0, $newcardbutton, '', $limit, 1);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bank', 0, $newcardbutton, '', $limit, 1);
$topicmail="Information";
//$modelmail="subscription";
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index 5d4f51840fa..eec82f0e091 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -29,7 +29,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
class box_bookmarks extends ModeleBoxes
{
public $boxcode="bookmarks";
- public $boximg="object_bookmark";
+ public $boximg="bookmark";
public $boxlabel="BoxMyLastBookmarks";
public $depends = array("bookmark");
@@ -77,12 +77,12 @@ class box_bookmarks extends ModeleBoxes
'sublink' => DOL_URL_ROOT.'/bookmarks/list.php',
);
if ($user->rights->bookmark->creer) {
- $this->info_box_head['subpicto']='object_bookmark';
+ $this->info_box_head['subpicto']='bookmark';
$this->info_box_head['subtext']=$langs->trans("BookmarksManagement");
}
else
{
- $this->info_box_head['subpicto']='object_bookmark';
+ $this->info_box_head['subpicto']='bookmark';
$this->info_box_head['subtext']=$langs->trans("ListOfBookmark");
}
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 908fe200a97..76eec464399 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1334,7 +1334,7 @@ class FormFile
$fulllink=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');
- print img_picto($langs->trans("FileSharedViaALink"), 'object_globe.png').' ';
+ print img_picto($langs->trans("FileSharedViaALink"), 'globe').' ';
print '';
}
else
@@ -1851,7 +1851,7 @@ class FormFile
else
{
print '';
- print img_picto('', 'object_globe').' ';
+ print img_picto('', 'globe').' ';
print '';
print dol_escape_htmltag($link->label);
print '';
diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php
index 57af5cc5a59..4088b00c151 100644
--- a/htdocs/core/lib/cron.lib.php
+++ b/htdocs/core/lib/cron.lib.php
@@ -95,10 +95,10 @@ function dol_print_cron_urls()
print '';
print $langs->trans("URLToLaunchCronJobs").': ';
$url=$urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY)?'':'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login;
- print img_picto('', 'object_globe.png').' '.$url."\n";
+ print img_picto('', 'globe').' '.$url."\n";
print ' '.$langs->trans("OrToLaunchASpecificJob").' ';
$url=$urlwithroot.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY)?'':'securitykey='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login.'&id=cronjobid';
- print img_picto('', 'object_globe.png').' '.$url."\n";
+ print img_picto('', 'globe').' '.$url."\n";
print '
';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index c19a790cf77..c761ac3cc86 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2137,7 +2137,7 @@ function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0)
if (! preg_match('/^http/i', $url)) $link.='http://';
$link.=dol_trunc($url, $max);
$link.='';
- return ''.($withpicto?img_picto($langs->trans("Url"), 'object_globe.png').' ':'').$link.' ';
+ return ''.($withpicto?img_picto($langs->trans("Url"), 'globe').' ':'').$link.' ';
}
/**
@@ -3029,7 +3029,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
//if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))
if (empty($srconly) && in_array($pictowithouttext, array(
'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
- 'address', 'bank', 'building', 'cash-register', 'close_title', 'cubes', 'delete', 'edit', 'ellipsis-h', 'filter', 'grip', 'grip_title', 'list', 'listlight', 'note',
+ 'address', 'bank', 'building', 'cash-register', 'close_title', 'cubes', 'delete', 'edit', 'ellipsis-h', 'bookmark', 'filter', 'grip', 'grip_title', 'list', 'listlight', 'note',
'object_list','object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
'off', 'on', 'play', 'playdisabled', 'printer', 'resize',
'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'wrench',
@@ -3039,18 +3039,17 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda'
)
)) {
- $fa='fa';
- if (empty($conf->global->MAIN_DISABLE_FONT_AWESOME_5)) $fa='fas';
+ $fa='fas';
$fakey = $pictowithouttext;
$facolor = ''; $fasize = '';
$arrayconvpictotofa = array(
'address'=> 'address-book', 'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins', 'accountancy'=>'money-check-alt', 'project'=>'sitemap',
'hrm'=>'umbrella-beach', 'members'=>'users', 'ticket'=>'ticket-alt', 'generic'=>'folder-open',
- 'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on',
- 'bank'=>'bank', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil', 'filter'=>'filter', 'split'=>'code-fork',
+ 'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'bookmark'=>'star',
+ 'bank'=>'university', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil', 'filter'=>'filter', 'split'=>'code-fork',
'object_list'=>'list-alt','object_calendar'=>'calendar-alt', 'object_calendarweek'=>'calendar-week', 'object_calendarmonth'=>'calendar-alt', 'object_calendarday'=>'calendar-day', 'object_calendarperuser'=>'table',
- 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'bank', 'title_hrm'=>'umbrella-beach', 'title_agenda'=>'calendar-alt'
+ 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach', 'title_agenda'=>'calendar-alt'
);
if ($pictowithouttext == 'switch_off') {
@@ -3064,21 +3063,13 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
}
elseif ($pictowithouttext == 'off') {
- $fakey = 'fa-square-o';
- if (empty($conf->global->MAIN_DISABLE_FONT_AWESOME_5))
- {
- $fakey = 'fa-square';
- $fa='far';
- }
+ $fakey = 'fa-square';
+ $fa='far';
$fasize = '1.3em';
}
elseif ($pictowithouttext == 'on') {
- $fakey = 'fa-check-square-o';
- if (empty($conf->global->MAIN_DISABLE_FONT_AWESOME_5))
- {
- $fakey = 'fa-check-square';
- $fa='far';
- }
+ $fakey = 'fa-check-square';
+ $fa='far';
$fasize = '1.3em';
}
elseif ($pictowithouttext == 'bank') {
@@ -3091,12 +3082,14 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
}
elseif ($pictowithouttext == 'edit') {
$facolor = '#444';
- $fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
- if (empty($conf->global->MAIN_DISABLE_FONT_AWESOME_5)) $fakey = 'fa-pencil-alt';
+ $fakey = 'fa-pencil-alt';
}
elseif ($pictowithouttext == 'grip_title' || $pictowithouttext == 'grip') {
- $fakey = 'fa-arrows';
- if (empty($conf->global->MAIN_DISABLE_FONT_AWESOME_5)) $fakey = 'fa-arrows-alt';
+ $fakey = 'fa-arrows-alt';
+ }
+ elseif ($pictowithouttext == 'bookmark') {
+ $fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
+ $fa='far';
}
elseif ($pictowithouttext == 'listlight') {
$fakey = 'fa-download';
@@ -3113,11 +3106,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$facolor = '#444';
}
elseif ($pictowithouttext == 'note') {
- $fakey = 'fa-sticky-note-o';
- if (empty($conf->global->MAIN_DISABLE_FONT_AWESOME_5))
- {
- $fakey = 'fa-sticky-note'; $fa = 'far';
- }
+ $fakey = 'fa-sticky-note';
+ $fa = 'far';
$facolor = '#999';
$marginleftonlyshort=1;
}
@@ -3132,9 +3122,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$marginleftonlyshort = 1;
}
elseif ($pictowithouttext == 'sign-out') {
- $fakey = 'fa-sign-out';
+ $fakey = 'fa-sign-out-alt';
$marginleftonlyshort=0;
- if (empty($conf->global->MAIN_DISABLE_FONT_AWESOME_5)) $fakey = 'fa-sign-out-alt';
}
elseif ($pictowithouttext == 'unlink') {
$fakey = 'fa-chain-broken';
@@ -3153,7 +3142,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
}
elseif (in_array($pictowithouttext, array('skype', 'twitter', 'facebook', 'linkedin'))) {
$fakey = 'fa-'.$pictowithouttext;
- if (empty($conf->global->MAIN_DISABLE_FONT_AWESOME_5)) $fa = 'fab';
+ $fa = 'fab';
}
// Img for type of views
elseif (in_array($pictowithouttext, array('object_list', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser'))) {
@@ -7709,7 +7698,7 @@ function showDirectDownloadLink($object)
if ($url)
{
- $out.= img_picto('', 'object_globe.png').' '.$langs->trans("DirectDownloadLink").'
';
+ $out.= img_picto('', 'globe').' '.$langs->trans("DirectDownloadLink").'
';
$out.= '';
$out.= ajax_autoselect("directdownloadlink", 0);
}
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 1c90503ea63..75e2ee08b8f 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -132,7 +132,7 @@ function showOnlinePaymentUrl($type, $ref)
$servicename=$langs->transnoentitiesnoconv('Online');
- $out = img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'
';
+ $out = img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'
';
$url = getOnlinePaymentUrl(0, $type, $ref);
$out.= '';
$out.= ajax_autoselect("onlinepaymenturl", 0);
diff --git a/htdocs/core/lib/signature.lib.php b/htdocs/core/lib/signature.lib.php
index 3ed4fb764d0..c9527c54840 100644
--- a/htdocs/core/lib/signature.lib.php
+++ b/htdocs/core/lib/signature.lib.php
@@ -33,7 +33,7 @@ function showOnlineSignatureUrl($type, $ref)
$servicename='Online';
- $out = img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlineSignature", $servicename).'
';
+ $out = img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlineSignature", $servicename).'
';
$url = getOnlineSignatureUrl(0, $type, $ref);
$out.= '';
$out.= ajax_autoselect("onlinesignatureurl", 0);
diff --git a/htdocs/core/tpl/onlinepaymentlinks.tpl.php b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
index ef43fd585e2..c06772d8bca 100644
--- a/htdocs/core/tpl/onlinepaymentlinks.tpl.php
+++ b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
@@ -28,12 +28,12 @@ print '';
// Url list
print ''.$langs->trans("FollowingUrlAreAvailableToMakePayments").':
';
-print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount", $servicename).':
';
+print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount", $servicename).':
';
print ''.getOnlinePaymentUrl(1, 'free')."
\n";
if (! empty($conf->commande->enabled))
{
print '';
- print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder", $servicename).':
';
+ print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder", $servicename).':
';
print ''.getOnlinePaymentUrl(1, 'order')."
\n";
if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
{
@@ -56,7 +56,7 @@ if (! empty($conf->commande->enabled))
if (! empty($conf->facture->enabled))
{
print '';
- print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice", $servicename).':
';
+ print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice", $servicename).':
';
print ''.getOnlinePaymentUrl(1, 'invoice')."
\n";
if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
{
@@ -79,7 +79,7 @@ if (! empty($conf->facture->enabled))
if (! empty($conf->contrat->enabled))
{
print '';
- print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine", $servicename).':
';
+ print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine", $servicename).':
';
print ''.getOnlinePaymentUrl(1, 'contractline')."
\n";
if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
{
@@ -102,7 +102,7 @@ if (! empty($conf->contrat->enabled))
if (! empty($conf->adherent->enabled))
{
print '';
- print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription", $servicename).':
';
+ print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription", $servicename).':
';
print ''.getOnlinePaymentUrl(1, 'membersubscription')."
\n";
if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
{
@@ -125,7 +125,7 @@ if (! empty($conf->adherent->enabled))
if (! empty($conf->don->enabled))
{
print '';
- print img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnDonation", $servicename).':
';
+ print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnDonation", $servicename).':
';
print ''.getOnlinePaymentUrl(1, 'donation')."
\n";
if (! empty($conf->global->PAYMENT_SECURITY_TOKEN) && ! empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
{
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index b796dcfd26f..38504088068 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -318,7 +318,7 @@ if ($forcedownload) $rellink.='&attachment=1';
if (! empty($object->entity)) $rellink.='&entity='.$object->entity;
$rellink.='&file='.urlencode($filepath);
$fulllink=$urlwithroot.$rellink;
-print img_picto('', 'object_globe.png').' ';
+print img_picto('', 'globe').' ';
if ($action != 'edit') print '';
else print $fulllink;
if ($action != 'edit') print ' '.$langs->trans("Download").''; // No target here.
@@ -343,7 +343,7 @@ if (! empty($object->share))
//if (! empty($object->ref)) $fulllink.='&hashn='.$object->ref; // Hash of file path
//elseif (! empty($object->label)) $fulllink.='&hashc='.$object->label; // Hash of file content
- print img_picto('', 'object_globe.png').' ';
+ print img_picto('', 'globe').' ';
if ($action != 'edit') print '';
else print $fulllink;
if ($action != 'edit') print ' '.$langs->trans("Download").''; // No target here
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index ae40a13701d..1cdab974833 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -327,7 +327,7 @@ if ($object->fk_user_creat) {
print ' | ';
// Link
-print '| '.img_picto('', 'object_globe.png').' '.$langs->trans("UrlForSurvey", '').' | ';
+print ' |
| '.img_picto('', 'globe').' '.$langs->trans("UrlForSurvey", '').' | ';
// Define $urlwithroot
$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index d30f24694e9..ad31d99e645 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -474,7 +474,7 @@ if ($object->fk_user_creat) {
print ' |
';
// Link
-print '| '.img_picto('', 'object_globe.png').' '.$langs->trans("UrlForSurvey", '').' | ';
+print ' |
| '.img_picto('', 'globe').' '.$langs->trans("UrlForSurvey", '').' | ';
// Define $urlwithroot
$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 4a528c449a2..22356994008 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -70,7 +70,7 @@ function showPaypalPaymentUrl($type, $ref)
$langs->load("paybox");
$servicename='PayPal';
$out='
';
- $out.=img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'
';
+ $out.=img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'
';
$url=getPaypalPaymentUrl(0, $type, $ref);
$out.='';
$out.=ajax_autoselect("paypalurl", 0);
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 915040bf36a..19b11994114 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -857,7 +857,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
{
$url='https://dashboard.stripe.com/'.$connect.'customers/'.$stripecu;
}
- print ' '.img_picto($langs->trans('ShowInStripe'), 'object_globe').'';
+ print ' '.img_picto($langs->trans('ShowInStripe'), 'globe').'';
}
print ' | ';
if (empty($stripecu))
@@ -911,7 +911,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
{
$url='https://dashboard.stripe.com/connect/accounts/'.$stripesupplieracc;
}
- print ' '.img_picto($langs->trans('ShowInStripe'), 'object_globe').'';
+ print ' '.img_picto($langs->trans('ShowInStripe'), 'globe').'';
}
print ' | ';
if (empty($stripesupplieracc))
@@ -1064,7 +1064,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
{
$url='https://dashboard.stripe.com/'.$connect.'search?query='.$companypaymentmodetemp->stripe_card_ref;
}
- print ' '.img_picto($langs->trans('ShowInStripe'), 'object_globe').'';
+ print ' '.img_picto($langs->trans('ShowInStripe'), 'globe').'';
}
print ' | ';
print '';
@@ -1159,7 +1159,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
//$url='https://dashboard.stripe.com/'.$connect.'sources/'.$src->id;
$url='https://dashboard.stripe.com/'.$connect.'search?query='.$src->id;
}
- print " ".img_picto($langs->trans('ShowInStripe'), 'object_globe')."";
+ print " ".img_picto($langs->trans('ShowInStripe'), 'globe')."";
print ' | ';
// Img of credit card
print '';
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 7621f48eeae..05d8937f293 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -207,7 +207,7 @@ if (empty($conf->stripeconnect->enabled))
}
print '';
print ' '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
- $out = img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForTestWebhook").' ';
+ $out = img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForTestWebhook").' ';
$url = dol_buildpath('/public/stripe/ipn.php?test', 3);
$out.= '';
$out.= ajax_autoselect("onlinetestwebhookurl", 0);
@@ -280,7 +280,7 @@ if (empty($conf->stripeconnect->enabled))
}
print '';
print ' '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
- $out = img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForLiveWebhook").' ';
+ $out = img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForLiveWebhook").' ';
$url = dol_buildpath('/public/stripe/ipn.php', 3);
$out.= '';
$out.= ajax_autoselect("onlinelivewebhookurl", 0);
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 200f4c31703..1189b94923b 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -183,7 +183,7 @@ if (!$rowid)
$url='https://dashboard.stripe.com/'.$connect.'payments/'.$charge->id;
}
print " | ";
- print "".img_picto($langs->trans('ShowInStripe'), 'object_globe')." ".$charge->id."";
+ print "".img_picto($langs->trans('ShowInStripe'), 'globe')." ".$charge->id."";
print " | \n";
// Stripe customer
print "";
@@ -195,7 +195,7 @@ if (!$rowid)
}
if (! empty($charge->customer))
{
- print ''.img_picto($langs->trans('ShowInStripe'), 'object_globe').' '.$charge->customer.'';
+ print ''.img_picto($langs->trans('ShowInStripe'), 'globe').' '.$charge->customer.'';
}
print " | \n";
// Link
diff --git a/htdocs/stripe/lib/stripe.lib.php b/htdocs/stripe/lib/stripe.lib.php
index 95fb80ce9dc..8a4284f491e 100644
--- a/htdocs/stripe/lib/stripe.lib.php
+++ b/htdocs/stripe/lib/stripe.lib.php
@@ -70,7 +70,7 @@ function showStripePaymentUrl($type, $ref)
$servicename='Stripe';
$out='
';
- $out.=img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'
';
+ $out.=img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'
';
$url=getStripePaymentUrl(0, $type, $ref);
$out.='
';
$out.=ajax_autoselect("stripeurl", 0);
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index e66318506ed..5870427757a 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -169,7 +169,7 @@ if (! $rowid) {
$url='https://dashboard.stripe.com/'.$connect.'payouts/'.$payout->id;
}
- print "".img_picto($langs->trans('ShowInStripe'), 'object_globe')." " . $payout->id . " | \n";
+ print "".img_picto($langs->trans('ShowInStripe'), 'globe')." " . $payout->id . " | \n";
// Stripe customer
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 4ad04011f99..873adfc1cf7 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -178,7 +178,7 @@ if (! $rowid) {
if ($txn->type == 'stripe_fee' || $txn->type == 'reserve_transaction') {
print "".$txn->type." | ";
} else {
- print "".img_picto($langs->trans('ShowInStripe'), 'object_globe')." " . $txn->source . " | \n";
+ print "".img_picto($langs->trans('ShowInStripe'), 'globe')." " . $txn->source . " | \n";
}
// Stripe customer
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 98bfddc196d..904f6a197d5 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1660,7 +1660,7 @@ a.tmenuimage:hover{
/* Do not load menu img for other if hidden to save bandwidth */
- global->MAIN_DISABLE_FONT_AWESOME_5)) { ?>
+
div.mainmenu.home{
@@ -1794,7 +1794,7 @@ a.tmenuimage:hover{
// Img file not found
if (! $found)
{
- if (! defined('DISABLE_FONT_AWSOME') && empty($conf->global->MAIN_DISABLE_FONT_AWESOME_5)) {
+ if (! defined('DISABLE_FONT_AWSOME')) {
print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
print 'div.mainmenu.'.$val.'::before {
content: "\f249";
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index ec1f04ab9db..dcbbbd1cf4f 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1786,7 +1786,7 @@ div.mainmenu {
/* Do not load menu img if hidden to save bandwidth */
- global->MAIN_DISABLE_FONT_AWESOME_5)) { ?>
+
@@ -1926,7 +1926,7 @@ foreach($mainmenuusedarray as $val)
// Img file not found
if (! $found)
{
- if (! defined('DISABLE_FONT_AWSOME') && empty($conf->global->MAIN_DISABLE_FONT_AWESOME_5)) {
+ if (! defined('DISABLE_FONT_AWSOME')) {
print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
print 'div.mainmenu.'.$val.'::before {
content: "\f249";
@@ -5805,7 +5805,7 @@ border-top-right-radius: 6px;
-global->MAIN_DISABLE_FONT_AWESOME_5)) { ?>
+
$right)
{
if (!empty($right) && !verifCond($right)) continue;
$url=DOL_MAIN_URL_ROOT.'/webservices/server_'.$name.'.php?wsdl';
- print img_picto('', 'object_globe.png').' '.$url."
\n";
+ print img_picto('', 'globe').' '.$url."
\n";
}
print '
';
@@ -131,7 +131,7 @@ foreach($webservices as $name => $right)
{
if (!empty($right) && !verifCond($right)) continue;
$url=DOL_MAIN_URL_ROOT.'/webservices/server_'.$name.'.php';
- print img_picto('', 'object_globe.png').' '.$url."
\n";
+ print img_picto('', 'globe').' '.$url."
\n";
}
print '
';
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 777201707ad..2769fb33cd0 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2064,7 +2064,7 @@ if (! GETPOST('hide_websitemenu'))
print '';
$linktotestonwebserver = '';
- $linktotestonwebserver.= $langs->trans("TestDeployOnWeb", $virtualurl).' '.img_picto('', 'object_globe');
+ $linktotestonwebserver.= $langs->trans("TestDeployOnWeb", $virtualurl).' '.img_picto('', 'globe');
$linktotestonwebserver.= '';
$htmltext = '';
if (empty($object->fk_default_home))