diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php index dde2a559cd3..18a09af6ace 100644 --- a/htdocs/core/boxes/box_contacts.php +++ b/htdocs/core/boxes/box_contacts.php @@ -82,7 +82,8 @@ class box_contacts extends ModeleBoxes $societestatic=new Societe($db); $line = 0; - while ($line < $num) { + while ($line < $num) + { $objp = $db->fetch_object($result); $datec=$db->jdate($objp->datec); $datem=$db->jdate($objp->tms); @@ -92,7 +93,6 @@ class box_contacts extends ModeleBoxes $contactstatic->firstname=$objp->firstname; $contactstatic->civility_id=$objp->civility_id; $contactstatic->statut=$objp->status; - $societestatic->id = $objp->fk_soc; $societestatic->code_client = $objp->code_client; $societestatic->name = $objp->socname; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 1e256effa5f..acdb6d24efe 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4297,9 +4297,9 @@ function dolGetFirstLastname($firstname,$lastname,$nameorder=-1) $ret=''; // If order not defined, we use the setup if ($nameorder < 0) $nameorder=(empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)); - if ($nameorder && $nameorder != '2') + if ($nameorder && ((string) $nameorder != '2')) { - $ret.=$firstname; + $ret.=$firstname; if ($firstname && $lastname) $ret.=' '; $ret.=$lastname; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index b756f383957..9c0d63794dd 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2722,8 +2722,12 @@ table.valid { border-radius: 4px; } #tiptip_content { - background-color: rgb(255,255,255); - background-color: rgba(255,255,255,0.95); +-moz-border-radius:0px; +-webkit-border-radius: 0px; +border-radius: 0px; +background-color: rgb(255,255,255); +/* background-color: rgb(255,255,255); + background-color: rgba(255,255,255,0.95);*/ line-height: 1.4em; min-width: 200px; } diff --git a/htdocs/theme/md_exp/style.css.php b/htdocs/theme/md_exp/style.css.php index 272531958bb..d2a36f35686 100644 --- a/htdocs/theme/md_exp/style.css.php +++ b/htdocs/theme/md_exp/style.css.php @@ -691,12 +691,14 @@ div#tmenu_tooltip { display:none; background: rgb(); + /* background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(128,128,128,.3)) ); + */ } @@ -2526,14 +2528,20 @@ padding: 2px; z-index: 3000; background-color: #EFCFAA; opacity: 1; --moz-border-radius:3px; --webkit-border-radius: 3px; -border-radius: 3px; +-moz-border-radius:0px; +-webkit-border-radius: 0px; +border-radius: 0px; } + #tiptip_content { - background-color: rgb(252,248,246); - background-color: rgba(252,248,246,0.95); +-moz-border-radius:0px; +-webkit-border-radius: 0px; +border-radius: 0px; +background-color: rgb(255,255,255); +/* background-color: rgb(252,248,246); + background-color: rgba(252,248,246,0.95);*/ line-height: 1.4em; + min-width: 200px; } /* ============================================================================== */