From 36757736356717814de071572fc11cab1c3f5237 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Thu, 15 Jan 2015 15:31:59 +0100
Subject: [PATCH] Add a mellon/base.html template to make an indirection
 between mellon templates and the project base.html template (fixes #6301)

---
 mellon/templates/mellon/authentication_failed.html | 6 +++---
 mellon/templates/mellon/inactive_user.html         | 4 ++--
 mellon/templates/mellon/user_not_found.html        | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mellon/templates/mellon/authentication_failed.html b/mellon/templates/mellon/authentication_failed.html
index bd9353e..6695c02 100644
--- a/mellon/templates/mellon/authentication_failed.html
+++ b/mellon/templates/mellon/authentication_failed.html
@@ -1,13 +1,13 @@
-{% extends "base.html" %}
+{% extends "mellon/base.html" %}
 {% load i18n %}
 
-{% block extra_scripts %}
+{% block mellon_extra_scripts %}
   {% if error_redirect_after_timeout %}
     <meta http-equiv="refresh" content="{{ error_redirect_after_timeout }};url={{ next_url }}"
   {% endif %}
 {% endblock %}
 
-{% block content %}
+{% block mellon_content %}
 <div id="mellon-authentication-failure" class="mellon-message">
   <h2 class="mellon-message-header">{% trans "Authentication failed" %}</h2>
   <p class="mellon-message-body">
diff --git a/mellon/templates/mellon/inactive_user.html b/mellon/templates/mellon/inactive_user.html
index 7edc81b..920660a 100644
--- a/mellon/templates/mellon/inactive_user.html
+++ b/mellon/templates/mellon/inactive_user.html
@@ -1,7 +1,7 @@
-{% extends "base.html" %}
+{% extends "mellon/base.html" %}
 {% load i18n %}
 
-{% block content %}
+{% block mellon_content %}
 <p>
   {% blocktrans with name_id=saml_attributes.name_id_content %}Your user, {{ user }}, 
   is inactive please contact your administrator.
diff --git a/mellon/templates/mellon/user_not_found.html b/mellon/templates/mellon/user_not_found.html
index 6a34c54..07b43f3 100644
--- a/mellon/templates/mellon/user_not_found.html
+++ b/mellon/templates/mellon/user_not_found.html
@@ -1,7 +1,7 @@
-{% extends "base.html" %}
+{% extends "mellon/base.html" %}
 {% load i18n %}
 
-{% block content %}
+{% block mellon_content %}
 <p>
   {% blocktrans with name_id=saml_attributes.name_id_content %}No user found for NameID {{ name_id  }}{% endblocktrans %}
 </p>