Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into evgenyfadeev/master

Conflicts:
	INSTALL
	LICENSE
	TODO
	cnprog.wsgi
	context.py
	development.log
	forum/feed.py
	forum/forms.py
	forum/management/commands/send_email_alerts.py
	forum/managers.py
	forum/models.py
	forum/templatetags/extra_filters.py
	forum/templatetags/extra_tags.py
	forum/urls.py
	forum/views.py
	locale/en/LC_MESSAGES/django.mo
	locale/en/LC_MESSAGES/django.po
	middleware/__init__.py
	middleware/anon_user.py
	settings.py
	settings_local.py.dist
	templates/about.html
	templates/authopenid/complete.html
	templates/authopenid/external_legacy_login_info.html
	templates/base.html
	templates/base_content.html
	templates/content/js/com.cnprog.admin.js
	templates/content/js/com.cnprog.i18n.js
	templates/content/js/com.cnprog.post.js
	templates/content/js/com.cnprog.utils.js
	templates/content/js/wmd/wmd.js
	templates/content/style/style.css
	templates/question.html
	templates/questions.html
	templates/unanswered.html
	templates/user_email_subscriptions.html
	templates/user_reputation.html
	templates/user_stats.html
	templates/user_votes.html

1 files changed, 29 insertions, 12 deletions

diff --git a/settings_local.py.dist b/settings_local.py.dist
index e43522ef..5447e517 100644
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -9,6 +9,15 @@ LOG_FILENAME = 'django.lanai.log'
 import logging
 logging.basicConfig(filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME), level=logging.DEBUG,)
 
+#ADMINS and MANAGERS
+ADMINS = (('Forum Admin', 'forum@example.com'),)
+MANAGERS = ADMINS
+
+#DEBUG SETTINGS
+DEBUG = False 
+TEMPLATE_DEBUG = DEBUG
+INTERNAL_IPS = ('127.0.0.1',)
+
 DATABASE_NAME = 'cnprog'             # Or path to database file if using sqlite3.
 DATABASE_USER = ''               # Not used with sqlite3.
 DATABASE_PASSWORD = ''               # Not used with sqlite3.
@@ -29,24 +38,24 @@ EMAIL_USE_TLS=False
 #LOCALIZATIONS
 TIME_ZONE = 'America/Tijuana'
 
-#OTHER SETTINGS
-APP_TITLE = u'CNPROG Q&A Forum'
-APP_KEYWORDS = u'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.'
-
 ###########################
 #
 #   this will allow running your forum with url like http://site.com/forum
 #
 #   FORUM_SCRIPT_ALIAS = 'forum/'
 #
-#   also make sure to set '/':'/forum' in file templates/content/js/com.cnprog.i18n.js
-#   this is necessary to make client scripts work in this configuration
-#
 FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
 
+
+#OTHER SETTINGS
+APP_TITLE = u'CNPROG Q&A Forum'
+APP_KEYWORDS = u'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.'
+LOGIN_URL = '/%s%s%s' % (FORUM_SCRIPT_ALIAS,'account/','signin/')
+GREETING_URL = LOGIN_URL #may be url of "faq" page or "about", etc
+
 USE_I18N = True
 LANGUAGE_CODE = 'en'
 EMAIL_VALIDATION = 'off' #string - on|off
@@ -57,12 +66,20 @@ GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA='
 GOOGLE_ANALYTICS_KEY = ''
 BOOKS_ON = False 
 WIKI_ON = True 
-USE_EXTERNAL_LEGACY_LOGIN = True 
+USE_EXTERNAL_LEGACY_LOGIN = False
 EXTERNAL_LEGACY_LOGIN_HOST = 'login.cnprog.com'
 EXTERNAL_LEGACY_LOGIN_PORT = 80
 EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME = '<span class="orange">CNPROG</span>'
 FEEDBACK_SITE_URL = None #None or url
-LOGIN_URL = '/%s%s%s' % (FORUM_SCRIPT_ALIAS,'account/','signin/')
 
 DJANGO_VERSION = 1.1
 RESOURCE_REVISION=4
+
+USE_SPHINX_SEARCH = True #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 
+#last item, especially if you have just one :)
+SPHINX_SERVER='localhost'
+SPHINX_PORT=3312