dashboard: login minor fixes

circle/dashboard/views.py

@@ -1725,7 +1725,7 @@ class VmMigrateView(SuperuserRequiredMixin, TemplateView):
 def circle_login(request):
 def circle_login(request):
     authentication_form = CircleAuthenticationForm
     authentication_form = CircleAuthenticationForm
     extra_context = {
     extra_context = {
-        'saml2': getattr(settings, "SAML_CONFIG", False)
+        'saml2': hasattr(settings, "SAML_CONFIG")
     }
     }
     return login(request, authentication_form=authentication_form,
     return login(request, authentication_form=authentication_form,
                  extra_context=extra_context)
                  extra_context=extra_context)

circle/templates/registration/login.html

@@ -15,8 +15,8 @@
   <div class="col-sm-{% if saml2 %}6{% else %}12{% endif %}">
   <div class="col-sm-{% if saml2 %}6{% else %}12{% endif %}">
     <div class="login-form">
     <div class="login-form">
       <form action="" method="POST">
       <form action="" method="POST">
-          {% csrf_token %}
-          {% crispy form %}
+        {% csrf_token %}
+        {% crispy form %}
       </form>
       </form>
     </div>
     </div>
   </div>
   </div>

circle/templates/registration/password_reset_complete.html

@@ -12,7 +12,7 @@
   </div>
   </div>
   <div class="col-sm-12">
   <div class="col-sm-12">
     <div class="alert alert-success">
     <div class="alert alert-success">
-      {% trans "Password change succesful!" %}
+      {% trans "Password change successful!" %}
       <a href="{% url "accounts.login" %}">{% trans "Click here to login" %}</a>
       <a href="{% url "accounts.login" %}">{% trans "Click here to login" %}</a>
     </div>
     </div>
   </div>
   </div>

circle/templates/registration/password_reset_confirm.html

@@ -19,8 +19,8 @@
       {% crispy form %}
       {% crispy form %}
     {% else %}
     {% else %}
       <div class="alert alert-warning">
       <div class="alert alert-warning">
-        {% trans "This token is expired, please request a new password reset link again!" %}
-        <a href="{% url "accounts.password-reset" %}">a</a>
+        {% url "accounts.password-reset" as url %}
+        {% blocktrans with url=url %}This token is expired, please <a href="{{ url }}">request</a> a new password reset link again!{% endblocktrans %}
       </div>
       </div>
     {% endif %}
     {% endif %}
   </div>
   </div>

circle/templates/registration/password_reset_done.html

@@ -11,7 +11,7 @@
     {% include "display-form-errors.html" %}
     {% include "display-form-errors.html" %}
   </div>
   </div>
   <div class="col-sm-12">
   <div class="col-sm-12">
-    <div class="pull-right"><a href="{% url "accounts.login" %}">Back to login</a></div>
+    <div class="pull-right"><a href="{% url "accounts.login" %}">{% trans "Back to login" %}</a></div>
     {% trans "We have sent you an email about your next steps!" %}  
     {% trans "We have sent you an email about your next steps!" %}  
   </div>
   </div>
 </div>
 </div>

circle/templates/registration/password_reset_form.html

@@ -11,7 +11,7 @@
     {% include "display-form-errors.html" %}
     {% include "display-form-errors.html" %}
   </div>
   </div>
   <div class="col-sm-12">
   <div class="col-sm-12">
-    <div class="pull-right"><a href="{% url "accounts.login" %}">Back to login</a></div>
+    <div class="pull-right"><a href="{% url "accounts.login" %}">{% trans "Back to login" %}</a></div>
     <h4 style="margin: 0 0 25px 0;">{% blocktrans %}Enter your email address to reset your password!{% endblocktrans %}</h4>
     <h4 style="margin: 0 0 25px 0;">{% blocktrans %}Enter your email address to reset your password!{% endblocktrans %}</h4>
     <form action="" method="POST">
     <form action="" method="POST">
         {% csrf_token %}
         {% csrf_token %}