From efcb24ace75ae76ef87c858c1a4a58d276d02e64 Mon Sep 17 00:00:00 2001
From: Nicolas ROCHE <nroche@entrouvert.com>
Date: Thu, 29 Apr 2021 14:25:25 +0200
Subject: [PATCH] villeneuve-dascq: remove dupplicated icon on toplinks
 (#53558)

---
 .../villeneuve-dascq/includes/user-info.html  | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/templates/variants/villeneuve-dascq/includes/user-info.html b/templates/variants/villeneuve-dascq/includes/user-info.html
index 0a03f1f0..f5e6f0c8 100644
--- a/templates/variants/villeneuve-dascq/includes/user-info.html
+++ b/templates/variants/villeneuve-dascq/includes/user-info.html
@@ -4,5 +4,24 @@
   <span class="theme-back-home">
     <a href="{{portal_url}}" title="retour à l’accueil">Accueil</a>
   </span>
-  {{ block.super }}
-{% endblock %}
\ No newline at end of file
+
+  <!-- manually replace {{ block.super }} that however produce a loop on django 1.11 -->
+  {% skeleton_extra_placeholder user-info %}
+  {% if user.is_authenticated %}
+  <span class="logged-in">
+    {% if idp_account_url %}<a class="account-link" href="{{idp_account_url}}">{% endif %}
+    <span class="connected-user">{% block user-info-user-name %}{{user.first_name}} {{user.last_name}}{% endblock %}</span>{% if idp_account_url %}</a>{% endif %}
+    <a accesskey="o" class="logout" href="{% url 'auth_logout' %}">{% block user-info-logout-label %}Déconnexion{% endblock %}</a>
+  </span>
+  {% else %}
+  {% firstof registration_url idp_registration_url as registration_url %}
+  <span class="login"><a accesskey="2" class="login-link" href="{% url 'auth_login' %}"
+    >{% block user-info-login-label %}Connexion{% endblock %}
+    {% if registration_url and include_registration_link != False %}</a>{% endif %}
+    <span class="sep">/</span>
+    {% if registration_url and include_registration_link != False %}<a class="registration" href="{{registration_url}}"
+    >{% block user-info-registration-label %}Inscription{% endblock %}{% endif %}</a></span>
+  {% endif %}
+  {% end_skeleton_extra_placeholder %}
+
+{% endblock %}