Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

NEW color in action list and translated

Browse Source
This commit is contained in:
lvessiller
2022-07-13 16:52:57 +02:00
parent 1414f72794
commit cda6e9184d
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/admin/agenda_other.php
View File

@@ -121,8 +121,8 @@ if ($action == 'set') {
$errors[] = $db->lasterror();
}
$event_color = preg_replace('/[^0-9a-f#]/i', '', (string) GETPOST('event_progress_color', 'alphanohtml'));
$res = dolibarr_set_const($db, 'AGENDA_EVENT_PROGRESS_COLOR', $event_color, 'chaine', 0, '', $conf->entity);
$event_color = preg_replace('/[^0-9a-f#]/i', '', (string) GETPOST('event_current_color', 'alphanohtml'));
$res = dolibarr_set_const($db, 'AGENDA_EVENT_CURRENT_COLOR', $event_color, 'chaine', 0, '', $conf->entity);
if (!$res > 0) {
$error++;
$errors[] = $db->lasterror();
@@ -459,12 +459,12 @@ print '<td class="center">&nbsp;</td>'."\n";
print '<td class="right">'."\n";
print $formother->selectColor($conf->global->AGENDA_EVENT_PAST_COLOR, 'event_past_color');
print '</td></tr>'."\n";
// AGENDA_EVENT_PROGRESS_COLOR
// AGENDA_EVENT_CURRENT_COLOR
print '<tr class="oddeven">'."\n";
print '<td>'.$langs->trans('AGENDA_EVENT_PROGRESS_COLOR').'</td>'."\n";
print '<td>'.$langs->trans('AGENDA_EVENT_CURRENT_COLOR').'</td>'."\n";
print '<td class="center">&nbsp;</td>'."\n";
print '<td class="right">'."\n";
print $formother->selectColor($conf->global->AGENDA_EVENT_PROGRESS_COLOR, 'event_progress_color');
print $formother->selectColor($conf->global->AGENDA_EVENT_CURRENT_COLOR, 'event_current_color');
print '</td></tr>'."\n";
// AGENDA_EVENT_FUTURE_COLOR
print '<tr class="oddeven">'."\n";

6
htdocs/comm/action/list.php
View File

@@ -947,9 +947,9 @@ while ($i < $imaxinloop) {
$event_color = $conf->global->AGENDA_EVENT_PAST_COLOR;
$event_more_class = 'event-past';
} else {
// today event
$event_color = $conf->global->AGENDA_EVENT_PROGRESS_COLOR;
$event_more_class = 'event-progress';
// current event
$event_color = $conf->global->AGENDA_EVENT_CURRENT_COLOR;
$event_more_class = 'event-current';
}
}

3
htdocs/langs/en_US/admin.lang
View File

@@ -1806,6 +1806,9 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
AGENDA_EVENT_PAST_COLOR=Past event color
AGENDA_EVENT_CURRENT_COLOR=Current event color
AGENDA_EVENT_FUTURE_COLOR=Future event color
AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification

3
htdocs/langs/fr_FR/admin.lang
View File

@@ -1806,6 +1806,9 @@ AGENDA_USE_EVENT_TYPE=Utiliser les types d'événements (gérés dans le menu Co
AGENDA_USE_EVENT_TYPE_DEFAULT=Configurez automatiquement cette valeur par défaut pour le type d'événement dans le formulaire de création d'événement.
AGENDA_DEFAULT_FILTER_TYPE=Positionner automatiquement ce type d'événement dans le filtre de recherche de la vue agenda
AGENDA_DEFAULT_FILTER_STATUS=Positionner automatiquement ce statut d'événement dans le filtre de recherche de la vue agenda
AGENDA_EVENT_PAST_COLOR=Couleur de l'événement passé
AGENDA_EVENT_CURRENT_COLOR=Couleur de l'événement en cours
AGENDA_EVENT_FUTURE_COLOR=Couleur de l'événement futur
AGENDA_DEFAULT_VIEW=Quel onglet voulez-vous voir ouvrir par défaut quand on choisit le menu Agenda
AGENDA_REMINDER_BROWSER=Activer le rappel d'événement <b> sur le navigateur de l'utilisateur </b> (lorsque la date de l'événement est atteinte, une popup est affichée sur la navigateur. Chaque utilisateur peut désactiver de telles notification depuis la configuration des notifications de son navigateur)
AGENDA_REMINDER_BROWSER_SOUND=Activer les notifications sonores.