From 2e55628301c944d90a2ea2234e6ade481ed91185 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 22 Dec 2014 14:41:19 +0100 Subject: [PATCH] add googletools --- example/sandbox/settings.py | 1 + setup.py | 1 + telemeta/templates/telemeta/base.html | 11 ++++++++++- telemeta/templatetags/telemeta_utils.py | 13 +++++++------ 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/example/sandbox/settings.py b/example/sandbox/settings.py index a94da9f2..097d4a71 100644 --- a/example/sandbox/settings.py +++ b/example/sandbox/settings.py @@ -146,6 +146,7 @@ INSTALLED_APPS = ( 'debug_toolbar', 'bootstrap3', 'bootstrap_pagination', + 'googletools', ) TEMPLATE_CONTEXT_PROCESSORS = ( diff --git a/setup.py b/setup.py index 03fdbfe3..c6bc19fa 100644 --- a/setup.py +++ b/setup.py @@ -60,6 +60,7 @@ setup( 'django-bootstrap-pagination', 'django-json-rpc==0.6.2', 'django-suit', + 'django-google-tools', 'timeside>=0.5.6', 'south', 'sorl-thumbnail', diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html index 8abc00c8..f6b4cc36 100644 --- a/telemeta/templates/telemeta/base.html +++ b/telemeta/templates/telemeta/base.html @@ -1,7 +1,11 @@ {% load i18n %} -{% load telemeta_utils %}{# Load the tag library #} +{% load telemeta_utils %} {% load bootstrap3 %} +{% if get_googletools %} +{% load googletools %} +{% endif %} + {% get_current_language as LANGUAGE_CODE %} {% get_available_languages as LANGUAGES %} @@ -10,6 +14,7 @@ + {%block head_title %}{% description %} - Telemeta{% endblock %} @@ -183,6 +188,10 @@ {% endblock layout %} {% block analytics %} +{% if googletools %} +{% site_verification_code %} +{% analytics_code %} +{% endif %} {% endblock analytics %} diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py index 564793f7..8efadbbf 100644 --- a/telemeta/templatetags/telemeta_utils.py +++ b/telemeta/templatetags/telemeta_utils.py @@ -400,12 +400,9 @@ def mime_to_media_type(mime_type): else: return 'Audio' -@register.filter -def installed(app): - if app in settings.INSTALLED_APPS: - return app - else: - return '' +@register.simple_tag +def is_installed(app): + return app in settings.INSTALLED_APPS def do_ifloaded(parser, token): bits = token.split_contents()[1:] @@ -463,3 +460,7 @@ def logo_url(): static_url = getattr(settings, 'STATIC_URL', '/static/') return getattr(settings, 'TELEMETA_LOGO', static_url + '/telemeta/images/logo_telemeta_2.png') +@register.assignment_tag +def get_googletools(): + return 'googletools' in settings.INSTALLED_APPS + -- 2.39.5