Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion volunteers/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ def status_color(self):
colors = {
"FULL": "blue",
"OK": "green",
"MANAGEABLE": "grey",
"MANAGEABLE": "yellow",
"NEEDED": "red"
}
return colors[self.status]
Expand Down
17 changes: 16 additions & 1 deletion volunteers/static/css/master.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions volunteers/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down