diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index bbcd9a4555f..4a39269c23e 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -862,7 +862,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r //$showlogo=$object->logo; $showlogo=1; - $showbarcode=empty($conf->barcode->enabled)?0:1; + $showbarcode=empty($conf->barcode->enabled)?0:($object->barcode?1:0); if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0; $modulepart='societe'; if ($object->element == 'contact') $modulepart='contact'; @@ -870,9 +870,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r if ($object->element == 'user') $modulepart='userphoto'; print '
'; - //$morehtmlleft='
'.img_picto('', 'title_companies', '', '').'
'; if ($showlogo) $morehtmlleft.='
'.$form->showphoto($modulepart,$object,0,0,0,'photoref').'
'; - //if ($showlogo) $morehtmlleft.='
'.$form->showphoto('societe',$object,0,0,0,'photoref').'
'; if ($showbarcode) $morehtmlleft.='
'.$form->showbarcode($object).'
'; if ($object->element == 'societe' && ! empty($conf->use_javascript_ajax) && $user->rights->societe->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) { $morehtmlright.=ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased'); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 425cb84bdb9..638c758ddc2 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -489,7 +489,7 @@ div.confirmmessage { .maxwidth100 { max-width: 100px; } .maxwidth200 { max-width: 200px; } .maxwidth300 { max-width: 300px; } -.titlefield { width: 25% } +.titlefield { width: 25%; } .hideonsmartphone { display: none; } .noenlargeonsmartphone { width : 50px !important; display: inline !important; } @@ -620,7 +620,7 @@ div.heightref { min-height: 80px; } div.divphotoref { - padding-right: 10px; + padding-right: 20px; } div.statusref { float: right; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 20cbc2dd308..81b15ae7ec5 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -493,6 +493,7 @@ div.confirmmessage { .maxwidth100 { max-width: 100px; } .maxwidth200 { max-width: 200px; } .maxwidth300 { max-width: 300px; } +.titlefield { width: 25%; } .hideonsmartphone { display: none; } .noenlargeonsmartphone { width : 50px !important; display: inline !important; } @@ -500,6 +501,7 @@ div.confirmmessage { .maxwidth100onsmartphone { max-width: 100px; } .maxwidth200onsmartphone { max-width: 200px; } .maxwidth300onsmartphone { max-width: 300px; } +.titlefield { width: auto; } .linkobject { cursor: pointer; } @@ -668,7 +670,7 @@ div.heightref { min-height: 74px; } div.divphotoref { - padding-right: 10px; + padding-right: 20px; } div.statusref { float: right;