updated settings

This commit is contained in:
James Tauber 2012-05-29 15:06:24 -04:00
parent e3c79c056c
commit fc69aa85e8

View file

@ -79,7 +79,6 @@ STATICFILES_DIRS = [
STATICFILES_FINDERS = [ STATICFILES_FINDERS = [
"staticfiles.finders.FileSystemFinder", "staticfiles.finders.FileSystemFinder",
"staticfiles.finders.AppDirectoriesFinder", "staticfiles.finders.AppDirectoriesFinder",
"staticfiles.finders.LegacyAppDirectoriesFinder",
"compressor.finders.CompressorFinder", "compressor.finders.CompressorFinder",
] ]
@ -96,8 +95,8 @@ SECRET_KEY = "8*br)9@fs!4nzg-imfrsst&oa2udy6z-fqtdk0*e5c1=wn)(t3"
# List of callables that know how to import templates from various sources. # List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = [ TEMPLATE_LOADERS = [
"django.template.loaders.filesystem.load_template_source", "django.template.loaders.filesystem.Loader",
"django.template.loaders.app_directories.load_template_source", "django.template.loaders.app_directories.Loader",
] ]
MIDDLEWARE_CLASSES = [ MIDDLEWARE_CLASSES = [
@ -107,12 +106,10 @@ MIDDLEWARE_CLASSES = [
"django.contrib.auth.middleware.AuthenticationMiddleware", "django.contrib.auth.middleware.AuthenticationMiddleware",
"django_openid.consumer.SessionConsumer", "django_openid.consumer.SessionConsumer",
"django.contrib.messages.middleware.MessageMiddleware", "django.contrib.messages.middleware.MessageMiddleware",
"pinax.apps.account.middleware.LocaleMiddleware",
"pinax.middleware.security.HideSensistiveFieldsMiddleware",
"debug_toolbar.middleware.DebugToolbarMiddleware", "debug_toolbar.middleware.DebugToolbarMiddleware",
] ]
ROOT_URLCONF = "symposion_project.urls" ROOT_URLCONF = "symposion.urls"
TEMPLATE_DIRS = [ TEMPLATE_DIRS = [
os.path.join(PROJECT_ROOT, "templates"), os.path.join(PROJECT_ROOT, "templates"),
@ -125,12 +122,8 @@ TEMPLATE_CONTEXT_PROCESSORS = [
"django.core.context_processors.media", "django.core.context_processors.media",
"django.core.context_processors.request", "django.core.context_processors.request",
"django.contrib.messages.context_processors.messages", "django.contrib.messages.context_processors.messages",
"pinax_utils.context_processors.settings",
"staticfiles.context_processors.static", "account.context_processors.account",
"pinax.core.context_processors.pinax_settings",
"pinax.apps.account.context_processors.account",
] ]
INSTALLED_APPS = [ INSTALLED_APPS = [
@ -143,31 +136,27 @@ INSTALLED_APPS = [
"django.contrib.messages", "django.contrib.messages",
"django.contrib.humanize", "django.contrib.humanize",
"pinax.templatetags",
# theme # theme
"pinax_theme_bootstrap_account",
"pinax_theme_bootstrap", "pinax_theme_bootstrap",
"django_forms_bootstrap", # "django_forms_bootstrap",
# external # external
"staticfiles",
"compressor", "compressor",
"debug_toolbar", "debug_toolbar",
"mailer", "mailer",
"django_openid", "django_openid",
"timezones", "timezones",
"emailconfirmation",
"metron", "metron",
"easy_thumbnails", "easy_thumbnails",
# Pinax # Pinax
"pinax.apps.account", "account",
"pinax.apps.signup_codes",
# project # project
"about", "symposion.about",
"sponsorship", "symposion.sponsorship",
"conference", "symposion.conference",
] ]
FIXTURE_DIRS = [ FIXTURE_DIRS = [
@ -185,9 +174,9 @@ ACCOUNT_EMAIL_VERIFICATION = False
ACCOUNT_EMAIL_AUTHENTICATION = False ACCOUNT_EMAIL_AUTHENTICATION = False
ACCOUNT_UNIQUE_EMAIL = EMAIL_CONFIRMATION_UNIQUE_EMAIL = False ACCOUNT_UNIQUE_EMAIL = EMAIL_CONFIRMATION_UNIQUE_EMAIL = False
AUTHENTICATION_BACKENDS = [ # AUTHENTICATION_BACKENDS = [
"pinax.apps.account.auth_backends.AuthenticationBackend", # "pinax.apps.account.auth_backends.AuthenticationBackend",
] # ]
LOGIN_URL = "/account/login/" # @@@ any way this can be a url name? LOGIN_URL = "/account/login/" # @@@ any way this can be a url name?
LOGIN_REDIRECT_URLNAME = "what_next" LOGIN_REDIRECT_URLNAME = "what_next"