added a short name setting for the app and modified the default about page to use it

3 files changed, 30 insertions, 32 deletions

diff --git a/context.py b/context.py
index 26d326a7..ca6ca163 100644
--- a/context.py
+++ b/context.py
@@ -2,6 +2,7 @@ from django.conf import settings
 def application_settings(context):
     my_settings = {
         'APP_TITLE' : settings.APP_TITLE,
+        'APP_SHORT_NAME' : settings.APP_SHORT_NAME,
         'APP_URL'   : settings.APP_URL,
         'APP_KEYWORDS' : settings.APP_KEYWORDS,
         'APP_DESCRIPTION' : settings.APP_DESCRIPTION,
diff --git a/settings_local.py.dist b/settings_local.py.dist
index 5447e517..14b22e5a 100644
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -3,7 +3,7 @@ import os.path
 from django.utils.translation import ugettext as _
 
 SITE_SRC_ROOT = os.path.dirname(__file__) 
-LOG_FILENAME = 'django.lanai.log'
+LOG_FILENAME = 'django.osqa.log'
 
 #for logging
 import logging
@@ -18,10 +18,12 @@ 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
+DATABASE_HOST = ''
+DATABASE_PORT = ''
 
 #Moved from settings.py for better organization. (please check it up to clean up settings.py)
 
@@ -30,13 +32,13 @@ SERVER_EMAIL = ''
 DEFAULT_FROM_EMAIL = ''
 EMAIL_HOST_USER = ''
 EMAIL_HOST_PASSWORD = ''
-EMAIL_SUBJECT_PREFIX = '[CNPROG] '
-EMAIL_HOST='cnprog.com'
+EMAIL_SUBJECT_PREFIX = '[OSQA] '
+EMAIL_HOST='osqa.net'
 EMAIL_PORT='25'
 EMAIL_USE_TLS=False
 
 #LOCALIZATIONS
-TIME_ZONE = 'America/Tijuana'
+TIME_ZONE = 'America/New_York'
 
 ###########################
 #
@@ -48,11 +50,12 @@ 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_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
 
@@ -61,25 +64,25 @@ 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='
+APP_URL = 'http://osqa.net' #used by email notif system and RSS
+GOOGLE_SITEMAP_CODE = ''
 GOOGLE_ANALYTICS_KEY = ''
 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
 
 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
diff --git a/templates/about.html b/templates/about.html
index 2ca75500..ec4b6a73 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -12,30 +12,24 @@
 </div>
 
 <div class="content">
-    <p><strong>NMR Wiki <span class="orange">Q&amp;A</span></strong> is a collaboratively edited question
-            and answer site created for the <strong>Magnetic Resonance</strong> community, i.e. those people who
-            work in the fields of <strong>NMR</strong>, <strong>EPR</strong>, <strong>MRI</strong></strong>, etc.
-            NMR Wiki Q&amp;A is affiliated with <strong><a href="http://nmrwiki.org">NMR Wiki</a></strong> -
-            the public wiki knowledge base about the Magnetic Resonance, which currently counts ~300 registered users. The most useful information collected here
-            will be further distilled on the wiki site.
-    </p>
+    <p><strong>{{settings.APP_SHORT_NAME}}</strong> is a collaboratively edited question and answer site created with
+    <a href="http://osqa.net">OSQA: The Open Source Q&A System</a>.</p>
+
     <p>Here you can <strong>ask</strong> and <strong>answer</strong> questions, <strong>comment</strong>
     and <strong>vote</strong> for the questions of others and their answers. Both questions and answers
     <strong>can be revised</strong> and improved. Questions can be <strong>tagged</strong> with
-    the relevant keywords to simplify future access and organize the accumulated material.
-    </p>
+    the relevant keywords to simplify future access and organize the accumulated material.</p>
 
-    <p>This <span class="orange">Q&amp;A</span> site is moderated by its members, hopefully - including yourself!
+    <p>This OSQA site is moderated by its members, hopefully - including yourself!
     Moderation rights are gradually assigned to the site users based on the accumulated <strong>"reputation"</strong>
     points. These points are added to the users account when others vote for his/her questions or answers.
-    These points (very) roughly reflect the level of trust of the community.
-    </p>
-    <p>No points are necessary to ask or answer the questions - so please -
-    <strong><a href="{% url user_signin %}">join us!</a></strong>
-    </p>
-    <p>
-            If you would like to find out more about this site - please see <strong><a href="{% url faq %}">frequently asked questions</a></strong>.
-    </p>
+    These points (very) roughly reflect the level of trust of the community.</p>
+
+    <p>No points are necessary to ask or answer the questions - so please - <strong><a href="{% url user_signin %}">join
+    us!</a></strong></p>
+
+    <p>If you would like to find out more about this site - please see <strong><a href="{% url faq %}">frequently
+    asked questions</a></strong>.</p>
 </div>
 {% endblock %}
 <!-- end template about.html -->