diff --git a/volunteers/models.py b/volunteers/models.py index 37c7081..fc1c1f6 100644 --- a/volunteers/models.py +++ b/volunteers/models.py @@ -490,7 +490,7 @@ def status_color(self): colors = { "FULL": "blue", "OK": "green", - "MANAGEABLE": "grey", + "MANAGEABLE": "yellow", "NEEDED": "red" } return colors[self.status] diff --git a/volunteers/static/css/master.css b/volunteers/static/css/master.css index 2e725ab..b244cf9 100644 --- a/volunteers/static/css/master.css +++ b/volunteers/static/css/master.css @@ -1470,6 +1470,11 @@ table.task_list .task-volunteers, table.talk_list .talk-volunteers { background: #337ab7; /* primary */ color: #fff; } +.status-label.yellow, table.task_list tr td.yellow { + background: #f0ad4e; /* yellow for manageable */ + color: #212529; /* dark text for better contrast/WCAG compliance */ + font-weight: 700; /* ensure text appears as bold as white on darker backgrounds */ +} .status-label.grey, table.task_list tr td.gray { background: #6c757d; /* secondary */ color: #fff; @@ -2621,11 +2626,21 @@ ul.privacy-policy { } [data-theme="dark"] ul.messages li.error { - background: #3e2723; + background: #5c1f1f; color: #ff8a80; border-color: #f44336; } +[data-theme="dark"] ul.errorlist { + background-color: #5c1f1f !important; + color: #ff8a80 !important; + border-color: #f44336; +} + +[data-theme="dark"] ul.errorlist li { + color: #ff8a80 !important; +} + [data-theme="dark"] ul.messages li.success { background: #1b5e20; color: #a5d6a7; diff --git a/volunteers/views.py b/volunteers/views.py index 36ed41a..2b84aaf 100644 --- a/volunteers/views.py +++ b/volunteers/views.py @@ -221,17 +221,17 @@ def task_list(request): # get the categories the volunteer is interested in if volunteer: categories_by_task_pref = { - 'tasks': TaskCategory.objects.filter(active=True), + 'Tasks': TaskCategory.objects.filter(active=True), } context['volunteer'] = volunteer context['dr_manhattan_task_sets'] = dr_manhattan_task_sets - context['tasks']['tasks'] = SortedDict.fromkeys(days, {}) + context['tasks']['Tasks'] = SortedDict.fromkeys(days, {}) else: categories_by_task_pref = { # 'preferred tasks': [], - 'tasks': TaskCategory.objects.filter(active=True), + 'Tasks': TaskCategory.objects.filter(active=True), } - context['tasks']['tasks'] = SortedDict.fromkeys(days, {}) + context['tasks']['Tasks'] = SortedDict.fromkeys(days, {}) context['user'] = request.user context['user_in_penta'] = hasattr(request.user, 'volunteer') and request.user.volunteer.penta_account_name is not None and len(request.user.volunteer.penta_account_name)>0