remove legacy gallery application

[panikweb.git] / panikweb / settings.py

diff --git a/panikweb/settings.py b/panikweb/settings.py
index f316a5e7403950e3fa6ada186bc592e35eadb6c5..49819ad66b4ac9fd667e0c7625888688d2746e9a 100644 (file)
--- a/panikweb/settings.py
+++ b/panikweb/settings.py
@@ -166,10 +166,10 @@ INSTALLED_APPS = (
     'combo.data',
     'combo.public',
     'combo.profile',
+    'combo.apps.assets',
     'combo.apps.dashboard',
     'combo.apps.search',
     'panikombo',
-    'gallery',
 )
 
 CKEDITOR_UPLOAD_PATH = os.path.join(MEDIA_ROOT, 'uploads')
@@ -241,7 +241,10 @@ LANGUAGE_COOKIE_NAME = 'panikweb_language'
 TEMPLATE_VARS = {}
 
 COMBO_DASHBOARD_ENABLED = False
+COMBO_MAP_TILE_URLTEMPLATE = ''
+COMBO_MAP_ATTRIBUTION = ''
 JSON_CELL_TYPES = {}
+COMBO_CELL_ASSET_SLOTS = {}
 
 RADIO_NAME = 'Radio Panik'
 RADIO_LONG_NAME = 'Radio Panik - 105.4 FM'
@@ -250,10 +253,11 @@ WEBSITE_BASE_URL = 'http://www.radiopanik.org/'
 COMBO_INITIAL_LOGIN_PAGE_PATH = '/'
 COMBO_WELCOME_PAGE_PATH = None
 
-try:
-    from .local_settings import *
-except ImportError as e:
-    pass
+local_settings_file = os.environ.get(
+    'PANIKWEB_SETTINGS_FILE', os.path.join(os.path.dirname(__file__), 'local_settings.py')
+)
+if os.path.exists(local_settings_file):
+    exec(open(local_settings_file).read())
 
 if DEBUG and DEBUG_TOOLBAR:
     MIDDLEWARE_CLASSES += (