From 944450deee6ed462cc86da0b63893f4ccaa5ac4c Mon Sep 17 00:00:00 2001
From: Mathieu Leplatre <mathieu.leplatre@makina-corpus.com>
Date: Tue, 10 Apr 2012 16:21:05 +0200
Subject: [PATCH] Switch to template tag for head block

---
 example/livembtiles/default_settings.py    |  5 -----
 example/livembtiles/templates/map.html     |  2 +-
 mbtilesmap/templatetags/mbtilesmap_tags.py | 11 ++++++++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/example/livembtiles/default_settings.py b/example/livembtiles/default_settings.py
index 7bf4723..7a9f81d 100644
--- a/example/livembtiles/default_settings.py
+++ b/example/livembtiles/default_settings.py
@@ -108,11 +108,6 @@
     'django.contrib.messages.middleware.MessageMiddleware',
 )
 
-TEMPLATE_CONTEXT_PROCESSORS = (
-    'django.core.context_processors.static',
-)
-
-
 ROOT_URLCONF = 'livembtiles.urls'
 
 TEMPLATE_DIRS = (
diff --git a/example/livembtiles/templates/map.html b/example/livembtiles/templates/map.html
index 7b2d615..9e8a85b 100644
--- a/example/livembtiles/templates/map.html
+++ b/example/livembtiles/templates/map.html
@@ -3,7 +3,7 @@
 
 {% block head %}
 {{ block.super }}
-{% include "mbtilesmap/head.html" %} 
+{% mbtilesmap_head %}
 {% endblock head %}
 
 {% block body %}
diff --git a/mbtilesmap/templatetags/mbtilesmap_tags.py b/mbtilesmap/templatetags/mbtilesmap_tags.py
index 2542b25..9579c80 100644
--- a/mbtilesmap/templatetags/mbtilesmap_tags.py
+++ b/mbtilesmap/templatetags/mbtilesmap_tags.py
@@ -1,5 +1,4 @@
 from django import template
-from django.conf import settings
 
 from mbtilesmap.models import MBTiles
 
@@ -7,6 +6,12 @@
 register = template.Library()
 
 
+@register.simple_tag
+def mbtilesmap_head():
+    c = template.Context()
+    return template.loader.get_template('mbtilesmap/head.html').render(c)
+
+
 class MapNode(template.Node):
     def __init__(self, name):
         self.name = template.Variable(name)
@@ -15,10 +20,10 @@ def __init__(self, name):
     def render(self, context):
         name = self.name.resolve(context)
         self.mbtiles = MBTiles(name)
-        
+
         t = template.loader.get_template('mbtilesmap/map.html')
 
-        c = template.Context({'map': self.mbtiles}, 
+        c = template.Context({'map': self.mbtiles},
                              autoescape=context.autoescape)
         return t.render(c)