No need for a different template for federated login

This commit is contained in:
Valentin Samir 2016-06-20 13:38:50 +02:00
parent a209b06df0
commit 63a041463d
3 changed files with 5 additions and 25 deletions

View file

@ -21,7 +21,6 @@ def setting_default(name, default_value):
setting_default('CAS_LOGO_URL', static("cas_server/logo.png")) setting_default('CAS_LOGO_URL', static("cas_server/logo.png"))
setting_default('CAS_LOGIN_TEMPLATE', 'cas_server/login.html') setting_default('CAS_LOGIN_TEMPLATE', 'cas_server/login.html')
setting_default('CAS_FEDERATE_TEMPLATE', 'cas_server/federate.html')
setting_default('CAS_WARN_TEMPLATE', 'cas_server/warn.html') setting_default('CAS_WARN_TEMPLATE', 'cas_server/warn.html')
setting_default('CAS_LOGGED_TEMPLATE', 'cas_server/logged.html') setting_default('CAS_LOGGED_TEMPLATE', 'cas_server/logged.html')
setting_default('CAS_LOGOUT_TEMPLATE', 'cas_server/logout.html') setting_default('CAS_LOGOUT_TEMPLATE', 'cas_server/logout.html')

View file

@ -1,22 +0,0 @@
{% extends "cas_server/base.html" %}
{% load bootstrap3 %}
{% load staticfiles %}
{% load i18n %}
{% block content %}
<form class="form-signin" method="post" id="login_form" action="{% url "cas_server:federateAuth" %}">
{% if auto_submit %}<noscript>{% endif %}
<h2 class="form-signin-heading">{% trans "Please log in" %}</h2>
{% if auto_submit %}</noscript>{% endif %}
{% csrf_token %}
{% bootstrap_form form %}
{% if auto_submit %}<noscript>{% endif %}
{% bootstrap_button _('Login') size='lg' button_type="submit" button_class="btn-primary btn-block"%}
{% if auto_submit %}</noscript>{% endif %}
</form>
{% if auto_submit %}
<script type="text/javascript">
document.getElementById('login_form').submit(); // SUBMIT FORM
</script>
{% endif %}
{% endblock %}

View file

@ -587,8 +587,11 @@ class LoginView(View, LogoutMixin):
else: else:
return render( return render(
self.request, self.request,
settings.CAS_FEDERATE_TEMPLATE, settings.CAS_LOGIN_TEMPLATE,
utils.context({'form': self.form}) utils.context({
'form': self.form,
'post_url': reverse("cas_server:federateAuth")
})
) )
else: else:
return render( return render(