settings: use native combo gallery application

[panikdb.git] / panikdb / settings.py

diff --git a/panikdb/settings.py b/panikdb/settings.py
index c41146a7a61964ddb422c705f58dc0cd990981c8..88b242abc8fc45a3c6c97112a8b5901bc9c03f05 100644 (file)
--- a/panikdb/settings.py
+++ b/panikdb/settings.py
@@ -100,6 +100,7 @@ TEMPLATES = [
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
+                'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.template.context_processors.debug',
                 'django.template.context_processors.i18n',
@@ -108,6 +109,7 @@ TEMPLATES = [
                 'django.template.context_processors.tz',
                 'django.contrib.messages.context_processors.messages',
                 'panikdb.context_processors.internal_ip',
+                'panikdb.context_processors.site_settings',
             ],
         },
     },
@@ -154,13 +156,14 @@ INSTALLED_APPS = (
     'combo.data',
     'combo.manager',
     'combo.apps.assets',
+    'combo.apps.gallery',
     'combo.apps.maps',
     'combo.apps.notifications',
     'combo.apps.pwa',
     'sorl.thumbnail',
-    'gallery',
     'panikombo',
     'django_select2',
+    'xstatic.pkg.select2',
 )
 
 # A sample logging configuration. The only tangible logging
@@ -252,12 +255,16 @@ AUTO_RENDER_SELECT2_STATICS = False
 PIGE_DOWNLOAD_BASE_URL = 'http://pige.panik/extractor/download.cgi'
 
 JSON_CELL_TYPES = {}
+TEMPLATE_VARS = {}
 
 FILE_UPLOAD_DIRECTORY_PERMISSIONS = 0o755
 FILE_UPLOAD_PERMISSIONS = 0o644
 
+ENABLE_TOPIKS = True
+SITE_TITLE = 'PanikDB'
+
 try:
-    from local_settings import *
+    from .local_settings import *
 except ImportError:
     pass