move static & templates to panikweb project directory

[panikweb.git] / panikweb / settings.py

diff --git a/panikweb/settings.py b/panikweb/settings.py
index 5173478157c83445c214c42ca6ec2b11ddf435b3..9bcb2fc12481820f65479ce7b042bb95d82f7cf5 100644 (file)
--- a/panikweb/settings.py
+++ b/panikweb/settings.py
@@ -114,7 +114,7 @@ TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'DIRS': [
-            os.path.join(PROJECT_DIR, 'panikweb_templates'),
+            os.path.join(PROJECT_DIR, 'panikweb', 'templates'),
         ],
         'APP_DIRS': True,
         'OPTIONS': {
@@ -156,7 +156,6 @@ INSTALLED_APPS = (
     'haystack',
     'taggit',
     'gadjo',
-    'panikweb_templates',
     'panikweb.paniktags',
     'sorl.thumbnail',
     'ckeditor',
@@ -166,10 +165,11 @@ INSTALLED_APPS = (
     'combo.data',
     'combo.public',
     'combo.profile',
+    'combo.apps.assets',
     'combo.apps.dashboard',
+    'combo.apps.gallery',
     'combo.apps.search',
     'panikombo',
-    'gallery',
 )
 
 CKEDITOR_UPLOAD_PATH = os.path.join(MEDIA_ROOT, 'uploads')
@@ -244,6 +244,7 @@ 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'
@@ -252,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 += (