Merge branch 'evgenyfadeev/master'

Conflicts:
	django_authopenid/util.py
	forum/feed.py
	forum/views.py
	settings.py
	settings_local.py.dist
	templates/about.html
	templates/content/style/style.css
	templates/question.html
	templates/questions.html

1 files changed, 42 insertions, 72 deletions

diff --git a/settings_local.py.dist b/settings_local.py.dist
index 136d4bdd..2251e58e 100644..100755
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -1,24 +1,30 @@
 # encoding:utf-8
 import os.path
-<<<<<<< HEAD:settings_local.py.dist
-=======
 from django.utils.translation import ugettext as _
 
->>>>>>> evgenyfadeev/master:settings_local.py.dist
 SITE_SRC_ROOT = os.path.dirname(__file__) 
 LOG_FILENAME = 'django.lanai.log'
  
 #for logging
 import logging
 logging.basicConfig(filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME), level=logging.DEBUG,)
-<<<<<<< HEAD:settings_local.py.dist
- 
-DATABASE_NAME = ''             # Or path to database file if using sqlite3.
-DATABASE_USER = ''               # Not used with sqlite3.
-DATABASE_PASSWORD = ''               # Not used with sqlite3.
-DATABASE_ENGINE = ''  #mysql, etc
-<<<<<<< HEAD:settings_local.py.dist
-=======
+def check_local_setting(name, value):
+    local_vars = locals()
+    if name in local_vars and local_var[name] == value:
+        return True
+    else:
+        return False
+
+SITE_SRC_ROOT = os.path.dirname(__file__) 
+LOG_FILENAME = 'django.osqa.log'
+
+#for logging
+import logging
+logging.basicConfig(
+    filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME),
+    level=logging.DEBUG,
+    format='%(pathname)s TIME: %(asctime)s MSG: %(filename)s:%(funcName)s:%(lineno)d %(message)s',
+)
 
 #ADMINS and MANAGERS
 ADMINS = (('Forum Admin', 'forum@example.com'),)
@@ -29,109 +35,73 @@ DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 INTERNAL_IPS = ('127.0.0.1',)
 
-DATABASE_NAME = 'cnprog'             # Or path to database file if using sqlite3.
+DATABASE_NAME = 'osqa'             # Or path to database file if using sqlite3.
 DATABASE_USER = ''               # Not used with sqlite3.
 DATABASE_PASSWORD = ''               # Not used with sqlite3.
 DATABASE_ENGINE = 'mysql'  #mysql, etc
->>>>>>> evgenyfadeev/master:settings_local.py.dist
-
-#Moved from settings.py for better organization. (please check it up to clean up settings.py)
-
-=======
- 
-#Moved from settings.py for better organization. (please check it up to clean up settings.py)
+DATABASE_HOST = ''
+DATABASE_PORT = ''
  
->>>>>>> 6214863f362fd0702af79abaade0de6736d12e96:settings_local.py.dist
 #email server settings
 SERVER_EMAIL = ''
 DEFAULT_FROM_EMAIL = ''
 EMAIL_HOST_USER = ''
 EMAIL_HOST_PASSWORD = ''
-<<<<<<< HEAD:settings_local.py.dist
-EMAIL_SUBJECT_PREFIX = '[cnprog.com]'
-EMAIL_HOST='smtp.gmail.com'
-EMAIL_PORT='587'
-EMAIL_USE_TLS=True
-<<<<<<< HEAD:settings_local.py.dist
-=======
-EMAIL_SUBJECT_PREFIX = '[CNPROG] '
-EMAIL_HOST='cnprog.com'
+EMAIL_SUBJECT_PREFIX = '[OSQA] '
+EMAIL_HOST='osqa.net'
 EMAIL_PORT='25'
 EMAIL_USE_TLS=False
->>>>>>> evgenyfadeev/master:settings_local.py.dist
 
-#LOCALIZATIONS
-TIME_ZONE = 'America/Tijuana'
-
-###########################
-#
-#   this will allow running your forum with url like http://site.com/forum
-#
-#   FORUM_SCRIPT_ALIAS = 'forum/'
-#
 FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
-
-
-=======
  
 #LOCALIZATIONS
 TIME_ZONE = 'Asia/Chongqing Asia/Chungking'
 # LANGUAGE_CODE = 'en-us'
  
->>>>>>> 6214863f362fd0702af79abaade0de6736d12e96:settings_local.py.dist
 #OTHER SETTINGS
