diff --git a/c3l_membership/forms.py b/c3l_membership/forms.py --- a/c3l_membership/forms.py +++ b/c3l_membership/forms.py @@ -117,7 +117,7 @@ class MembershipForm(FlaskForm): validators=[InputRequired(lazy_gettext("Please select one of the options!"))], ) - birthday = DateField(lazy_gettext("Birthday"), validators=[Optional()]) + birthday = DateField(lazy_gettext("Birthday"), validators=[InputRequired()]) street = StringField( lazy_gettext("Nr., Street"), @@ -151,9 +151,4 @@ class MembershipForm(FlaskForm): validators=[InputRequired()], ) - minor_member = BooleanField( - lazy_gettext( - "I am under 18 years of age and have the approval of my legal representative." - ) - ) submit = SubmitField(lazy_gettext("Become a member")) diff --git a/c3l_membership/static/style.css b/c3l_membership/static/style.css --- a/c3l_membership/static/style.css +++ b/c3l_membership/static/style.css @@ -42,3 +42,12 @@ p { .text-justify { text-align: justify; } + +legend { + font-weight: bold; + font-size: 1.25em; +} + +h4 { + margin-bottom: 0.5em; +} diff --git a/c3l_membership/templates/index.html b/c3l_membership/templates/index.html --- a/c3l_membership/templates/index.html +++ b/c3l_membership/templates/index.html @@ -74,7 +74,7 @@
- {{ form.membership.label }} +

{{ form.membership.label }}

{% for option in form.membership %}
-
- -
-

{% trans %}What's difference between the different membership options?{% endtrans %}

+

{% trans %}What's difference between the different membership options?{% endtrans %}

{% trans %}All the options include to following benefits:{% endtrans %}

{% trans %}You can read more on the membership here.{% endtrans %}

-

{% trans %}What are the membership fees?{% endtrans %}

+

{% trans %}What are the membership fees?{% endtrans %}

{% trans regular_fee=config["REGULAR_FEE"], supporting_fee=config["SUPPORTING_FEE"] %}The membership fee for the regular membership is {{ regular_fee }}€ per year. The membership fee for the supporting membership is {{ supporting_fee }}€ per year. If you are a student, all membership fees are {{ supporting_fee }}€ per year. For that please select the corresponding option.{% endtrans %}

-

{% trans %}I cannot afford the membership?{% endtrans %}

+

{% trans %}I cannot afford the membership?{% endtrans %}

{% trans %}If you cannot afford the membership, please contact us via info@c3l.lu first, before filling out the membership form. We will try to find a solution together.{% endtrans %}

- {{ form.payment.label }} +

{{ form.payment.label }}

{% for option in form.payment %}
- {% trans %}Additional information{% endtrans %}
{{ form.birthday.label }} {{ form.birthday(class="pure-input-1 field-error" if form.birthday.errors else "pure-input-1") }}
+
+

{% trans %}Why do you ask for the birthday?{% endtrans %}

+

{% trans %}This information helps us with a few different things:{% endtrans %}

+ +
+ {% trans %}Additional information (Optional){% endtrans %}
{{ form.street.label }} diff --git a/c3l_membership/templates/member.html b/c3l_membership/templates/member.html --- a/c3l_membership/templates/member.html +++ b/c3l_membership/templates/member.html @@ -77,7 +77,7 @@
{% trans %}Minor Member:{% endtrans %}
-
{{ _("Yes") if form.minor_member.data else _("No") }}
+
{{ _("Yes") if minor_member else _("No") }}

{% trans %}Send this document to the Chaos Computer Club Lëtzebuerg!{% endtrans %}

@@ -121,7 +121,7 @@

{% trans %}Luxembourg, the{% endtrans %}

- {{ _("Signature of your legal representative") if form.minor_member.data else _("Your signature") }} + {{ _("Signature of your legal representative") if minor_member else _("Your signature") }}