From 8130338044d635ce9038d7dd58af06f59cc330bc Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 27 Apr 2010 19:42:33 -0400 Subject: started adding admin interface --- settings.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'settings.py') diff --git a/settings.py b/settings.py index f9b776cd..97d80e97 100644 --- a/settings.py +++ b/settings.py @@ -11,8 +11,10 @@ SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm' TEMPLATE_LOADERS = ( 'django.template.loaders.filesystem.load_template_source', 'django.template.loaders.app_directories.load_template_source', + + #below is forum stuff for this tuple 'forum.modules.module_templates_loader',#todo: remove this - 'forum.skins.load_template_source', + 'forum.skins.load_template_source',#forum stuff # 'django.template.loaders.eggs.load_template_source', ) @@ -25,6 +27,8 @@ MIDDLEWARE_CLASSES = ( #'django.middleware.cache.FetchFromCacheMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', #'django.middleware.sqlprint.SqlPrintingMiddleware', + + #below is forum stuff for this tuple 'forum.middleware.anon_user.ConnectToSessionMessagesMiddleware', 'forum.middleware.pagesize.QuestionsPageSizeMiddleware', 'forum.middleware.cancel.CancelActionMiddleware', @@ -34,6 +38,7 @@ MIDDLEWARE_CLASSES = ( 'forum.middleware.view_log.ViewLogMiddleware', ) +#all of these are necessary for the forum and absend in default settings.py TEMPLATE_CONTEXT_PROCESSORS = ( 'django.core.context_processors.request', 'forum.context.application_settings', @@ -45,6 +50,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( ROOT_URLCONF = 'urls' TEMPLATE_DIRS = ( + #specific to forum os.path.join(os.path.dirname(__file__),'forum','skins').replace('\\','/'), ) @@ -66,16 +72,19 @@ INSTALLED_APPS = ( 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.sites', + + #all of these are needed for the forum 'django.contrib.admin', 'django.contrib.humanize', 'django.contrib.sitemaps', 'debug_toolbar', - #'django_evolution', 'forum', 'django_authopenid', 'debug_toolbar' , #'forum.importers.stackexchange', #se loader 'south', + 'livesettings', + 'keyedcache', ) AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',) @@ -83,7 +92,7 @@ AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',) if USE_FB_CONNECT: INSTALLED_APPS += ('fbconnect',) -#load optional plugin module for external password login +#this needs to go if 'USE_EXTERNAL_LEGACY_LOGIN' in locals() and USE_EXTERNAL_LEGACY_LOGIN: INSTALLED_APPS += (EXTERNAL_LEGACY_LOGIN_MODULE,) -- cgit v1.2.3-1-g7c22 From 950c36db5bd0540ffcc60a8d89cae303db12b941 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Sat, 8 May 2010 23:19:05 -0400 Subject: broken commit. in the middle of moving conf to models --- settings.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'settings.py') diff --git a/settings.py b/settings.py index 97d80e97..98555997 100644 --- a/settings.py +++ b/settings.py @@ -89,9 +89,6 @@ INSTALLED_APPS = ( AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',) -if USE_FB_CONNECT: - INSTALLED_APPS += ('fbconnect',) - #this needs to go if 'USE_EXTERNAL_LEGACY_LOGIN' in locals() and USE_EXTERNAL_LEGACY_LOGIN: INSTALLED_APPS += (EXTERNAL_LEGACY_LOGIN_MODULE,) -- cgit v1.2.3-1-g7c22 From 02247d157b3da4d0711b8858bf758aefdf64c04d Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 3 Jun 2010 01:44:36 -0700 Subject: general debugging, still may be broken --- settings.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'settings.py') diff --git a/settings.py b/settings.py index 98555997..1f78d0e6 100644 --- a/settings.py +++ b/settings.py @@ -13,7 +13,6 @@ TEMPLATE_LOADERS = ( 'django.template.loaders.app_directories.load_template_source', #below is forum stuff for this tuple - 'forum.modules.module_templates_loader',#todo: remove this 'forum.skins.load_template_source',#forum stuff # 'django.template.loaders.eggs.load_template_source', ) @@ -59,10 +58,6 @@ FILE_UPLOAD_TEMP_DIR = os.path.join(os.path.dirname(__file__), 'tmp').replace('\ FILE_UPLOAD_HANDLERS = ("django.core.files.uploadhandler.MemoryFileUploadHandler", "django.core.files.uploadhandler.TemporaryFileUploadHandler",) DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage' -# for user upload -ALLOW_FILE_TYPES = ('.jpg', '.jpeg', '.gif', '.bmp', '.png', '.tiff') -# unit byte -ALLOW_MAX_FILE_SIZE = 1024 * 1024 # User settings from settings_local import * @@ -80,7 +75,6 @@ INSTALLED_APPS = ( 'debug_toolbar', 'forum', 'django_authopenid', - 'debug_toolbar' , #'forum.importers.stackexchange', #se loader 'south', 'livesettings', -- cgit v1.2.3-1-g7c22 From e5ea67fd5ec4d15a217689faa216a01814f55748 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 3 Jun 2010 18:50:56 -0400 Subject: created instant notification template and the formatting function --- settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'settings.py') diff --git a/settings.py b/settings.py index 1f78d0e6..ee820cd5 100644 --- a/settings.py +++ b/settings.py @@ -13,7 +13,7 @@ TEMPLATE_LOADERS = ( 'django.template.loaders.app_directories.load_template_source', #below is forum stuff for this tuple - 'forum.skins.load_template_source',#forum stuff + 'forum.skins.loaders.load_template_source',#forum stuff # 'django.template.loaders.eggs.load_template_source', ) -- cgit v1.2.3-1-g7c22 From 3bad7a8fa7821dfe677b0a8d06c7a779a3e57483 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Fri, 11 Jun 2010 14:42:27 -0400 Subject: added whitespace-stripping middleware and started (barely) working on revamping the individual responses page --- settings.py | 1 + 1 file changed, 1 insertion(+) (limited to 'settings.py') diff --git a/settings.py b/settings.py index ee820cd5..3546ddf7 100644 --- a/settings.py +++ b/settings.py @@ -35,6 +35,7 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.transaction.TransactionMiddleware', 'debug_toolbar.middleware.DebugToolbarMiddleware', 'forum.middleware.view_log.ViewLogMiddleware', + 'forum.middleware.spaceless.SpacelessMiddleware', ) #all of these are necessary for the forum and absend in default settings.py -- cgit v1.2.3-1-g7c22 From 3a3a11d32c72ab79ce94679aae7a549230c7104f Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Sat, 12 Jun 2010 22:51:11 -0400 Subject: moved livesettings and django_authopenid into forum/deps --- settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'settings.py') diff --git a/settings.py b/settings.py index 3546ddf7..f0d11242 100644 --- a/settings.py +++ b/settings.py @@ -75,10 +75,10 @@ INSTALLED_APPS = ( 'django.contrib.sitemaps', 'debug_toolbar', 'forum', - 'django_authopenid', + 'forum.deps.django_authopenid', #'forum.importers.stackexchange', #se loader 'south', - 'livesettings', + 'forum.deps.livesettings', 'keyedcache', ) -- cgit v1.2.3-1-g7c22 From 9e9f6b0a71fca40b7a118acb4db37e45609fb5b8 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Sun, 13 Jun 2010 01:40:01 -0400 Subject: renamed main django app from forum to askbot --- settings.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'settings.py') diff --git a/settings.py b/settings.py index f0d11242..63d29c4f 100644 --- a/settings.py +++ b/settings.py @@ -12,8 +12,8 @@ TEMPLATE_LOADERS = ( 'django.template.loaders.filesystem.load_template_source', 'django.template.loaders.app_directories.load_template_source', - #below is forum stuff for this tuple - 'forum.skins.loaders.load_template_source',#forum stuff + #below is askbot stuff for this tuple + 'askbot.skins.loaders.load_template_source',#askbot stuff # 'django.template.loaders.eggs.load_template_source', ) @@ -27,31 +27,31 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.auth.middleware.AuthenticationMiddleware', #'django.middleware.sqlprint.SqlPrintingMiddleware', - #below is forum stuff for this tuple - 'forum.middleware.anon_user.ConnectToSessionMessagesMiddleware', - 'forum.middleware.pagesize.QuestionsPageSizeMiddleware', - 'forum.middleware.cancel.CancelActionMiddleware', + #below is askbot stuff for this tuple + 'askbot.middleware.anon_user.ConnectToSessionMessagesMiddleware', + 'askbot.middleware.pagesize.QuestionsPageSizeMiddleware', + 'askbot.middleware.cancel.CancelActionMiddleware', #'recaptcha_django.middleware.ReCaptchaMiddleware', 'django.middleware.transaction.TransactionMiddleware', 'debug_toolbar.middleware.DebugToolbarMiddleware', - 'forum.middleware.view_log.ViewLogMiddleware', - 'forum.middleware.spaceless.SpacelessMiddleware', + 'askbot.middleware.view_log.ViewLogMiddleware', + 'askbot.middleware.spaceless.SpacelessMiddleware', ) -#all of these are necessary for the forum and absend in default settings.py +#all of these are necessary for the askbot and absend in default settings.py TEMPLATE_CONTEXT_PROCESSORS = ( 'django.core.context_processors.request', - 'forum.context.application_settings', + 'askbot.context.application_settings', #'django.core.context_processors.i18n', - 'forum.user_messages.context_processors.user_messages',#must be before auth + 'askbot.user_messages.context_processors.user_messages',#must be before auth 'django.core.context_processors.auth', #this is required for admin ) ROOT_URLCONF = 'urls' TEMPLATE_DIRS = ( - #specific to forum - os.path.join(os.path.dirname(__file__),'forum','skins').replace('\\','/'), + #specific to askbot + os.path.join(os.path.dirname(__file__),'askbot','skins').replace('\\','/'), ) #UPLOAD SETTINGS @@ -69,16 +69,16 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.sites', - #all of these are needed for the forum + #all of these are needed for the askbot 'django.contrib.admin', 'django.contrib.humanize', 'django.contrib.sitemaps', 'debug_toolbar', - 'forum', - 'forum.deps.django_authopenid', - #'forum.importers.stackexchange', #se loader + 'askbot', + 'askbot.deps.django_authopenid', + #'askbot.importers.stackexchange', #se loader 'south', - 'forum.deps.livesettings', + 'askbot.deps.livesettings', 'keyedcache', ) -- cgit v1.2.3-1-g7c22 From ddb36e59b96c904a09aff3ebc35259ee9522d462 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Sun, 13 Jun 2010 19:48:37 -0400 Subject: easy_install kind of works --- settings.py | 98 ------------------------------------------------------------- 1 file changed, 98 deletions(-) delete mode 100644 settings.py (limited to 'settings.py') diff --git a/settings.py b/settings.py deleted file mode 100644 index 63d29c4f..00000000 --- a/settings.py +++ /dev/null @@ -1,98 +0,0 @@ -# encoding:utf-8 -# Django settings for lanai project. -import os.path -import sys - -SITE_ID = 1 - -ADMIN_MEDIA_PREFIX = '/admin/media/' -SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm' -# 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', - - #below is askbot stuff for this tuple - 'askbot.skins.loaders.load_template_source',#askbot stuff -# 'django.template.loaders.eggs.load_template_source', -) - -MIDDLEWARE_CLASSES = ( - #'django.middleware.gzip.GZipMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - #'django.middleware.locale.LocaleMiddleware', - #'django.middleware.cache.UpdateCacheMiddleware', - 'django.middleware.common.CommonMiddleware', - #'django.middleware.cache.FetchFromCacheMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - #'django.middleware.sqlprint.SqlPrintingMiddleware', - - #below is askbot stuff for this tuple - 'askbot.middleware.anon_user.ConnectToSessionMessagesMiddleware', - 'askbot.middleware.pagesize.QuestionsPageSizeMiddleware', - 'askbot.middleware.cancel.CancelActionMiddleware', - #'recaptcha_django.middleware.ReCaptchaMiddleware', - 'django.middleware.transaction.TransactionMiddleware', - 'debug_toolbar.middleware.DebugToolbarMiddleware', - 'askbot.middleware.view_log.ViewLogMiddleware', - 'askbot.middleware.spaceless.SpacelessMiddleware', -) - -#all of these are necessary for the askbot and absend in default settings.py -TEMPLATE_CONTEXT_PROCESSORS = ( - 'django.core.context_processors.request', - 'askbot.context.application_settings', - #'django.core.context_processors.i18n', - 'askbot.user_messages.context_processors.user_messages',#must be before auth - 'django.core.context_processors.auth', #this is required for admin -) - -ROOT_URLCONF = 'urls' - -TEMPLATE_DIRS = ( - #specific to askbot - os.path.join(os.path.dirname(__file__),'askbot','skins').replace('\\','/'), -) - -#UPLOAD SETTINGS -FILE_UPLOAD_TEMP_DIR = os.path.join(os.path.dirname(__file__), 'tmp').replace('\\','/') -FILE_UPLOAD_HANDLERS = ("django.core.files.uploadhandler.MemoryFileUploadHandler", - "django.core.files.uploadhandler.TemporaryFileUploadHandler",) -DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage' - -# User settings -from settings_local import * - -INSTALLED_APPS = ( - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.sites', - - #all of these are needed for the askbot - 'django.contrib.admin', - 'django.contrib.humanize', - 'django.contrib.sitemaps', - 'debug_toolbar', - 'askbot', - 'askbot.deps.django_authopenid', - #'askbot.importers.stackexchange', #se loader - 'south', - 'askbot.deps.livesettings', - 'keyedcache', -) - -AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',) - -#this needs to go -if 'USE_EXTERNAL_LEGACY_LOGIN' in locals() and USE_EXTERNAL_LEGACY_LOGIN: - INSTALLED_APPS += (EXTERNAL_LEGACY_LOGIN_MODULE,) - - if 'EXTERNAL_LEGACY_LOGIN_AUTHENTICATION_BACKEND' in locals(): - AUTHENTICATION_BACKENDS += (EXTERNAL_LEGACY_LOGIN_AUTHENTICATION_BACKEND,) - if 'EXTERNAL_LEGACY_LOGIN_AUTHENTICATION_MIDDLEWARE' in locals(): - MIDDLEWARE_CLASSES += (EXTERNAL_LEGACY_LOGIN_AUTHENTICATION_MIDDLEWARE,) - def LOAD_EXTERNAL_LOGIN_APP(): - return __import__(EXTERNAL_LEGACY_LOGIN_MODULE, [], [], ['api','forms','views']) -else: - LOAD_EXTERNAL_LOGIN_APP = lambda: None -- cgit v1.2.3-1-g7c22