ui: update more remaining templates

This commit is contained in:
Jens Langhammer 2020-02-23 22:49:56 +01:00
parent 3453077d7b
commit 521a8b5356
3 changed files with 15 additions and 17 deletions

View File

@ -11,16 +11,22 @@
{% endblock %} {% endblock %}
{% block beneath_form %} {% block beneath_form %}
<p class="loading" style="display: none;"> <div class="pf-c-form__group pf-m-action" style="display: none;" id="loading">
<span class="spinner spinner-xs spinner-inline"></span> {% trans 'Processing, please wait...' %} <div class="pf-c-form__horizontal-group">
</p> <span class="pf-c-spinner" role="progressbar" aria-valuetext="Loading...">
<span class="pf-c-spinner__clipper"></span>
<span class="pf-c-spinner__lead-ball"></span>
<span class="pf-c-spinner__tail-ball"></span>
</span>
</div>
</div>
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
{{ block.super }} {{ block.super }}
<script> <script>
$('form').on('submit', function () { document.querySelector("form").addEventListener("submit", (e) => {
$('p.loading').show(); document.getElementById("loading").removeAttribute("style");
}) });
</script> </script>
{% endblock %} {% endblock %}

View File

@ -3,23 +3,17 @@
{% load utils %} {% load utils %}
{% load i18n %} {% load i18n %}
{% block title %} {% block card_title %}
{% title 'Redirecting...' %} {% title 'Redirecting...' %}
{% endblock %} {% endblock %}
{% block card %} {% block card %}
<header class="login-pf-header">
<h1>{% trans 'Redirecting...' %}</h1>
</header>
<form method="POST" action="{{ url }}"> <form method="POST" action="{{ url }}">
{% csrf_token %} {% csrf_token %}
{% for key, value in attrs.items %} {% for key, value in attrs.items %}
<input type="hidden" name="{{ key }}" value="{{ value }}"> <input type="hidden" name="{{ key }}" value="{{ value }}">
{% endfor %} {% endfor %}
<div class="login-group"> <div class="login-group">
<h3>
{% trans "Redirecting..." %}
</h3>
<p> <p>
{% blocktrans with user=user %} {% blocktrans with user=user %}
You are logged in as {{ user }}. You are logged in as {{ user }}.
@ -34,6 +28,6 @@
{% block scripts %} {% block scripts %}
{{ block.super }} {{ block.super }}
<script> <script>
$('form').submit(); document.querySelector("form").submit();
</script> </script>
{% endblock %} {% endblock %}

View File

@ -1,7 +1,5 @@
<saml:Subject> <saml:Subject>
<saml:NameID Format="{{ SUBJECT_FORMAT }}"> <saml:NameID Format="{{ SUBJECT_FORMAT }}">{{ SUBJECT }}</saml:NameID>
{{ SUBJECT }}
</saml:NameID>
<saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"> <saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer">
<saml:SubjectConfirmationData {{ IN_RESPONSE_TO|safe }} NotOnOrAfter="{{ NOT_ON_OR_AFTER }}" Recipient="{{ ACS_URL }}" /> <saml:SubjectConfirmationData {{ IN_RESPONSE_TO|safe }} NotOnOrAfter="{{ NOT_ON_OR_AFTER }}" Recipient="{{ ACS_URL }}" />
</saml:SubjectConfirmation> </saml:SubjectConfirmation>