diff --git a/apps/member/forms.py b/apps/member/forms.py index 40c23485..b5577bcc 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -41,6 +41,10 @@ class ProfileForm(forms.ModelForm): last_report = forms.DateTimeField(required=False, disabled=True, label=_("Last report date")) + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.fields['address'].widget.attrs.update({"placeholder": "4 avenue des Sciences, 91190 GIF-SUR-YVETTE"}) + def save(self, commit=True): if not self.instance.section or (("department" in self.changed_data or "promotion" in self.changed_data) and "section" not in self.changed_data): diff --git a/apps/member/templates/member/profile_detail.html b/apps/member/templates/member/profile_detail.html index 297af21c..35728191 100644 --- a/apps/member/templates/member/profile_detail.html +++ b/apps/member/templates/member/profile_detail.html @@ -1,5 +1,8 @@ {% extends "member/noteowner_detail.html" %} +{# Use a fluid-width container #} +{% block containertype %}container-fluid{% endblock %} + {% block profile_info %} {% include "member/profile_info.html" %} {% endblock %} diff --git a/apps/note/templates/note/conso_form.html b/apps/note/templates/note/conso_form.html index 52c6b94f..29acb3de 100644 --- a/apps/note/templates/note/conso_form.html +++ b/apps/note/templates/note/conso_form.html @@ -5,6 +5,9 @@ {# Remove page title #} {% block contenttitle %}{% endblock %} +{# Use a fluid-width container #} +{% block containertype %}container-fluid{% endblock %} + {% block content %}
diff --git a/apps/registration/forms.py b/apps/registration/forms.py index 02b9472e..ad258cb1 100644 --- a/apps/registration/forms.py +++ b/apps/registration/forms.py @@ -22,6 +22,11 @@ class SignUpForm(UserCreationForm): self.fields['email'].required = True self.fields['email'].help_text = _("This address must be valid.") + # Give some example + self.fields['first_name'].widget.attrs.update({"placeholder": "Sacha"}) + self.fields['last_name'].widget.attrs.update({"placeholder": "Ketchum"}) + self.fields['email'].widget.attrs.update({"placeholder": "mail@example.com"}) + def clean_username(self): value = self.cleaned_data["username"] if Alias.objects.filter(normalized_name=Alias.normalize(value)).exists(): diff --git a/apps/wei/templates/wei/weiclub_detail.html b/apps/wei/templates/wei/weiclub_detail.html index d0e8f8e9..f359933f 100644 --- a/apps/wei/templates/wei/weiclub_detail.html +++ b/apps/wei/templates/wei/weiclub_detail.html @@ -1,5 +1,8 @@ {% extends "member/noteowner_detail.html" %} +{# Use a fluid-width container #} +{% block containertype %}container-fluid{% endblock %} + {% block profile_info %} {% include "wei/weiclub_info.html" %} {% endblock %} diff --git a/note_kfet/templates/base.html b/note_kfet/templates/base.html index e50defcb..5e8d3d90 100644 --- a/note_kfet/templates/base.html +++ b/note_kfet/templates/base.html @@ -72,6 +72,9 @@ SPDX-License-Identifier: GPL-3.0-or-later .bs-tooltip-bottom .arrow::before { border-bottom-color: rgba(0,0,0,.250); } + .container-fluid { + max-width: 1600px; + } {% block extracss %}{% endblock %} @@ -167,7 +170,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
-
+
{% if request.user.is_authenticated and not request.user.profile.email_confirmed %}
{% trans "Your e-mail address is not validated. Please check your mail inbox and click on the validation link." %} diff --git a/apps/registration/templates/registration/logged_out.html b/note_kfet/templates/registration/logged_out.html similarity index 100% rename from apps/registration/templates/registration/logged_out.html rename to note_kfet/templates/registration/logged_out.html diff --git a/apps/registration/templates/registration/login.html b/note_kfet/templates/registration/login.html similarity index 100% rename from apps/registration/templates/registration/login.html rename to note_kfet/templates/registration/login.html diff --git a/apps/registration/templates/registration/password_change_done.html b/note_kfet/templates/registration/password_change_done.html similarity index 100% rename from apps/registration/templates/registration/password_change_done.html rename to note_kfet/templates/registration/password_change_done.html diff --git a/apps/registration/templates/registration/password_change_form.html b/note_kfet/templates/registration/password_change_form.html similarity index 100% rename from apps/registration/templates/registration/password_change_form.html rename to note_kfet/templates/registration/password_change_form.html diff --git a/apps/registration/templates/registration/password_reset_complete.html b/note_kfet/templates/registration/password_reset_complete.html similarity index 100% rename from apps/registration/templates/registration/password_reset_complete.html rename to note_kfet/templates/registration/password_reset_complete.html diff --git a/apps/registration/templates/registration/password_reset_confirm.html b/note_kfet/templates/registration/password_reset_confirm.html similarity index 100% rename from apps/registration/templates/registration/password_reset_confirm.html rename to note_kfet/templates/registration/password_reset_confirm.html diff --git a/apps/registration/templates/registration/password_reset_done.html b/note_kfet/templates/registration/password_reset_done.html similarity index 100% rename from apps/registration/templates/registration/password_reset_done.html rename to note_kfet/templates/registration/password_reset_done.html diff --git a/apps/registration/templates/registration/password_reset_form.html b/note_kfet/templates/registration/password_reset_form.html similarity index 100% rename from apps/registration/templates/registration/password_reset_form.html rename to note_kfet/templates/registration/password_reset_form.html diff --git a/apps/registration/templates/registration/signup.html b/note_kfet/templates/registration/signup.html similarity index 90% rename from apps/registration/templates/registration/signup.html rename to note_kfet/templates/registration/signup.html index 76f88a49..31134d73 100644 --- a/apps/registration/templates/registration/signup.html +++ b/note_kfet/templates/registration/signup.html @@ -4,9 +4,10 @@ {% load i18n %} {% block title %}{% trans "Sign up" %}{% endblock %} -{% block content %} -

{% trans "Sign up" %}

+{# Use a fixed-width container #} +{% block containertype %}container{% endblock %} +{% block content %}
{% blocktrans %}If you already signed up, your registration is taken into account. The BDE must validate your account before your can log in. You have to go to the Kfet and pay the registration fee. You must also validate your email address by following the link you received.{% endblocktrans %}