diff bns_website/settings/base.py @ 39:b9d6f6d930a9

Merged Chris and Brian's changes with mine.
author Bob Mourlam <bob.mourlam@gmail.com>
date Sun, 06 Nov 2011 20:28:25 -0600
parents ced908af601a
children a0d3bc630ebd
line wrap: on
line diff
--- a/bns_website/settings/base.py	Sun Nov 06 20:22:40 2011 -0600
+++ b/bns_website/settings/base.py	Sun Nov 06 20:28:25 2011 -0600
@@ -1,6 +1,6 @@
 # Django base settings for bns_website project.
 
-import json
+import django.utils.simplejson as json
 import os
 
 PROJECT_PATH = os.path.abspath(os.path.join(os.path.split(__file__)[0], '..'))
@@ -9,22 +9,13 @@
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = [
+    ('Bob Mourlam', 'bob.mourlam@gmail.com'),
     ('Brian Neal', 'bgneal@gmail.com'),
+    ('Chris Ridgway', 'ckridgway@gmail.com'),
 ]
 
 MANAGERS = ADMINS
 
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': '',                      # Or path to database file if using sqlite3.
-        'USER': '',                      # Not used with sqlite3.
-        'PASSWORD': '',                  # Not used with sqlite3.
-        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
-        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
-    }
-}
-
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
@@ -50,7 +41,7 @@
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/home/media/media.lawrence.com/media/"
-MEDIA_ROOT = os.path.abspath(os.path.join(PROJECT_PATH, '..', 'media'))
+MEDIA_ROOT = os.path.abspath(os.path.join(PROJECT_PATH, '..', '..', 'media'))
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.
@@ -61,7 +52,7 @@
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = os.path.abspath(os.path.join(PROJECT_PATH, '..', 'static'))
+STATIC_ROOT = os.path.abspath(os.path.join(PROJECT_PATH, '..', '..', 'static'))
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
@@ -161,3 +152,18 @@
         },
     }
 }
+
+#######################################################################
+# 3rd party Javascript and CSS files.
+#
+# Listed here to for DRY purposes.
+#
+THIRD_PARTY_JS = {
+    'tiny_mce': [
+        'js/tinymce/jscripts/tiny_mce/tiny_mce.js',
+        'js/tiny_mce_init.js',
+    ],
+}
+
+THIRD_PARTY_CSS = {
+}