use page pictures in topiks menu items

[panikweb.git] / panikweb / settings.py

diff --git a/panikweb/settings.py b/panikweb/settings.py
index 5cc31ff8c6b5166d91d6697f51a2e794012d74d6..5173478157c83445c214c42ca6ec2b11ddf435b3 100644 (file)
--- a/panikweb/settings.py
+++ b/panikweb/settings.py
@@ -88,9 +88,11 @@ STATICFILES_DIRS = (
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+    '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'
 
@@ -124,7 +126,10 @@ TEMPLATES = [
                 'django.template.context_processors.request',
                 'django.template.context_processors.static',
                 'django.template.context_processors.tz',
-                'panikweb.context_processors.site_url',
+                'panikweb.context_processors.panikweb',
+            ],
+            'builtins': [
+                'combo.public.templatetags.combo',
             ],
         },
     },
@@ -150,6 +155,7 @@ INSTALLED_APPS = (
     'django.contrib.admindocs',
     'haystack',
     'taggit',
+    'gadjo',
     'panikweb_templates',
     'panikweb.paniktags',
     'sorl.thumbnail',
@@ -235,16 +241,20 @@ LANGUAGE_COOKIE_NAME = 'panikweb_language'
 TEMPLATE_VARS = {}
 
 COMBO_DASHBOARD_ENABLED = False
+COMBO_MAP_TILE_URLTEMPLATE = ''
+COMBO_MAP_ATTRIBUTION = ''
 JSON_CELL_TYPES = {}
 
+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
 
 try:
-    from local_settings import *
-except ImportError, e:
+    from .local_settings import *
+except ImportError as e:
     pass
 
 if DEBUG and DEBUG_TOOLBAR: