diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index cd2add23ac2..c141e1d7aed 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2283,7 +2283,7 @@ function img_picto($titlealt, $picto, $options = '', $pictoisfullpath = false, $ else { $tmparray=array(0=>$titlealt); - if (preg_match('/:[^\s]/',$titlealt)) $tmparray=explode(':',$titlealt); // We explode if we have TextA:TextB. Not if we have TextA: TextB + if (preg_match('/:[^\s0-9]/',$titlealt)) $tmparray=explode(':',$titlealt); // We explode if we have TextA:TextB. Not if we have TextA: TextB $title=$tmparray[0]; $alt=empty($tmparray[1])?'':$tmparray[1]; return ''.dol_escape_htmltag($alt).''; // Alt is used for accessibility, title for popup diff --git a/htdocs/product/list.php b/htdocs/product/list.php index fa0f18f538c..671e6db3af3 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -434,7 +434,7 @@ else if (! empty($arrayfields['pfp.ref_fourn']['checked'])) print_liste_field_titre($arrayfields['pfp.ref_fourn']['label'], $_SERVER["PHP_SELF"],"pfp.ref_fourn","",$param,"",$sortfield,$sortorder); if (! empty($arrayfields['p.label']['checked'])) print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"],"p.label","",$param,"",$sortfield,$sortorder); if (! empty($arrayfields['p.barcode']['checked'])) print_liste_field_titre($arrayfields['p.barcode']['label'], $_SERVER["PHP_SELF"],"p.barcode","",$param,"",$sortfield,$sortorder); - if (! empty($arrayfields['p.duration']['checked'])) print_liste_field_titre($arrayfields['p.duration']['label'], $_SERVER["PHP_SELF"],"p.duration","",$param,"",$sortfield,$sortorder); + if (! empty($arrayfields['p.duration']['checked'])) print_liste_field_titre($arrayfields['p.duration']['label'], $_SERVER["PHP_SELF"],"p.duration","",$param,'align="center"',$sortfield,$sortorder); if (! empty($arrayfields['p.sellprice']['checked'])) print_liste_field_titre($arrayfields['p.sellprice']['label'], $_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder); if (! empty($arrayfields['p.minbuyprice']['checked'])) print_liste_field_titre($arrayfields['p.minbuyprice']['label'], $_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder); if (! empty($arrayfields['p.seuil_stock_alerte']['checked'])) print_liste_field_titre($arrayfields['p.seuil_stock_alerte']['label'], $_SERVER["PHP_SELF"],"p.seuil_stock_alerte","",$param,'align="right"',$sortfield,$sortorder); diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php index e7af303d694..3cf3fc5c8d2 100644 --- a/htdocs/product/stats/card.php +++ b/htdocs/product/stats/card.php @@ -340,30 +340,30 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all') print "\n".'
'."\n"; } + // Date generation + if ($graphfiles[$key]['output'] && ! $px->isGraphKo()) + { + if (file_exists($dir."/".$graphfiles[$key]['file']) && filemtime($dir."/".$graphfiles[$key]['file'])) $dategenerated=$langs->trans("GeneratedOn",dol_print_date(filemtime($dir."/".$graphfiles[$key]['file']),"dayhour")); + else $dategenerated=$langs->trans("GeneratedOn",dol_print_date(dol_now(),"dayhour")); + } + else + { + print $dategenerated=($mesg?''.$mesg.'':$langs->trans("ChartNotGenerated")); + } + $linktoregenerate='id).((string) $type != ''?'&type='.$type:'').'&action=recalcul&mode='.$mode.'">'.img_picto($langs->trans("ReCalculate").' ('.$dategenerated.')','refresh').''; + // Show graph - print ''; // Label - print ''; + print ''; + print ''; + print ''; // Image print ''; - // Date generation - print ''; - if ($graphfiles[$key]['output'] && ! $px->isGraphKo()) - { - if (file_exists($dir."/".$graphfiles[$key]['file']) && filemtime($dir."/".$graphfiles[$key]['file'])) print ''; - else print ''; - } - else - { - print ''; - } - print ''; - print ''; print '
'; + print '
'; print $graphfiles[$key]['label']; - print '
'.$linktoregenerate.'
'; print $graphfiles[$key]['output']; print '
'.$langs->trans("GeneratedOn",dol_print_date(filemtime($dir."/".$graphfiles[$key]['file']),"dayhour")).''.$langs->trans("GeneratedOn",dol_print_date(dol_now(),"dayhour")).''.($mesg?''.$mesg.'':$langs->trans("ChartNotGenerated")).'id).((string) $type != ''?'&type='.$type:'').'&action=recalcul&mode='.$mode.'">'.img_picto($langs->trans("ReCalculate"),'refresh').'
'; if ($i % 2 == 0) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index d1bf48c4656..2834025ca14 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -641,7 +641,7 @@ div.myavailability { .minwidth500imp { min-width: 300px !important; } } -@media only screen and (max-width: 960px) +@media only screen and (max-width: 1000px) { .maxwidthonsmartphone { max-width: 100px; } .minwidth50imp { min-width: 50px !important; } @@ -822,7 +822,7 @@ div.ficheaddleft { else print "margin-top: 10px;\n"; ?> } /* Force values on one colum for small screen */ -@media only screen and (max-width: 960px) +@media only screen and (max-width: 1000px) { div.fiche { margin-: px; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index d4b96595d61..fc4fded0d01 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -635,7 +635,7 @@ div.myavailability { .minwidth500imp { min-width: 300px !important; } } -@media only screen and (max-width: 960px) +@media only screen and (max-width: 1000px) { .maxwidthonsmartphone { max-width: 100px; } .minwidth50imp { min-width: 50px !important; }