merged in latest Mikes changes

1 files changed, 25 insertions, 70 deletions

diff --git a/settings.py b/settings.py
index 88dd0cc7..985de51a 100644
--- a/settings.py
+++ b/settings.py
@@ -1,51 +1,24 @@
+# encoding:utf-8

 # Django settings for lanai project.

 import os.path

 

+#DEBUG SETTINGS

 DEBUG = True

 TEMPLATE_DEBUG = DEBUG

-
-

-#David Cramer debug toolbar

 INTERNAL_IPS = ('127.0.0.1',)

-DEBUG_TOOLBAR_PANELS = (

-    'debug_toolbar.panels.sql.SQLDebugPanel',

-    'debug_toolbar.panels.headers.HeaderDebugPanel',

-    'debug_toolbar.panels.cache.CacheDebugPanel',

-    'debug_toolbar.panels.profiler.ProfilerDebugPanel',

-    'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',

-    'debug_toolbar.panels.templates.TemplatesDebugPanel',

-    # If you are using the profiler panel you don't need the timer

-    # 'debug_toolbar.panels.timer.TimerDebugPanel',

-)

-

-DEBUG_TOOLBAR_CONFIG = {

-    "INTERCEPT_REDIRECTS":False

-}

 

 #for OpenID auth

 ugettext = lambda s: s

 LOGIN_URL = '/%s%s' % (ugettext('account/'), ugettext('signin/'))

 

-#system will send admins email about error stacktrace if DEBUG=False

+#EMAIL AND ADMINS

 ADMINS = (

-    ('you', 'you@where.com'),

+    ('CNProg team', 'team@cnprog.com'),

 )

-

 MANAGERS = ADMINS

 

-DATABASE_ENGINE = 'mysql'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.

-#DATABASE_NAME = 'cnprog'             # Or path to database file if using sqlite3.

-#DATABASE_USER = 'root'             # 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.

-

-DATABASE_NAME = 'dbname'             # Or path to database file if using sqlite3.

-DATABASE_USER = 'dbuser'             # Not used with sqlite3.

-DATABASE_PASSWORD = 'dbpass'         # Not used with sqlite3.

-

-SERVER_EMAIL = 'server@where.com'

-DEFAULT_FROM_EMAIL = 'from@where.com'

+SERVER_EMAIL = 'webmaster@cnprog.com'

+DEFAULT_FROM_EMAIL = 'webmaster@cnprog.com'

 EMAIL_HOST_USER = ''

 EMAIL_HOST_PASSWORD = ''

 EMAIL_SUBJECT_PREFIX = '[cnprog.com]'

@@ -53,44 +26,21 @@ EMAIL_HOST='smtp.gmail.com'
 EMAIL_PORT='587'

 EMAIL_USE_TLS=True

 

-

-

-

-# 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.

-# If running in a Windows environment this must be set to the same as your

-# system time zone.

-TIME_ZONE = 'America/Chicago'

-

-# Language code for this installation. All choices can be found here:

-# http://www.i18nguy.com/unicode/language-identifiers.html

-#LANGUAGE_CODE = 'en'

+#LOCALIZATIONS

+TIME_ZONE = 'Asia/Chongqing Asia/Chungking'

+# LANGUAGE_CODE = 'en-us'

 LANGUAGE_CODE = 'zh-cn'

-

 SITE_ID = 1

-

-# If you set this to False, Django will make some optimizations so as not

-# to load the internationalization machinery.

 USE_I18N = True

 

-# Absolute path to the directory that holds media.

-# Example: "/home/media/media.lawrence.com/"

-MEDIA_ROOT = '/var/www/vhosts/cnprog/templates/upfiles/'

-

-# URL that handles the media served from MEDIA_ROOT. Make sure to use a

-# trailing slash if there is a path component (optional in other cases).

-# Examples: "http://media.lawrence.com", "http://example.com/media/"

-MEDIA_URL = 'http://where.com/upfiles/'

-

-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a

-# trailing slash.

-# Examples: "http://foo.com/media/", "/media/".

+#OTHER SETTINS

+APP_TITLE = u'CNProg.com 程序员问答社区'

+APP_URL = 'http://www.cnprog.com'

+APP_KEYWORDS = u'技术问答社区，中国程序员，编程技术社区，程序员社区，程序员论坛，程序员wiki，程序员博客'

+APP_DESCRIPTION = u'中国程序员的编程技术问答社区。我们做专业的、可协作编辑的技术问答社区。'

+APP_INTRO = u' <p>CNProg是一个<strong>面向程序员</strong>的可协作编辑的<strong>开放源代码问答社区</strong>。</p><p> 您可以在这里提问各类<strong>程序技术问题</strong> - 问题不分语言和平台。 同时也希望您对力所能及的问题，给予您的宝贵答案。</p>'

 ADMIN_MEDIA_PREFIX = '/admin/media/'

-

-# Make this unique, and don't share it with anybody.

-SECRET_KEY = '$oo^&_m&qwbib=ffljk_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'

-

+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',

@@ -105,12 +55,15 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',

     'django.contrib.auth.middleware.AuthenticationMiddleware',

     'django.middleware.transaction.TransactionMiddleware',

-    'debug_toolbar.middleware.DebugToolbarMiddleware',

+    #'django.middleware.sqlprint.SqlPrintingMiddleware',

+    'middleware.pagesize.QuestionsPageSizeMiddleware',

+    #'debug_toolbar.middleware.DebugToolbarMiddleware',

 )

 

 TEMPLATE_CONTEXT_PROCESSORS = (

     'django.core.context_processors.request',

     'django.core.context_processors.auth',

+    'context.application_settings'

 )

 

 ROOT_URLCONF = 'urls'

@@ -119,6 +72,7 @@ TEMPLATE_DIRS = (
     os.path.join(os.path.dirname(__file__), 'templates').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",)

@@ -139,6 +93,7 @@ INSTALLED_APPS = (
     'django_authopenid',

     'debug_toolbar' ,

 )

-#local configs
-from settings_local import *
-
+

+# User settings

+from settings_local import *

+