piwik

diff --git a/requirements.txt b/requirements.txt
index cd1467f..02d393d 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,6 +8,7 @@ django-rosetta>=0.5.3
 django-maintenancemode>=0.9
 
 python-memcached
 django-maintenancemode>=0.9
 
 python-memcached

+piwik

 
 # Feedparser 
 Feedparser>=4.1
 
 # Feedparser 
 Feedparser>=4.1

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index 49073a1..a472763 100644 (file)
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -81,14 +81,14 @@ TEMPLATE_LOADERS = [
 #     'django.template.loaders.eggs.load_template_source',
 ]
 
 #     'django.template.loaders.eggs.load_template_source',
 ]
 

-TEMPLATE_CONTEXT_PROCESSORS = [
+TEMPLATE_CONTEXT_PROCESSORS = (

     'django.core.context_processors.auth',
     'django.core.context_processors.debug',
     'django.core.context_processors.i18n',
     'django.core.context_processors.media',
     'django.core.context_processors.request',
     'wolnelektury.context_processors.extra_settings',
     'django.core.context_processors.auth',
     'django.core.context_processors.debug',
     'django.core.context_processors.i18n',
     'django.core.context_processors.media',
     'django.core.context_processors.request',
     'wolnelektury.context_processors.extra_settings',

-]
+)

 
 MIDDLEWARE_CLASSES = [
     'django.middleware.cache.UpdateCacheMiddleware',
 
 MIDDLEWARE_CLASSES = [
     'django.middleware.cache.UpdateCacheMiddleware',


@@ -98,6 +98,7 @@ MIDDLEWARE_CLASSES = [
     'django.middleware.doc.XViewMiddleware',
     'pagination.middleware.PaginationMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'django.middleware.doc.XViewMiddleware',
     'pagination.middleware.PaginationMiddleware',
     'django.middleware.locale.LocaleMiddleware',

+    'piwik.django.middleware.PiwikMiddleware',

     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.cache.FetchFromCacheMiddleware',
     'maintenancemode.middleware.MaintenanceModeMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.cache.FetchFromCacheMiddleware',


@@ -141,6 +142,7 @@ INSTALLED_APPS = [
     'lesmianator',
     'opds',
     'pdcounter',
     'lesmianator',
     'opds',
     'pdcounter',

+    'piwik.django',

 ]
 
 #CACHE_BACKEND = 'locmem:///?max_entries=3000'
 ]
 
 #CACHE_BACKEND = 'locmem:///?max_entries=3000'

diff --git a/wolnelektury/templates/base.html b/wolnelektury/templates/base.html
index 4d43c28..7832dcd 100644 (file)
--- a/wolnelektury/templates/base.html
+++ b/wolnelektury/templates/base.html
@@ -117,6 +117,7 @@
             </div>
         </div>
         {% endblock bodycontent %}
             </div>
         </div>
         {% endblock bodycontent %}

+        {{ piwik_tag|safe }}

         <script type="text/javascript">
         var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
         document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
         <script type="text/javascript">
         var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
         document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));