move static & templates to panikweb project directory

[panikweb.git] / panikweb / settings.py

diff --git a/panikweb/settings.py b/panikweb/settings.py
index b97d89f7705fef7538884e4b6bbf6dd4118e92fb..9bcb2fc12481820f65479ce7b042bb95d82f7cf5 100644 (file)
--- a/panikweb/settings.py
+++ b/panikweb/settings.py
@@ -6,7 +6,6 @@ import os
 import django.conf.global_settings as DEFAULT_SETTINGS
 
 DEBUG = True  # Turn off for production
-TEMPLATE_DEBUG = DEBUG
 DEBUG_TOOLBAR = False
 
 PROJECT_DIR = os.path.normpath(os.path.dirname(os.path.dirname(__file__)))
@@ -89,20 +88,14 @@ STATICFILES_DIRS = (
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-    'compressor.finders.CompressorFinder',
+    'gadjo.finders.XStaticFinder',
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
+
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = '3qm&@6264-=st16)7_xa*ds+31e0mqqs@+*!ud7gzt$tq!b^qn'
 
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.load_template_source',
-)
-
 MIDDLEWARE_CLASSES = (
     'django.middleware.cache.UpdateCacheMiddleware',
     #'django.middleware.gzip.GZipMiddleware',
@@ -117,10 +110,30 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.cache.FetchFromCacheMiddleware',
 )
 
-TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS + (
-    'django.core.context_processors.request',
-    'panikweb.context_processors.site_url',
-)
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [
+            os.path.join(PROJECT_DIR, 'panikweb', 'templates'),
+        ],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.contrib.auth.context_processors.auth',
+                'django.template.context_processors.debug',
+                'django.template.context_processors.i18n',
+                'django.template.context_processors.media',
+                'django.template.context_processors.request',
+                'django.template.context_processors.static',
+                'django.template.context_processors.tz',
+                'panikweb.context_processors.panikweb',
+            ],
+            'builtins': [
+                'combo.public.templatetags.combo',
+            ],
+        },
+    },
+]
 
 
 ROOT_URLCONF = 'panikweb.urls'
@@ -142,11 +155,9 @@ INSTALLED_APPS = (
     'django.contrib.admindocs',
     'haystack',
     'taggit',
-    'panikweb_templates',
+    'gadjo',
     'panikweb.paniktags',
-    'compressor',
     'sorl.thumbnail',
-    'jquery',
     'ckeditor',
     'emissions',
     'newsletter',
@@ -154,9 +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')
@@ -225,10 +238,26 @@ from panikombo.misc import COMBO_PUBLIC_TEMPLATES
 
 LANGUAGE_COOKIE_NAME = 'panikweb_language'
 
-try:
-    from local_settings import *
-except ImportError, e:
-    pass
+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'
+WEBSITE_BASE_URL = 'http://www.radiopanik.org/'
+
+COMBO_INITIAL_LOGIN_PAGE_PATH = '/'
+COMBO_WELCOME_PAGE_PATH = None
+
+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 += (