Look and feel v12

This commit is contained in:
Laurent Destailleur 2020-03-12 11:13:50 +01:00
parent a6f8608ffd
commit d6a35db754

View File

@ -743,7 +743,7 @@ class DolGraph
if (!empty($this->shownographyet)) if (!empty($this->shownographyet))
{ {
$this->stringtoshow .= '<div style="width:'.$this->width.'px;height:'.$this->height.'px;" class="nographyet"></div>'; $this->stringtoshow .= '<div style="width:'.$this->width.'px;height:'.$this->height.'px;" class="nographyet"></div>';
$this->stringtoshow .= '<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>'; $this->stringtoshow .= '<div class="nographyettext margintoponly">'.$langs->trans("NotEnoughDataYet").'...</div>';
return; return;
} }
@ -1033,7 +1033,7 @@ class DolGraph
if (!empty($this->shownographyet)) if (!empty($this->shownographyet))
{ {
$this->stringtoshow .= '<div style="width:'.$this->width.(strpos($this->width, '%') > 0 ? '': 'px').'; height:'.$this->height.'px;" class="nographyet"></div>'; $this->stringtoshow .= '<div style="width:'.$this->width.(strpos($this->width, '%') > 0 ? '': 'px').'; height:'.$this->height.'px;" class="nographyet"></div>';
$this->stringtoshow .= '<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>'; $this->stringtoshow .= '<div class="nographyettext margintoponly">'.$langs->trans("NotEnoughDataYet").'...</div>';
return; return;
} }
@ -1313,11 +1313,11 @@ class DolGraph
if ($shownographyet) if ($shownographyet)
{ {
$s = '<div class="nographyet" style="width:'.(preg_match('/%/', $this->width) ? $this->width : $this->width.'px').'; height:'.(preg_match('/%/', $this->height) ? $this->height : $this->height.'px').';"></div>'; $s = '<div class="nographyet" style="width:'.(preg_match('/%/', $this->width) ? $this->width : $this->width.'px').'; height:'.(preg_match('/%/', $this->height) ? $this->height : $this->height.'px').';"></div>';
$s .= '<div class="nographyettext">'; $s .= '<div class="nographyettext margintoponly">';
if (is_numeric($shownographyet)) { if (is_numeric($shownographyet)) {
$s .= $langs->trans("NotEnoughDataYet"); $s .= $langs->trans("NotEnoughDataYet").'...';
} else { } else {
$s .= $shownographyet; $s .= $shownographyet.'...';
} }
$s .= '</div>'; $s .= '</div>';
return $s; return $s;