From aeace20ade6aacfc9c7cab622c87f2d5cd939e28 Mon Sep 17 00:00:00 2001 From: Serghei Mihai Date: Tue, 3 Dec 2019 14:01:22 +0100 Subject: [PATCH] authentic2: compute authentication methods from available blocks (#38063) --- templates/authentic2/login.html | 2 +- templates/variants/arles/authentic2/login.html | 2 +- templates/variants/toulouse-metropole/authentic2/login.html | 4 ++-- templates/variants/toulouse/authentic2/login.html | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/authentic2/login.html b/templates/authentic2/login.html index 3ed7a34a..b56b888a 100644 --- a/templates/authentic2/login.html +++ b/templates/authentic2/login.html @@ -17,7 +17,7 @@ {% block content %} {% block login-pre %}{% endblock %} -
+
{% block login-top %}{% endblock %} {% block login-blocks %} diff --git a/templates/variants/arles/authentic2/login.html b/templates/variants/arles/authentic2/login.html index d12760f8..614ca67a 100644 --- a/templates/variants/arles/authentic2/login.html +++ b/templates/variants/arles/authentic2/login.html @@ -1,7 +1,7 @@ {% extends "authentic2/login.html" %} {% block content %} -
+
{% for name, content in methods reversed %}
{% if name == "FranceConnect" %} diff --git a/templates/variants/toulouse-metropole/authentic2/login.html b/templates/variants/toulouse-metropole/authentic2/login.html index 7480c2d8..59f440cb 100644 --- a/templates/variants/toulouse-metropole/authentic2/login.html +++ b/templates/variants/toulouse-metropole/authentic2/login.html @@ -2,7 +2,7 @@ {% block login-pre %}

Se connecter

-{% if visible_blocks_count > 1 %} +{% if blocks|length > 1 %}

Pour accéder à ces téléservices, vous devez vous identifier en choisissant l'une des possibilités ci-dessous :

{% else %} @@ -17,7 +17,7 @@ ci-dessous :

{% for id, login_block in blocks.items %}
-{% if visible_blocks_count > 1 %} +{% if blocks|length > 1 %}

{% if id == "password" %}Vos identifiants{% else %}{{ login_block.name }}{% endif %}

{% endif %}
diff --git a/templates/variants/toulouse/authentic2/login.html b/templates/variants/toulouse/authentic2/login.html index 7480c2d8..59f440cb 100644 --- a/templates/variants/toulouse/authentic2/login.html +++ b/templates/variants/toulouse/authentic2/login.html @@ -2,7 +2,7 @@ {% block login-pre %}

Se connecter

-{% if visible_blocks_count > 1 %} +{% if blocks|length > 1 %}

Pour accéder à ces téléservices, vous devez vous identifier en choisissant l'une des possibilités ci-dessous :

{% else %} @@ -17,7 +17,7 @@ ci-dessous :

{% for id, login_block in blocks.items %}
-{% if visible_blocks_count > 1 %} +{% if blocks|length > 1 %}

{% if id == "password" %}Vos identifiants{% else %}{{ login_block.name }}{% endif %}

{% endif %}