summaryrefslogtreecommitdiff
path: root/config/settings/settings.py
diff options
context:
space:
mode:
authorluxagraf <sng@luxagraf.net>2014-05-23 20:46:53 -0400
committerluxagraf <sng@luxagraf.net>2014-05-23 20:46:53 -0400
commit317a8508fe320c34a4d39a76ffbfa24e5ca8c4f9 (patch)
treea981cd1a676ce8fce623b8bcec8bdb44f7bcde08 /config/settings/settings.py
parent8eb15a5a3c6e2ee1e1e839f14775583e85e389ba (diff)
added images to books and imported books from stuff model
Diffstat (limited to 'config/settings/settings.py')
-rw-r--r--config/settings/settings.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/config/settings/settings.py b/config/settings/settings.py
index 4af223c..9896c7a 100644
--- a/config/settings/settings.py
+++ b/config/settings/settings.py
@@ -1,7 +1,7 @@
import os
from os.path import dirname, abspath
-PROJ_ROOT = abspath(dirname(dirname(dirname(__file__))))+'/'
+PROJ_ROOT = abspath(dirname(dirname(dirname(__file__)))) + '/'
DEBUG = True
TEMPLATE_DEBUG = DEBUG
@@ -26,7 +26,6 @@ TIME_ZONE = 'America/New_York'
LANGUAGE_CODE = 'en-us'
SITE_ID = 1
SITE_URL = 'http://luxagraf.net/'
-GRAPPELLI_ADMIN_TITLE = 'Luxagraf Admin'
USE_I18N = False
USE_L10N = True
USE_TZ = False
@@ -39,10 +38,6 @@ EMAIL_HOST_PASSWORD = '^C9XZz55UJ@j2@5XNU'
EMAIL_PORT = 587
-#API key for Google Maps in Admin
-MAP_API = "google"
-GOOGLE_MAPS_API_KEY = MAP_API_KEY = 'ABQIAAAAEZ0Oz7LFDmdS1OBHm6HLgRQT5Lr-mnFT_29u-YVgAYs_K_u6-BQ627CkPKq44oaHpmSt2497hDj_LQ'
-
# API key for Flickr imports
FLICKR_API_KEY = '7b9d978a440c6ab65a545adc0aa0d693'
FLICKR_API_SECRET = '42ad60f04745cd9b'
@@ -93,7 +88,6 @@ STATICFILES_DIRS = (
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-# 'django.contrib.staticfiles.finders.DefaultStorageFinder',
)
# Make this unique, and don't share it with anybody.
@@ -103,7 +97,6 @@ SECRET_KEY = '^gaz8-&amp;iy8z@(nwp#xe1age(t141w-47fh=cv8a7w2=x2=a-&amp;7'
TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
-# 'django.template.loaders.eggs.Loader',
)
MIDDLEWARE_CLASSES = (
@@ -139,7 +132,7 @@ TEMPLATE_DIRS = (
)
-INSTALLED_APPS = (
+INSTALLED_APPS = (
'django.contrib.auth',
'django.contrib.staticfiles',
'django.contrib.contenttypes',
@@ -162,6 +155,7 @@ INSTALLED_APPS = (
'pages',
'birds',
'books',
+ 'stuff',
'fluent_comments',
'crispy_forms',
'django.contrib.comments',