diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 16b28814f64..f238b949420 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3510,7 +3510,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ 'label', 'language', 'link', 'list', 'list-alt', 'listlight', 'loan', 'lot', 'long-arrow-alt-right', 'margin', 'map-marker-alt', 'member', 'meeting', 'money-bill-alt', 'movement', 'mrp', 'note', 'next', 'off', 'on', 'order', - 'paiment', 'paragraph', 'play', 'pdf', 'phone', 'playdisabled', 'previous', 'poll', 'pos', 'printer', 'product', 'propal', 'stock', 'resize', 'service', 'stats', 'trip', + 'paiment', 'paragraph', 'play', 'pdf', 'phone', 'phoning', 'phoning_mobile', 'phoning_fax', 'playdisabled', 'previous', 'poll', 'pos', 'printer', 'product', 'propal', 'stock', 'resize', 'service', 'stats', 'trip', 'security', 'setup', 'share-alt', 'sign-out', 'split', 'stripe', 'stripe-s', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench', 'github', 'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp', 'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'commercial', 'companies', diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 1404e86be9d..c872034e599 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -2157,7 +2157,7 @@ if ($action == 'create' || $action == 'adduserldap') { print ''.$langs->trans("HierarchicalResponsible").''; print ''; if ($caneditfield) { - print img_picto('', 'user').$form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300'); + print img_picto('', 'user').$form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300'); } else { print ''; $huser = new User($db); @@ -2175,7 +2175,7 @@ if ($action == 'create' || $action == 'adduserldap') { print ''; print ''; if ($caneditfield) { - print img_picto('', 'user').$form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300'); + print img_picto('', 'user').$form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300'); } else { print ''; $evuser = new User($db); @@ -2194,7 +2194,7 @@ if ($action == 'create' || $action == 'adduserldap') { print ''; print ''; if ($caneditfield) { - print img_picto('', 'user').$form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300'); + print img_picto('', 'user').$form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300'); } else { print ''; $hvuser = new User($db); @@ -2372,7 +2372,7 @@ if ($action == 'create' || $action == 'adduserldap') { // Tel pro print "".''.$langs->trans("PhonePro").''; print ''; - print img_picto('', 'object_phoning'); + print img_picto('', 'phoning', 'class="pictofixedwidth"'); if ($caneditfield && empty($object->ldap_sid)) { print ''; } else { @@ -2384,7 +2384,7 @@ if ($action == 'create' || $action == 'adduserldap') { // Tel mobile print "".''.$langs->trans("PhoneMobile").''; print ''; - print img_picto('', 'object_phoning_mobile'); + print img_picto('', 'phoning_mobile', 'class="pictofixedwidth"'); if ($caneditfield && empty($object->ldap_sid)) { print ''; } else { @@ -2396,7 +2396,7 @@ if ($action == 'create' || $action == 'adduserldap') { // Fax print "".''.$langs->trans("Fax").''; print ''; - print img_picto('', 'object_phoning_fax'); + print img_picto('', 'phoning_fax', 'class="pictofixedwidth"'); if ($caneditfield && empty($object->ldap_sid)) { print ''; } else { @@ -2408,7 +2408,7 @@ if ($action == 'create' || $action == 'adduserldap') { // EMail print "".'global->USER_MAIL_REQUIRED) ? ' class="fieldrequired"' : '').'>'.$langs->trans("EMail").''; print ''; - print img_picto('', 'object_email'); + print img_picto('', 'object_email', 'class="pictofixedwidth"'); if ($caneditfield && empty($object->ldap_sid)) { print ''; } else { @@ -2423,10 +2423,10 @@ if ($action == 'create' || $action == 'adduserldap') { print ''.$langs->trans($value['label']).''; print ''; if (!empty($value['icon'])) { - print ''; + print ''; } if ($caneditfield && empty($object->ldap_sid)) { - print ''; + print ''; } else { print ''; print $object->socialnetworks[$key]; @@ -2460,7 +2460,7 @@ if ($action == 'create' || $action == 'adduserldap') { print ''.$langs->trans("AccountancyCode").''; print ''; if ($caneditfield) { - print ''; + print ''; } else { print ''; print $object->accountancy_code; @@ -2493,7 +2493,7 @@ if ($action == 'create' || $action == 'adduserldap') { if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) { print ''.$form->editfieldkey('Categories', 'usercats', '', $object, 0).''; print ''; - print img_picto('', 'category'); + print img_picto('', 'category', 'class="pictofixedwidth"'); $cate_arbo = $form->select_all_categories(Categorie::TYPE_USER, null, null, null, null, 1); $c = new Categorie($db); $cats = $c->containing($object->id, Categorie::TYPE_USER); @@ -2511,7 +2511,7 @@ if ($action == 'create' || $action == 'adduserldap') { // Default language if (!empty($conf->global->MAIN_MULTILANGS)) { print ''.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0, 'string', '', 0, 0, 'id', $langs->trans("WarningNotLangOfInterface", $langs->transnoentitiesnoconv("UserGUISetup"))).''."\n"; - print img_picto('', 'language').$formadmin->select_language($object->lang, 'default_lang', 0, 0, 1); + print img_picto('', 'language', 'class="pictofixedwidth"').$formadmin->select_language($object->lang, 'default_lang', 0, null, '1', 0, 0, 'widthcentpercentminusx maxwidth300'); print ''; print ''; } @@ -2623,7 +2623,7 @@ if ($action == 'create' || $action == 'adduserldap') { print ''.$langs->trans("PostOrFunction").''; print ''; if ($caneditfield) { - print ''; + print ''; } else { print ''; print dol_escape_htmltag($object->job);