From 3573aa0c9a8073c3a028889fc09286506669d8b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Mon, 9 Jul 2018 17:54:30 +0200
Subject: [PATCH] templates: move leftover base.html to authentic2/base.html
 (#25154)

---
 templates/authentic2/accounts.html |  2 +-
 templates/authentic2/base.html     | 34 +++++++++++++++++++++++++++++-
 templates/base.html                | 33 -----------------------------
 3 files changed, 34 insertions(+), 35 deletions(-)
 delete mode 100644 templates/base.html

diff --git a/templates/authentic2/accounts.html b/templates/authentic2/accounts.html
index 181845d..0ddc395 100644
--- a/templates/authentic2/accounts.html
+++ b/templates/authentic2/accounts.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "authentic2/base.html" %}
 {% load i18n %}
 
 {% block title %}Gestion du compte{% endblock %}
diff --git a/templates/authentic2/base.html b/templates/authentic2/base.html
index 27d5df9..c3c8efb 100644
--- a/templates/authentic2/base.html
+++ b/templates/authentic2/base.html
@@ -1,6 +1,38 @@
-{% extends "base.html" %}
+{% extends theme_base %}
 {% load authentic2 %}
 
+{% block extra-body-args %}
+{% block bodyargs %}
+{% endblock %}
+{% endblock %}
+
+{% block placeholder-content %}
+  {% block content %}
+  {% endblock %}
+{% endblock %}
+
+{% block user-info %}
+          {% if user.is_authenticated %}
+          <span class="logged-in">
+            {% if idp_account_url %}<a href="{{idp_account_url}}">{% endif %}
+            <span class="connected-user">{{user.first_name}} {{user.last_name}}</span>{% if idp_account_url %}</a>{% endif %}
+            <a class="logout" href="{% url 'auth_logout' %}">D&eacute;connexion</a>
+          </span>
+          {% endif %}
+{% endblock %}
+
+{% block messages %}
+{% if messages %}
+  <div id="messages" class="messages-login">
+    <ul class="messages">
+      {% for message in messages %}
+      <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+      {% endfor %}
+    </ul>
+  </div>
+{% endif %}
+{% endblock %}
+
 {% block extra-top-head %}
   {% block extrascripts %}
   {% endblock %}
diff --git a/templates/base.html b/templates/base.html
deleted file mode 100644
index 7a8a772..0000000
--- a/templates/base.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% extends theme_base %}
-
-{% block extra-body-args %}
-{% block bodyargs %}
-{% endblock %}
-{% endblock %}
-
-{% block placeholder-content %}
-  {% block content %}
-  {% endblock %}
-{% endblock %}
-
-{% block user-info %}
-          {% if user.is_authenticated %}
-          <span class="logged-in">
-            {% if idp_account_url %}<a href="{{idp_account_url}}">{% endif %}
-            <span class="connected-user">{{user.first_name}} {{user.last_name}}</span>{% if idp_account_url %}</a>{% endif %}
-            <a class="logout" href="{% url 'auth_logout' %}">D&eacute;connexion</a>
-          </span>
-          {% endif %}
-{% endblock %}
-
-{% block messages %}
-{% if messages %}
-  <div id="messages" class="messages-login">
-    <ul class="messages">
-      {% for message in messages %}
-      <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
-      {% endfor %}
-    </ul>
-  </div>
-{% endif %}
-{% endblock %}
-- 
2.18.0