From 749f07b55cad358473eb32094d080b57546624ca Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Wed, 26 Sep 2018 23:15:32 +0200
Subject: [PATCH] merge change in authentic2-auth-fc (fixes #26764)

---
 templates/authentic2_auth_fc/connecting.html  | 26 -------------------
 templates/authentic2_auth_fc/login.html       | 17 ++++++++++++
 .../login_registration.html                   | 15 +++++++++++
 3 files changed, 32 insertions(+), 26 deletions(-)
 delete mode 100644 templates/authentic2_auth_fc/connecting.html
 create mode 100644 templates/authentic2_auth_fc/login.html
 create mode 100644 templates/authentic2_auth_fc/login_registration.html

diff --git a/templates/authentic2_auth_fc/connecting.html b/templates/authentic2_auth_fc/connecting.html
deleted file mode 100644
index 4e94b66..0000000
--- a/templates/authentic2_auth_fc/connecting.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% load staticfiles %}
-{% load i18n %}
-
-{% if 'nofc' not in request.GET %}
-<div id="fc-button-wrapper">
-  <div id="fc-button">
-    {% if not fc_user_info %}
-    <a class="button" href="{% url 'fc-login-or-link' %}{% if request.GET.next or popup or registration %}?{% endif %}{% if next %}{{ next }}{% else %}{% if request.GET.next %}{{ request.GET.urlencode }}{% endif %}{% endif %}{% if popup %}&popup=1{% endif %}{% if registration %}&registration{% endif %}" title="{% trans 'Log in with FranceConnect' %}" class="connexion{% if popup %} js-oauth-popup{% endif %}"><div><img src="{% if registration %}{% static "authentic2_auth_fc/img/FC-register-button.svg" %}{% else %}{% static "authentic2_auth_fc/img/FC-connect-button.svg" %}{% endif %}" alt="{% trans 'Log in with FranceConnect' %}"></img></div></a>
-    {% block fc-explanation %}
-    <p><a href="{{ about_url }}" target="_blank">{% trans "What is FranceConnect?" %}</a></p>
-    <p>{% blocktrans %}
-      FranceConnect is the solution proposed by the French state to streamline
-      logging in online services. You can use to connect to your account.
-      {% endblocktrans %}</p>
-    {% endblock %}
-        {% else %}
-        <p class="highlight option first">Je n'ai pas encore de {{ account_label }}</p>
-        <p>Création de mon {{ account_label }} à partir des données reçues de FranceConnect.</p>
-        <span class="certified">{{ fc_user_info.given_name }} {{ fc_user_info.family_name }}{% if fc_user_info.email %}<br/>{{ fc_user_info.email }}{% endif %}</span>
-        <div class="center fc-connect">
-            <a href="{% url 'fc-registration' %}{% if request.GET.next or popup %}?{% endif %}{% if request.GET.next %}{{ request.GET.urlencode }}{% endif %}{% if popup %}&popup=1{% endif %}" title="Créez un compte avec FranceConnect" class="connexion{% if popup %} js-oauth-popup{% endif %} button">Valider</a>
-          </div>
-          {% endif %}
-  </div>
-</div>
-{% endif %}
diff --git a/templates/authentic2_auth_fc/login.html b/templates/authentic2_auth_fc/login.html
new file mode 100644
index 0000000..63ff773
--- /dev/null
+++ b/templates/authentic2_auth_fc/login.html
@@ -0,0 +1,17 @@
+{% load staticfiles %}
+{% load i18n %}
+
+<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_fc/css/fc.css' %}">
+<div id="fc-button-wrapper">
+  <div id="fc-button">
+    <a href="{{ login_url }}"
+       title="{% trans 'Log in with FranceConnect' %}"
+       class="button connexion{% if popup %} js-fc-popup{% endif %}">
+        <div>
+            <img src="{% static "authentic2_auth_fc/img/FC-connect-button.svg" %}"></img>
+        </div>
+    </a>
+  </div>
+</div>
+{% include "authentic2_auth_fc/explanation.html" %}
+{% if popup %}<script src="{% static 'authentic2_auth_fc/js/fc.js' %}" type="text/javascript"></script>{% endif %}
diff --git a/templates/authentic2_auth_fc/login_registration.html b/templates/authentic2_auth_fc/login_registration.html
new file mode 100644
index 0000000..bbe36ff
--- /dev/null
+++ b/templates/authentic2_auth_fc/login_registration.html
@@ -0,0 +1,15 @@
+{% load staticfiles %}
+{% load i18n %}
+<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_fc/css/fc.css' %}">
+<div id="fc-button-wrapper">
+    <div id="fc-button">
+        <p class="highlight option first">Je n'ai pas encore de {{ account_label }}</p>
+        <p>Création de mon {{ account_label }} à partir des données reçues de FranceConnect.</p>
+        <span class="certified">{{ fc_user_info.given_name }} {{ fc_user_info.family_name }}{% if fc_user_info.email %}<br/>{{ fc_user_info.email }}{% endif %}</span>
+        <div class="center fc-connect">
+            <a href="{{ registration_url }}" title="Créez un compte avec FranceConnect" class="button connexion{% if popup %} js-fc-popup{% endif %} button">Valider</a>
+        </div>
+    </div>
+</div>
+{% include "authentic2_auth_fc/explanation.html" %}
+{% if popup %}<script src="{% static 'authentic2_auth_fc/js/fc.js' %}" type="text/javascript"></script>{% endif %}