diff --git a/loko/notifications/models.py b/loko/notifications/models.py index a41d9ff..4e63177 100644 --- a/loko/notifications/models.py +++ b/loko/notifications/models.py @@ -364,9 +364,33 @@ class Discussion(models.Model): ] FLAG_META = { - FLAG_RED: {'label': _('Important / À traiter'), 'short_label': _('Important'), 'color': 'danger', 'icon': 'bi-flag-fill'}, - FLAG_ORANGE: {'label': _('En cours'), 'short_label': _('En cours'), 'color': 'warning', 'icon': 'bi-flag-fill'}, - FLAG_GREEN: {'label': _('Traité / Fait'), 'short_label': _('Traité'), 'color': 'success', 'icon': 'bi-flag-fill'}, + FLAG_RED: { + 'label': _('Important / À traiter'), + 'short_label': _('Important'), + 'color': '#dc3545', + 'color_class': 'danger', + 'icon': 'bi-flag-fill', + 'badge_class': 'bg-danger text-white', + 'style': 'background-color: #dc3545 !important; color: #ffffff !important;', + }, + FLAG_ORANGE: { + 'label': _('En cours'), + 'short_label': _('En cours'), + 'color': '#fd7e14', + 'color_class': 'warning', + 'icon': 'bi-flag-fill', + 'badge_class': 'text-white', + 'style': 'background-color: #fd7e14 !important; color: #ffffff !important;', + }, + FLAG_GREEN: { + 'label': _('Traité / Fait'), + 'short_label': _('Traité'), + 'color': '#198754', + 'color_class': 'success', + 'icon': 'bi-flag-fill', + 'badge_class': 'bg-success text-white', + 'style': 'background-color: #198754 !important; color: #ffffff !important;', + }, } flag = models.CharField( diff --git a/loko/notifications/templates/notifications/discussion_list.html b/loko/notifications/templates/notifications/discussion_list.html index fd4ce49..5c1e3b6 100644 --- a/loko/notifications/templates/notifications/discussion_list.html +++ b/loko/notifications/templates/notifications/discussion_list.html @@ -112,6 +112,7 @@ {% if item.discussion.flag %} {{ item.discussion.flag_info.label }} diff --git a/loko/notifications/templates/notifications/inbox.html b/loko/notifications/templates/notifications/inbox.html index 0356560..c41d34e 100644 --- a/loko/notifications/templates/notifications/inbox.html +++ b/loko/notifications/templates/notifications/inbox.html @@ -417,6 +417,7 @@ {% if item.discussion.flag %} {{ item.discussion.flag_info.label }} diff --git a/loko/notifications/templates/notifications/inbox_mobile.html b/loko/notifications/templates/notifications/inbox_mobile.html index 1c1d5ca..a9dc042 100644 --- a/loko/notifications/templates/notifications/inbox_mobile.html +++ b/loko/notifications/templates/notifications/inbox_mobile.html @@ -345,7 +345,8 @@
{% if item.discussion.flag %} - + {{ item.discussion.flag_info.label }} {% endif %} diff --git a/loko/notifications/views.py b/loko/notifications/views.py index af3aaf2..30b9f87 100644 --- a/loko/notifications/views.py +++ b/loko/notifications/views.py @@ -672,6 +672,7 @@ def discussion_set_flag(request, pk): 'label': str(discussion.flag_info.get('label', '')), 'color': discussion.flag_info.get('color', ''), 'badge_class': discussion.flag_info.get('badge_class', ''), + 'style': discussion.flag_info.get('style', ''), 'icon': discussion.flag_info.get('icon', 'bi-flag-fill'), 'set_by': ( discussion.flag_set_by.get_full_name().strip() or discussion.flag_set_by.username