Skip to content

Commit 1338dd4

Browse files
committed
Fixes Color consistency issue in question page
1 parent 42ff963 commit 1338dd4

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

src/pretalx/orga/forms/cfp.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,24 @@ def __init__(self, *args, obj, **kwargs):
8787
self.fields[field_name].widget.attrs["placeholder"] = ""
8888
for attribute in self.request_require_fields:
8989
field_name = f"cfp_ask_{attribute}"
90+
visibility = obj.cfp.fields.get(attribute, default_fields()[attribute])["visibility"]
91+
if visibility == "optional":
92+
css_class = "btn btn-outline-dark btn-sm"
93+
elif visibility == "required":
94+
css_class = "btn btn-outline-success btn-sm"
95+
else:
96+
css_class = "btn btn-outline-danger btn-sm"
9097
self.fields[field_name] = forms.ChoiceField(
9198
required=True,
9299
initial=obj.cfp.fields.get(attribute, default_fields()[attribute])[
93100
"visibility"
94101
],
95102
choices=[
96-
("do_not_ask", _("Do not ask")),
97-
("optional", _("Ask, but do not require input")),
98-
("required", _("Ask and require input")),
103+
("do_not_ask", _("Not Active")),
104+
("optional", _("Optional")),
105+
("required", _("Required")),
99106
],
107+
widget=forms.Select(attrs={'class': css_class}),
100108
)
101109
if not obj.is_multilingual:
102110
self.fields.pop("cfp_ask_content_locale", None)

src/pretalx/orga/templates/orga/cfp/question_view.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,19 @@
7474
<td class="text-center">
7575
<a href="{{ question.urls.active }}" >
7676
{% if question.active %}
77-
<i class="fa fa-toggle-on "></i>
77+
<i class="fa fa-toggle-on text-dark"></i>
7878
{% else %}
79-
<i class="fa fa-toggle-off "></i>
79+
<i class="fa fa-toggle-off text-dark"></i>
8080
{% endif %}
8181
</a>
8282
</td>
8383
<td class="text-center">
8484
{% if question.answer_count == 0%}
8585
<a href="{{ question.urls.public }}" >
8686
{% if question.is_public == True %}
87-
<i class="fa fa-toggle-on"></i>
87+
<i class="fa fa-toggle-on text-dark "></i>
8888
{% else %}
89-
<i class="fa fa-toggle-off "></i>
89+
<i class="fa fa-toggle-off text-dark"></i>
9090
{% endif %}
9191
</a>
9292
{% else %}

0 commit comments

Comments
 (0)