diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index e67315adebb..53f77262db1 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -4794,9 +4794,10 @@ class Form * @param int $width Width of photo * @param int $height Height of photo (auto if 0) * @param int $caneditfield Add edit fields + * @param string $photologo CSS name to use on img for photo * @return string HTML code to output photo */ - static function showphoto($modulepart,$object,$width=100,$height=0,$caneditfield=0) + static function showphoto($modulepart,$object,$width=100,$height=0,$caneditfield=0,$cssclass='photowithmargin') { global $conf,$langs; @@ -4839,13 +4840,13 @@ class Form { // TODO Link to large image $ret.=''; - $ret.=''; + $ret.='Photo'; $ret.=''; } else if ($altfile && file_exists($dir."/".$altfile)) { $ret.=''; - $ret.=''; + $ret.='Photo alt'; $ret.=''; } else diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 7c9b90a8737..13ef97c514e 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1439,7 +1439,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a // User photo $toprightmenu.='
'; - $toprightmenu.=$user->getPhotoUrl(16,16); + $toprightmenu.=$user->getPhotoUrl(16,16,'loginphoto'); $toprightmenu.='
'; $toprightmenu.='
'; diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 188eb8d8e1a..12e05c3a45d 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -482,7 +482,7 @@ if ($id > 0 || $ref) print ''; } - // Stock + // Stock alert threshold print ''.$form->editfieldkey("StockLimit",'stocklimit',$product->seuil_stock_alerte,$product,$user->rights->produit->creer).''; print $form->editfieldval("StockLimit",'stocklimit',$product->seuil_stock_alerte,$product,$user->rights->produit->creer); print ''; @@ -502,7 +502,7 @@ if ($id > 0 || $ref) $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)?$langs->trans("ReStockOnValidateOrder").'
':''); $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)?$langs->trans("ReStockOnDispatchOrder").'
':''); print ''; - print $form->textwithtooltip($langs->trans("PhysicalStock"),$text_stock_options,2,1,img_picto('', 'info'),'',0); + print $form->textwithtooltip($langs->trans("PhysicalStock") ,$text_stock_options, 2, 1, img_picto('', 'info'), '', 2); print ''; print ''.$product->stock_reel; if ($product->seuil_stock_alerte && ($product->stock_reel < $product->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit")); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 477bded4696..2a63e558801 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -995,7 +995,9 @@ img.login, img.printer, img.entity { color: white; font-weight: bold; } - +img.loginphoto { + border-radius: 2px; +} .span-icon-user { background: url() no-repeat scroll 7px 7px; } @@ -2435,13 +2437,13 @@ div.dolgraph div.legend table tbody tr { height: auto; } margin-bottom: 2px; margin-top: 2px; } -.photointooltip, .photologo { +.photowithmargin { -webkit-box-shadow: 0px 0px 3px #777; -moz-box-shadow: 0px 0px 3px #777; box-shadow: 0px 0px 3px #777; - margin-top: 6px; } .photointoolitp { + margin-top: 6px; float: left; /*text-align: center; */ } diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 95215cc7d41..0da1b5f8d90 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1786,14 +1786,15 @@ class User extends CommonObject * * @param int $width Width of image * @param int $height Height of image + * @param string $cssclass Force a css class * @return string String with URL link */ - function getPhotoUrl($width, $height) + function getPhotoUrl($width, $height, $cssclass='') { $result=''; $result.=''; - $result.=Form::showphoto('userphoto', $this, $width, $height); + $result.=Form::showphoto('userphoto', $this, $width, $height, 0, $cssclass); $result.=''; return $result;