settings: add new COMBO_MAP_ required settings

[panikdb.git] / panikdb / settings.py

diff --git a/panikdb/settings.py b/panikdb/settings.py
index c41146a7a61964ddb422c705f58dc0cd990981c8..1c4eaff6da93bbc7ae09f6eb811aa741122826f9 100644 (file)
--- a/panikdb/settings.py
+++ b/panikdb/settings.py
@@ -72,6 +72,8 @@ STATIC_ROOT = os.path.join(PROJECT_PATH, 'static')
 # Example: "http://example.com/static/", "http://static.example.com/"
 STATIC_URL = '/static/'
 
+SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
+
 CKEDITOR_UPLOAD_PATH = 'uploads/'
 CKEDITOR_UPLOAD_PREFIX = '/media/uploads/'
 
@@ -100,6 +102,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 +111,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 +158,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
@@ -246,18 +251,25 @@ RAVEN_CONFIG = None
 
 from panikombo.misc import COMBO_PUBLIC_TEMPLATES
 COMBO_DEFAULT_PUBLIC_TEMPLATE = 'standard'
+COMBO_MAP_TILE_URLTEMPLATE = ''
+COMBO_MAP_ATTRIBUTION = ''
 
 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
+HAS_SOMA = False
+SITE_TITLE = 'PanikDB'
+
 try:
-    from local_settings import *
+    from .local_settings import *
 except ImportError:
     pass