Commit 7593f7e2 by Kálmán Viktor

dashboard: login minor fixes

parent 99c907d6
...@@ -1725,7 +1725,7 @@ class VmMigrateView(SuperuserRequiredMixin, TemplateView): ...@@ -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)
...@@ -12,7 +12,7 @@ ...@@ -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>
......
...@@ -19,8 +19,8 @@ ...@@ -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!" %} {% url "accounts.password-reset" as url %}
<a href="{% url "accounts.password-reset" %}">a</a> {% 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>
......
...@@ -11,7 +11,7 @@ ...@@ -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>
......
...@@ -11,7 +11,7 @@ ...@@ -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 %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment