diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index cd2add23ac20be26158453ff12a83419a3cf2f38..c141e1d7aedd0da6d8a85eff803840f15dae1d0f 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 '<img src="'.$fullpathpicto.'" border="0" alt="'.dol_escape_htmltag($alt).'"'.($notitle?'':' title="'.dol_escape_htmltag($title).'"').($options?' '.$options:'').'>'; // Alt is used for accessibility, title for popup diff --git a/htdocs/product/list.php b/htdocs/product/list.php index fa0f18f538cd770165567595c7510f4e96d1f58c..671e6db3af36e9718ea840006581cd75558e6ddc 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 e7af303d694f799441a62169980bd56a7ff711e5..3cf3fc5c8d26b553880e598865077ffa7432848b 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".'<div class="fichehalfright"><div class="ficheaddleft">'."\n"; } - // Show graph - - print '<table class="noborder" width="100%">'; - // Label - print '<tr class="liste_titre"><td colspan="2">'; - print $graphfiles[$key]['label']; - print '</td></tr>'; - // Image - print '<tr class="impair"><td colspan="2" class="nohover" align="center">'; - print $graphfiles[$key]['output']; - print '</td></tr>'; // Date generation - print '<tr>'; if ($graphfiles[$key]['output'] && ! $px->isGraphKo()) { - if (file_exists($dir."/".$graphfiles[$key]['file']) && filemtime($dir."/".$graphfiles[$key]['file'])) print '<td>'.$langs->trans("GeneratedOn",dol_print_date(filemtime($dir."/".$graphfiles[$key]['file']),"dayhour")).'</td>'; - else print '<td>'.$langs->trans("GeneratedOn",dol_print_date(dol_now(),"dayhour")).'</td>'; + 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 '<td>'.($mesg?'<font class="error">'.$mesg.'</font>':$langs->trans("ChartNotGenerated")).'</td>'; + print $dategenerated=($mesg?'<font class="error">'.$mesg.'</font>':$langs->trans("ChartNotGenerated")); } - print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).((string) $type != ''?'&type='.$type:'').'&action=recalcul&mode='.$mode.'">'.img_picto($langs->trans("ReCalculate"),'refresh').'</a></td>'; + $linktoregenerate='<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).((string) $type != ''?'&type='.$type:'').'&action=recalcul&mode='.$mode.'">'.img_picto($langs->trans("ReCalculate").' ('.$dategenerated.')','refresh').'</a>'; + + // Show graph + print '<table class="noborder" width="100%">'; + // Label + print '<tr class="liste_titre"><td>'; + print $graphfiles[$key]['label']; + print '</td>'; + print '<td align="right">'.$linktoregenerate.'</td>'; print '</tr>'; + // Image + print '<tr class="impair"><td colspan="2" class="nohover" align="center">'; + print $graphfiles[$key]['output']; + print '</td></tr>'; print '</table>'; if ($i % 2 == 0) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index d1bf48c4656813b76de11e35c566c929ed897c56..2834025ca1440368f6ea4b738892d89f15c42b26 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-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:($dol_hide_leftmenu?'6':'20')); ?>px; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index d4b96595d6199f638cf2322c0b59bffdf836046d..fc4fded0d01b23b3779492b8da3aa58b33fbc112 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; }