Merge branch 'frontnax' into 'beta'

Frontnax

See merge request bde/nk20!89

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):

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 %}

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 %}
     <div class="row mt-4">
         <div class="col-sm-5 col-md-4" id="infos_div">

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():

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 %}

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;
+        }
     </style>
 
     {% block extracss %}{% endblock %}
@@ -167,7 +170,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
             </ul>
         </div>
     </nav>
-    <div class="container-fluid my-3" style="max-width: 1600px;">
+    <div class="{% block containertype %}container{% endblock %} my-3">
         {% if request.user.is_authenticated and not request.user.profile.email_confirmed %}
             <div class="alert alert-warning">
                 {% trans "Your e-mail address is not validated. Please check your mail inbox and click on the validation link." %}

note_kfet/templates/registration/signup.html

@@ -4,9 +4,10 @@
 {% load i18n %}
 {% block title %}{% trans "Sign up" %}{% endblock %}
 
-{% block content %}
-    <h2>{% trans "Sign up" %}</h2>
+{# Use a fixed-width container #}
+{% block containertype %}container{% endblock %}
 
+{% block content %}
     <div class="alert alert-warning">
         {% 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 %}
     </div>