From 2a8f2a316299e94d6fea27908b097233eca10503 Mon Sep 17 00:00:00 2001
From: Serghei Mihai <smihai@entrouvert.com>
Date: Thu, 11 Jun 2015 18:25:49 +0200
Subject: [PATCH] replace sekizai use by authentic templatetags (#7534)

---
 debian/control                                      |  3 +--
 setup.py                                            |  3 +--
 src/authentic2_auth_msp/__init__.py                 |  2 +-
 .../authentic2_auth_msp/confirm_unlink.html         | 13 ++++++-------
 .../templates/authentic2_auth_msp/connecting.html   |  3 +--
 .../authentic2_auth_msp/link_management.html        |  7 +++----
 .../templates/authentic2_auth_msp/linking.html      |  3 +--
 .../templates/authentic2_auth_msp/unlink_done.html  |  6 ++----
 8 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/debian/control b/debian/control
index 086c805..6535926 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Architecture: all
 Depends: ${misc:Depends},
     python-authentic2 (>= 2.1.2),
     python-requests,
-    python-requests-oauthlib,
-    python-django-sekizai
+    python-requests-oauthlib
 Description: Kerberos authentication frontend for Authentic2
 
diff --git a/setup.py b/setup.py
index ea38253..528bb60 100755
--- a/setup.py
+++ b/setup.py
@@ -116,8 +116,7 @@ setup(name='authentic2-auth-msp',
         install_requires=[
             'authentic2',
             'requests',
-            'requests-oauthlib',
-            'django-sekizai',
+            'requests-oauthlib'
         ],
         entry_points={
             'authentic2.plugin': [
diff --git a/src/authentic2_auth_msp/__init__.py b/src/authentic2_auth_msp/__init__.py
index a671b59..6a8c12e 100644
--- a/src/authentic2_auth_msp/__init__.py
+++ b/src/authentic2_auth_msp/__init__.py
@@ -6,7 +6,7 @@ class Plugin(object):
         return urls.urlpatterns
 
     def get_apps(self):
-        return [__name__, 'sekizai']
+        return [__name__]
 
     def get_authentication_backends(self):
         return ['authentic2_auth_msp.backends.MspBackend']
diff --git a/src/authentic2_auth_msp/templates/authentic2_auth_msp/confirm_unlink.html b/src/authentic2_auth_msp/templates/authentic2_auth_msp/confirm_unlink.html
index 449bb60..45ca6d1 100644
--- a/src/authentic2_auth_msp/templates/authentic2_auth_msp/confirm_unlink.html
+++ b/src/authentic2_auth_msp/templates/authentic2_auth_msp/confirm_unlink.html
@@ -1,15 +1,14 @@
 {% extends "base.html"%}
-{% load sekizai_tags %}
-{% load staticfiles %}
+{% load staticfiles authentic2 %}
 
+{% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_msp/css/screen.msp.css' %}"></link>{% endaddtoblock %}
+{% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_msp/css/msp.css' %}"></link>{% endaddtoblock %}
+{% addtoblock "js" %}<script type="text/javascript" src="{% static "authentic2_auth_msp/js/domready.js" %}"></script>{% endaddtoblock %}
+{% addtoblock "js" %}<script type="text/javascript" src="{% static "authentic2_auth_msp/js/getElementsByClassName-1.0.1.js" %}"></script>{% endaddtoblock %}
+{% addtoblock "js-endpage" %}<script type="text/javascript" src="{% static "authentic2_auth_msp/js/oauth.js" %}"></script>{% endaddtoblock %}
 
 {% block content %}
 
-  {% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_msp/css/screen.msp.css' %}"></link>{% endaddtoblock %}
-  {% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_msp/css/msp.css' %}"></link>{% endaddtoblock %}
-  {% addtoblock "js" %}<script type="text/javascript" src="{% static "authentic2_auth_msp/js/domready.js" %}"></script>{% endaddtoblock %}
-  {% addtoblock "js" %}<script type="text/javascript" src="{% static "authentic2_auth_msp/js/getElementsByClassName-1.0.1.js" %}"></script>{% endaddtoblock %}
-  {% addtoblock "js-endpage" %}<script type="text/javascript" src="{% static "authentic2_auth_msp/js/oauth.js" %}"></script>{% endaddtoblock %}
   <div id="msp-confirm-unlink">
     <div class="msp">
       <div class="cadre">
diff --git a/src/authentic2_auth_msp/templates/authentic2_auth_msp/connecting.html b/src/authentic2_auth_msp/templates/authentic2_auth_msp/connecting.html
index b9b878a..8f5b05e 100644
--- a/src/authentic2_auth_msp/templates/authentic2_auth_msp/connecting.html
+++ b/src/authentic2_auth_msp/templates/authentic2_auth_msp/connecting.html
@@ -1,5 +1,4 @@
-{% load staticfiles %}
-{% load sekizai_tags %}
+{% load staticfiles authentic2 %}
 
 {% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_msp/css/screen.msp.css' %}"></link>{% endaddtoblock %}
 {% addtoblock "js" %}<script type="text/javascript" src="{% static "authentic2_auth_msp/js/domready.js" %}"></script>{% endaddtoblock %}
diff --git a/src/authentic2_auth_msp/templates/authentic2_auth_msp/link_management.html b/src/authentic2_auth_msp/templates/authentic2_auth_msp/link_management.html
index e90d2a5..3c0e23f 100644
--- a/src/authentic2_auth_msp/templates/authentic2_auth_msp/link_management.html
+++ b/src/authentic2_auth_msp/templates/authentic2_auth_msp/link_management.html
@@ -1,12 +1,11 @@
 {% extends "base.html"%}
-{% load sekizai_tags %}
-{% load staticfiles %}
+{% load staticfiles authentic2 %}
 
+{% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_msp/css/screen.msp.css' %}"></link>{% endaddtoblock %}
+{% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_msp/css/msp.css' %}"></link>{% endaddtoblock %}
 
 {% block content %}
 
-  {% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_msp/css/screen.msp.css' %}"></link>{% endaddtoblock %}
-  {% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_msp/css/msp.css' %}"></link>{% endaddtoblock %}
   <div id="msp-link-management">
     <div class="msp">
       <div class="cadre">
diff --git a/src/authentic2_auth_msp/templates/authentic2_auth_msp/linking.html b/src/authentic2_auth_msp/templates/authentic2_auth_msp/linking.html
index 367ea74..452e3a0 100644
--- a/src/authentic2_auth_msp/templates/authentic2_auth_msp/linking.html
+++ b/src/authentic2_auth_msp/templates/authentic2_auth_msp/linking.html
@@ -1,6 +1,5 @@
 {% load i18n %}
-{% load sekizai_tags %}
-{% load staticfiles %}
+{% load staticfiles authentic2 %}
 
 {% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_msp/css/screen.msp.css' %}"></link>{% endaddtoblock %}
 {% addtoblock "js" %}<script type="text/javascript" src="{% static "authentic2_auth_msp/js/domready.js" %}"></script>{% endaddtoblock %}
diff --git a/src/authentic2_auth_msp/templates/authentic2_auth_msp/unlink_done.html b/src/authentic2_auth_msp/templates/authentic2_auth_msp/unlink_done.html
index 99a500e..28ac9cc 100644
--- a/src/authentic2_auth_msp/templates/authentic2_auth_msp/unlink_done.html
+++ b/src/authentic2_auth_msp/templates/authentic2_auth_msp/unlink_done.html
@@ -1,11 +1,9 @@
 {% extends "base.html"%}
-{% load sekizai_tags %}
-{% load staticfiles %}
+{% load staticfiles authentic2 %}
 
+{% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_msp/css/screen.msp.css' %}"></link>{% endaddtoblock %}
 
 {% block content %}
-
-  {% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{% static 'authentic2_auth_msp/css/screen.msp.css' %}"></link>{% endaddtoblock %}
 		<div class="msp">
 			<div class="cadre">
 				<div class="bordure">