Small photo fixes

[sommitrealweird.git] / sommitrealweird / settings.py

diff --git a/sommitrealweird/settings.py b/sommitrealweird/settings.py
index 923222fb0529ba4cbe38bb9bfc44cbfc9e8ba3d4..e4d2dcccd43addd35e6552c2b6a6b05997e770aa 100644 (file)
--- a/sommitrealweird/settings.py
+++ b/sommitrealweird/settings.py
@@ -1,32 +1,27 @@
 # Django settings for sommitrealweird project.
 
 # Django settings for sommitrealweird project.
 

-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
+# Rather than editing these here, add them to the localsettings.py file which
+# will be included at the end of the run
+
+import os
+
+topdir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))

 
 ADMINS = (
 
 ADMINS = (

-    # ('Your Name', 'your_email@domain.com'),

     ('Brett Parker', 'iDunno@sommitrealweird.co.uk'),
 )
 
 MANAGERS = ADMINS
 
     ('Brett Parker', 'iDunno@sommitrealweird.co.uk'),
 )
 
 MANAGERS = ADMINS
 

-DATABASE_ENGINE = 'sqlite3'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
-DATABASE_NAME = '/home/brettp/dev/sommitrealweird/sommitrealweird.db'             # Or path to database file if using sqlite3.
-DATABASE_USER = ''             # Not used with sqlite3.
-DATABASE_PASSWORD = ''         # Not used with sqlite3.
-DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
-
-# Local time zone for this installation. Choices can be found here:
-# http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
-# although not all variations may be possible on all operating systems.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
+DATABASE_ENGINE = 'sqlite3'
+DATABASE_NAME = os.path.join(topdir, 'sommitrealweird.db')
+DATABASE_USER = ''
+DATABASE_PASSWORD = ''
+DATABASE_HOST = ''
+DATABASE_PORT = ''
+

 TIME_ZONE = 'Europe/London'
 
 TIME_ZONE = 'Europe/London'
 

-# Language code for this installation. All choices can be found here:
-# http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes
-# http://blogs.law.harvard.edu/tech/stories/storyReader$15

 LANGUAGE_CODE = 'en-gb'
 
 SITE_ID = 1
 LANGUAGE_CODE = 'en-gb'
 
 SITE_ID = 1


@@ -35,29 +30,21 @@ SITE_ID = 1
 # to load the internationalization machinery.
 USE_I18N = True
 
 # to load the internationalization machinery.
 USE_I18N = True
 

-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = '/home/brettp/dev/sommitrealweird/media/'
-
-# URL that handles the media served from MEDIA_ROOT.
-# Example: "http://media.lawrence.com"
+MEDIA_ROOT = os.path.join(topdir, 'media') + os.sep

 MEDIA_URL = '/media/'
 
 MEDIA_URL = '/media/'
 

-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".

 ADMIN_MEDIA_PREFIX = '/admin-media/'
 
 ADMIN_MEDIA_PREFIX = '/admin-media/'
 

-# Make this unique, and don't share it with anybody.
-SECRET_KEY = '$!roq-b5snvjxi4dr2y7(l(@$@k+2%aub&)s__0)k#r&c(8(4x'
+import random
+import string
+key_chars = "%s%s%s" % (string.letters, string.digits, '+-()_#~')
+SECRET_KEY = [random.choice(key_chars) for a in range(0,50)]

 
 

-CACHE_BACKEND = 'file:///home/brettp/dev/sommitrealweird/tmp'
+CACHE_BACKEND = 'file://%s/tmp' %(topdir)

 
 

-# List of callables that know how to import templates from various sources.

 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.load_template_source',
     'django.template.loaders.app_directories.load_template_source',
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.load_template_source',
     'django.template.loaders.app_directories.load_template_source',

-#     'django.template.loaders.eggs.load_template_source',

 )
 
 MIDDLEWARE_CLASSES = (
 )
 
 MIDDLEWARE_CLASSES = (


@@ -70,10 +57,7 @@ MIDDLEWARE_CLASSES = (
 ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = (
 ROOT_URLCONF = '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.
-    "/home/brettp/dev/sommitrealweird/templates",
+    os.path.join(topdir, 'templates'),

 )
 
 INSTALLED_APPS = (
 )
 
 INSTALLED_APPS = (


@@ -86,6 +70,7 @@ INSTALLED_APPS = (
     'bpcms',
     'generic',
     'blog',
     'bpcms',
     'generic',
     'blog',

+    'photo',

 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (


@@ -97,10 +82,15 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'bpcms.context_processors.content_submenu',
     'bpcms.context_processors.content_breadcrumb',
     'blog.context_processors.content_breadcrumb',
     'bpcms.context_processors.content_submenu',
     'bpcms.context_processors.content_breadcrumb',
     'blog.context_processors.content_breadcrumb',

+    'photo.context_processors.content_breadcrumb',

 )
 
 APPEND_SLASH=False
 
 )
 
 APPEND_SLASH=False
 

+RESTRUCTUREDTEXT_FILTER_SETTINGS = {
+    'initial_header_level': 2,
+}
+

 BPCMS_ROOT = '/'
 BPCMS_DISALLOWED_ROOT_DOC_NAMES = (
     'admin',
 BPCMS_ROOT = '/'
 BPCMS_DISALLOWED_ROOT_DOC_NAMES = (
     'admin',


@@ -110,3 +100,9 @@ BPCMS_DISALLOWED_ROOT_DOC_NAMES = (
 
 BLOG_ROOT = '/blog/'
 BLOG_TITLE = u'The World of SommitRealWeird.'
 
 BLOG_ROOT = '/blog/'
 BLOG_TITLE = u'The World of SommitRealWeird.'

+
+try:
+    from localsettings import *
+except:
+    pass
+