lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Look and feel v11

Browse Source
This commit is contained in:
Laurent Destailleur 2019-12-01 13:04:14 +01:00
parent 408c8ccd67
commit b8ffafc603
2 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
htdocs/opensurvey/class/opensurveysondage.class.php
View File

@ -646,42 +646,25 @@ class Opensurveysondage extends CommonObject
// phpcs:enable // phpcs:enable
global $langs, $conf; global $langs, $conf;
//print 'x'.$status.'-'.$billed; if (empty($this->labelStatus) || empty($this->labelStatusShort))
if ($mode == 0)
{ {
if ($status==self::STATUS_DRAFT) return $langs->trans('Draft'); global $langs;
elseif ($status==self::STATUS_VALIDATED) return $langs->trans('Opened'); //$langs->load("mymodule");
elseif ($status==self::STATUS_CLOSED) return $langs->trans('Closed'); $this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Opened');
$this->labelStatus[self::STATUS_CLOSED] = $langs->trans('Closed');
$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Opened');
$this->labelStatusShort[self::STATUS_CLOSED] = $langs->trans('Closed');
} }
elseif ($mode == 1)
{ $statusType = 'status'.$status;
if ($status==self::STATUS_DRAFT) return $langs->trans('Draft'); if ($status == self::STATUS_VALIDATED) {
elseif ($status==self::STATUS_VALIDATED) return $langs->trans('Opened'); if (0) $statusType = 'status1';
elseif ($status==self::STATUS_CLOSED) return $langs->trans('Closed'); else $statusType = 'status4';
}
elseif ($mode == 2)
{
if ($status==self::STATUS_DRAFT) return img_picto($langs->trans('Draft'), 'statut0').' '.$langs->trans('Draft');
elseif ($status==self::STATUS_VALIDATED) return img_picto($langs->trans('Opened'), 'statut1').' '.$langs->trans('Opened');
elseif ($status==self::STATUS_CLOSED) return img_picto($langs->trans('Closed'), 'statut6').' '.$langs->trans('Closed');
}
elseif ($mode == 3)
{
if ($status==self::STATUS_DRAFT) return img_picto($langs->trans('Draft'), 'statut0');
elseif ($status==self::STATUS_VALIDATED) return img_picto($langs->trans('Opened'), 'statut1');
elseif ($status==self::STATUS_CLOSED) return img_picto($langs->trans('Closed'), 'statut6');
}
elseif ($mode == 4)
{
if ($status==self::STATUS_DRAFT) return img_picto($langs->trans('Draft'), 'statut0').' '.$langs->trans('Draft');
elseif ($status==self::STATUS_VALIDATED) return img_picto($langs->trans('Opened').$billedtext, 'statut1').' '.$langs->trans('Opened');
elseif ($status==self::STATUS_CLOSED) return img_picto($langs->trans('Closed'), 'statut6').' '.$langs->trans('Closed');
}
elseif ($mode == 5)
{
if ($status==self::STATUS_DRAFT) return '<span class="hideonsmartphone">'.$langs->trans('Draft').' </span>'.img_picto($langs->trans('Draft'), 'statut0');
elseif ($status==self::STATUS_VALIDATED) return '<span class="hideonsmartphone">'.$langs->trans('Opened').' </span>'.img_picto($langs->trans('Opened'), 'statut1');
elseif ($status==self::STATUS_CLOSED) return '<span class="hideonsmartphone">'.$langs->trans('Closed').' </span>'.img_picto($langs->trans('Closed'), 'statut6');
} }
if ($status == self::STATUS_CLOSED) $statusType = 'status6';
return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
} }
} }

2
htdocs/opensurvey/list.php
View File

@ -413,7 +413,7 @@ while ($i < min($num, $limit))
print '</td>'; print '</td>';
if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['nbfield']++;
print'<td class="center">'.$opensurvey_static->getLibStatut(5).'</td>'."\n"; print '<td class="center">'.$opensurvey_static->getLibStatut(5).'</td>'."\n";
if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['nbfield']++;
// Extra fields // Extra fields