Clean up login template & form

netbox/templates/login.html

@@ -1,43 +1,46 @@
-{% extends 'base.html' %} {% load static %} {% block layout %}
+{# User login page. Extends base.html directly to override normal UI layout. #}
+{% extends 'base.html' %}
+{% load form_helpers %}
+{% load static %}
+
+{% block layout %}
   <main class="login-container text-center">
+
+    {# Login banner #}
     {% if settings.BANNER_LOGIN %}
       <div class="alert alert-secondary" role="alert">
         {{ settings.BANNER_LOGIN|safe }}
       </div>
     {% endif %}
+
+    {# Login form #}
     <div class="form-login">
       <form action="{% url 'login' %}" method="post">
+        {% csrf_token %}
+
+        {# Logo #}
         <div class="mb-4">
           {% include 'logo.html' with height=80 %}
         </div>
-      {% csrf_token %} {% if 'next' in request.GET %}
+
+        {# Set post-login URL #}
+        {% if 'next' in request.GET %}
         <input type="hidden" name="next" value="{{ request.GET.next }}" />
         {% endif %} {% if 'next' in request.POST %}
         <input type="hidden" name="next" value="{{ request.POST.next }}" />
         {% endif %}
-      <input
+
-        required
+        {{ form.username }}
-        type="text"
+        {{ form.password }}
-        placeholder="Username"
+
-        name="username"
-        maxlength="150"
-        id="id_username"
-        class="form-control"
-      />
-      <input
-        required
-        type="password"
-        placeholder="Password"
-        name="password"
-        id="id_password"
-        class="form-control"
-      />
         <button type="submit" class="btn btn-primary btn-lg w-100 mt-4">
           Sign In
         </button>
       </form>
     </div>
-  {% load form_helpers %} {% if form.non_field_errors %}
+
+    {# Login form errors #}
+    {% if form.non_field_errors %}
       <div class="alert alert-danger" role="alert">
         <h4 class="alert-heading">Errors</h4>
         <p>
@@ -46,6 +49,8 @@
       </div>
     {% endif %}
   </main>
+
+  {# Page footer #}
   <footer class="footer container-fluid login-footer py-3">
     <div class="row align-items-center">
       <div class="col-2 col-md-1 mb-0">
@@ -61,4 +66,5 @@
       </div>
     </div>
   </footer>
+
 {% endblock %}

netbox/users/forms.py

@@ -6,12 +6,7 @@ from .models import Token
 
 
 class LoginForm(BootstrapMixin, AuthenticationForm):
-
+    pass
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        self.fields['username'].widget.attrs['placeholder'] = ''
-        self.fields['password'].widget.attrs['placeholder'] = ''
 
 
 class PasswordChangeForm(BootstrapMixin, DjangoPasswordChangeForm):