From: Thomas Fillon <thomas@parisson.com>
Date: Wed, 25 Jan 2017 07:54:54 +0000 (+0100)
Subject: Remove django-google-tools: remove SITE_ID and remaning code in template/base.html
X-Git-Tag: 1.7.0~2^2~24^2~17
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=84243020ff065901a73399714e9ccf8c7dba91c4;p=telemeta.git

Remove django-google-tools: remove SITE_ID and remaning code in template/base.html
---

diff --git a/app/settings.py b/app/settings.py
index df6ad18f..be13e3a6 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -61,8 +61,6 @@ LANGUAGES = [ ('fr', 'French'),
               ('es', 'Spanish'),
 ]
 
-SITE_ID = 1
-
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True
@@ -123,14 +121,13 @@ TEMPLATE_LOADERS = (
 
 MIDDLEWARE_CLASSES = (
     # Manage Django URLs for AngularJS with django-angular
-    'djng.middleware.AngularUrlMiddleware',
+    'debug_toolbar.middleware.DebugToolbarMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.locale.LocaleMiddleware',
-    'debug_toolbar.middleware.DebugToolbarMiddleware',
     # 'pagination.middleware.PaginationMiddleware',
 )
 
diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index a301db6a..1eca9627 100644
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -4,8 +4,6 @@
 {% load bootstrap3 %}
 {% settings_value 'INSTALLED_APPS' as INSTALLED_APPS %}
 {% settings_value 'DEBUG' as DEBUG %}
-{% if 'googletools' in INSTALLED_APPS %}
-    {% load googletools %}
 {% endif %}
 
 {% get_current_language as LANGUAGE_CODE %}