-<<<<<<< HEAD:settings_local.py.dist
-APP_TITLE = u'CNProg.com 程序员问答社区'
-APP_KEYWORDS = u'技术问答社区，中国程序员，编程技术社区，程序员社区，程序员论坛，程序员wiki，程序员博客'
-APP_DESCRIPTION = u'中国程序员的编程技术问答社区。我们做专业的、可协作编辑的技术问答社区。'
-APP_INTRO = u' <p>CNProg是一个<strong>面向程序员</strong>的可协作编辑的<strong>开放源代码问答社区</strong>。</p><p> 您可以在这里提问各类<strong>程序技术问题</strong> - 问题不分语言和平台。 同时也希望您对力所能及的问题，给予您的宝贵答案。</p>'
 APP_COPYRIGHT = 'Copyright CNPROG.COM 2009'
-<<<<<<< HEAD:settings_local.py.dist
-=======
-APP_TITLE = u'CNPROG Q&A Forum'
-APP_KEYWORDS = u'CNPROG,forum,community'
+APP_TITLE = u'OSQA: Open Source Q&A Forum'
+APP_SHORT_NAME = u'OSQA'
+APP_KEYWORDS = u'OSQA,CNPROG,forum,community'
 APP_DESCRIPTION = u'Ask and answer questions.'
 APP_INTRO = u'<p>Ask and answer questions, make the world better!</p>'
-APP_COPYRIGHT = 'Copyright CNPROG, 2009. Some rights reserved under creative commons license.'
+APP_COPYRIGHT = 'Copyright OSQA, 2009. Some rights reserved under creative commons license.'
 LOGIN_URL = '/%s%s%s' % (FORUM_SCRIPT_ALIAS,'account/','signin/')
 GREETING_URL = LOGIN_URL #may be url of "faq" page or "about", etc
->>>>>>> evgenyfadeev/master:settings_local.py.dist
 
-=======
- 
->>>>>>> 6214863f362fd0702af79abaade0de6736d12e96:settings_local.py.dist
 USE_I18N = True
 LANGUAGE_CODE = 'en'
 EMAIL_VALIDATION = 'off' #string - on|off
 MIN_USERNAME_LENGTH = 1
 EMAIL_UNIQUE = False
-APP_URL = 'http://cnprog.com' #used by email notif system and RSS
-GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA='
-<<<<<<< HEAD:settings_local.py.dist
-GOOGLE_ANALYTICS_KEY = ''
-<<<<<<< HEAD:settings_local.py.dist
-BOOKS_ON = True 
-=======
-GOOGLE_ANALYTICS_KEY = ''
->>>>>>> 6214863f362fd0702af79abaade0de6736d12e96:settings_local.py.dist
-=======
+APP_URL = 'http://osqa.net' #used by email notif system and RSS
+GOOGLE_SITEMAP_CODE = ''
 BOOKS_ON = False 
 WIKI_ON = True 
 USE_EXTERNAL_LEGACY_LOGIN = False
-EXTERNAL_LEGACY_LOGIN_HOST = 'login.cnprog.com'
+EXTERNAL_LEGACY_LOGIN_HOST = 'login.osqa.net'
 EXTERNAL_LEGACY_LOGIN_PORT = 80
-EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME = '<span class="orange">CNPROG</span>'
+EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME = '<span class="orange">OSQA</span>'
 FEEDBACK_SITE_URL = None #None or url
+EDITABLE_SCREEN_NAME = False #True or False - can user change screen name?
 
 DJANGO_VERSION = 1.1
 RESOURCE_REVISION=4
 
-USE_SPHINX_SEARCH = True #if True all SPHINX_* settings are required
+USE_SPHINX_SEARCH = False #if True all SPHINX_* settings are required
 #also sphinx search engine and djangosphinxs app must be installed
 #sample sphinx configuration file is /sphinx/sphinx.conf
 SPHINX_API_VERSION = 0x113 #refer to djangosphinx documentation
-SPHINX_SEARCH_INDICES=('cnprog',) #a tuple of index names remember about a comma after the 
+SPHINX_SEARCH_INDICES=('osqa',) #a tuple of index names remember about a comma after the 
 #last item, especially if you have just one :)
 SPHINX_SERVER='localhost'
 SPHINX_PORT=3312
->>>>>>> evgenyfadeev/master:settings_local.py.dist
+
+#please get these at recaptcha.net
+RECAPTCHA_PRIVATE_KEY='...'
+RECAPTCHA_PUBLIC_KEY='...'
+
+#Facebook settings
+USE_FB_CONNECT=True
+FB_API_KEY='' #your api key from facebook
+FB_SECRET='' #your application secret