templates: strip label of embed dialog

[panikweb.git] / panikweb / settings.py

diff --git a/panikweb/settings.py b/panikweb/settings.py
index b97d89f7705fef7538884e4b6bbf6dd4118e92fb..4f80496cb5d81fc3829c01c1352b1af5a67bd237 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__)))
@@ -14,7 +13,8 @@ ADMINS = (
     # ('Your Name', 'your_email@domain.com'),
 )
 MANAGERS = ADMINS
-DEFAULT_FROM_EMAIL = 'info@radiopanik.org'
+DEFAULT_FROM_EMAIL = 'radio@esperanzah.be'
+ALLOWED_HOSTS = ['radio-2017.esperanzah.be', 'radio.esperanzah.be']
 
 LOGIN_REDIRECT_URL = '/'
 
@@ -89,20 +89,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,20 +111,34 @@ 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.site_url',
+            ],
+            'builtins': [
+                'combo.public.templatetags.combo',
+            ],
+        },
+    },
+]
 
 
 ROOT_URLCONF = 'panikweb.urls'
 
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
-
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -142,11 +150,11 @@ INSTALLED_APPS = (
     'django.contrib.admindocs',
     'haystack',
     'taggit',
+    'gadjo',
     'panikweb_templates',
     'panikweb.paniktags',
-    'compressor',
+    'panikweb.archives',
     'sorl.thumbnail',
-    'jquery',
     'ckeditor',
     'emissions',
     'newsletter',
@@ -154,7 +162,9 @@ INSTALLED_APPS = (
     'combo.data',
     'combo.public',
     'combo.profile',
+    'combo.apps.maps',
     'combo.apps.search',
+    'combo.apps.dashboard',
     'panikombo',
     'gallery',
 )
@@ -225,9 +235,19 @@ from panikombo.misc import COMBO_PUBLIC_TEMPLATES
 
 LANGUAGE_COOKIE_NAME = 'panikweb_language'
 
+TEMPLATE_VARS = {}
+
+COMBO_DASHBOARD_ENABLED = False
+JSON_CELL_TYPES = {}
+
+WEBSITE_BASE_URL = 'http://www.radiopanik.org/'
+
+COMBO_INITIAL_LOGIN_PAGE_PATH = '/'
+COMBO_WELCOME_PAGE_PATH = None
+
 try:
-    from local_settings import *
-except ImportError, e:
+    from .local_settings import *
+except ImportError as e:
     pass
 
 if DEBUG and DEBUG_TOOLBAR:
@@ -258,3 +278,10 @@ if RAVEN_CONFIG:
     INSTALLED_APPS += (
         'raven.contrib.django.raven_compat',
     )
+
+AUTH_USER_MODEL = 'aa.User'
+INSTALLED_APPS += ('panikdb.aa',)
+
+COMBO_DASHBOARD_ENABLED = False
+
+JSON_CELL_TYPES = {}