More generic pages.

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

diff --git a/src/wolnelektury/settings/basic.py b/src/wolnelektury/settings/basic.py
index 133db91..2e3d81d 100644 (file)
--- a/src/wolnelektury/settings/basic.py
+++ b/src/wolnelektury/settings/basic.py
@@ -2,7 +2,6 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from os import path
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from os import path

-from machina import MACHINA_MAIN_TEMPLATE_DIR

 from .paths import PROJECT_DIR
 
 DEBUG = True
 from .paths import PROJECT_DIR
 
 DEBUG = True


@@ -15,6 +14,8 @@ MANAGERS = ADMINS
 
 CONTACT_EMAIL = 'fundacja@nowoczesnapolska.org.pl'
 
 
 CONTACT_EMAIL = 'fundacja@nowoczesnapolska.org.pl'
 

+CACHE_MIDDLEWARE_SECONDS = 24 * 60 * 60
+

 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',  # 'postgresql_psycopg2'
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',  # 'postgresql_psycopg2'


@@ -42,11 +43,6 @@ 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': {
         'context_processors': (
             'django.contrib.auth.context_processors.auth',
     'OPTIONS': {
         'context_processors': (
             'django.contrib.auth.context_processors.auth',


@@ -57,10 +53,17 @@ TEMPLATES = [{
             'django.template.context_processors.request',
             'wolnelektury.context_processors.extra_settings',
             'search.context_processors.search_form',
             'django.template.context_processors.request',
             'wolnelektury.context_processors.extra_settings',
             'search.context_processors.search_form',

-            'machina.core.context_processors.metadata',

         ),
         ),

+        'loaders': [
+            'django.template.loaders.filesystem.Loader',
+            'django.template.loaders.app_directories.Loader',
+        ],

     },
 }]
     },
 }]

+if not DEBUG:
+    TEMPLATES['loaders'] = [
+        ('django.template.loaders.cached.Loader', TEMPLATES['loaders'])
+    ]

 
 MIDDLEWARE = [
     'debug_toolbar.middleware.DebugToolbarMiddleware',
 
 MIDDLEWARE = [
     'debug_toolbar.middleware.DebugToolbarMiddleware',


@@ -76,7 +79,6 @@ MIDDLEWARE = [
     'django.contrib.messages.middleware.MessageMiddleware',
     'fnpdjango.middleware.SetRemoteAddrFromXRealIP',
     'django.middleware.cache.FetchFromCacheMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'fnpdjango.middleware.SetRemoteAddrFromXRealIP',
     'django.middleware.cache.FetchFromCacheMiddleware',

-    'machina.apps.forum_permission.middleware.ForumPermissionMiddleware',

     'experiments.middleware.experiments_middleware',
 ]
 
     'experiments.middleware.experiments_middleware',
 ]