edit buttons

[wolnelektury.git] / src / wolnelektury / settings / basic.py

diff --git a/src/wolnelektury/settings/basic.py b/src/wolnelektury/settings/basic.py
index ed80fee..c640d31 100644 (file)
--- a/src/wolnelektury/settings/basic.py
+++ b/src/wolnelektury/settings/basic.py
@@ -40,17 +40,12 @@ SITE_ID = 1
 
 TEMPLATES = [{
     'BACKEND': 'django.template.backends.django.DjangoTemplates',
 
 TEMPLATES = [{
     'BACKEND': 'django.template.backends.django.DjangoTemplates',

+    'APP_DIRS': True,

     'DIRS': (
         path.join(PROJECT_DIR, 'templates'),  # Duplicate, because of Machina<1 weird configuration.
         MACHINA_MAIN_TEMPLATE_DIR,
     ),
     'OPTIONS': {
     'DIRS': (
         path.join(PROJECT_DIR, 'templates'),  # Duplicate, because of Machina<1 weird configuration.
         MACHINA_MAIN_TEMPLATE_DIR,
     ),
     'OPTIONS': {

-        'loaders': (
-            ('django.template.loaders.cached.Loader', (
-                'django.template.loaders.filesystem.Loader',
-                'django.template.loaders.app_directories.Loader',
-            )),
-        ),

         'context_processors': (
             'django.contrib.auth.context_processors.auth',
             'django.contrib.messages.context_processors.messages',
         'context_processors': (
             'django.contrib.auth.context_processors.auth',
             'django.contrib.messages.context_processors.messages',


@@ -59,7 +54,6 @@ TEMPLATES = [{
             'django.template.context_processors.media',
             'django.template.context_processors.request',
             'wolnelektury.context_processors.extra_settings',
             'django.template.context_processors.media',
             'django.template.context_processors.request',
             'wolnelektury.context_processors.extra_settings',

-            'wolnelektury.abtests.context_processor',

             'search.context_processors.search_form',
             'machina.core.context_processors.metadata',
         ),
             'search.context_processors.search_form',
             'machina.core.context_processors.metadata',
         ),


@@ -81,6 +75,7 @@ MIDDLEWARE = [
     'fnpdjango.middleware.SetRemoteAddrFromXRealIP',
     'django.middleware.cache.FetchFromCacheMiddleware',
     'machina.apps.forum_permission.middleware.ForumPermissionMiddleware',
     'fnpdjango.middleware.SetRemoteAddrFromXRealIP',
     'django.middleware.cache.FetchFromCacheMiddleware',
     'machina.apps.forum_permission.middleware.ForumPermissionMiddleware',

+    'experiments.middleware.experiments_middleware',

 ]
 
 ROOT_URLCONF = 'wolnelektury.urls'
 ]
 
 ROOT_URLCONF = 'wolnelektury.urls'