Converts feedback message to new style.

[osqa.git] / forum / context.py

diff --git a/forum/context.py b/forum/context.py
index 3814bb6065d46d91a48969a4ac599bc3cff4deb0..e93781089ae6cd6bb505c11a41cc5ff22e805f13 100644 (file)
--- a/forum/context.py
+++ b/forum/context.py
@@ -1,23 +1,29 @@
-from django.conf import settings
+from forum import settings
+from django.conf import settings as djsettings
+

 def application_settings(context):
     my_settings = {
         'APP_TITLE' : settings.APP_TITLE,
         'APP_SHORT_NAME' : settings.APP_SHORT_NAME,
 def application_settings(context):
     my_settings = {
         'APP_TITLE' : settings.APP_TITLE,
         'APP_SHORT_NAME' : settings.APP_SHORT_NAME,

+        'SHOW_WELCOME_BOX' : settings.SHOW_WELCOME_BOX,

         'APP_URL'   : settings.APP_URL,
         'APP_KEYWORDS' : settings.APP_KEYWORDS,
         'APP_DESCRIPTION' : settings.APP_DESCRIPTION,
         'APP_INTRO' : settings.APP_INTRO,
         'APP_LOGO' : settings.APP_LOGO,
         'APP_URL'   : settings.APP_URL,
         'APP_KEYWORDS' : settings.APP_KEYWORDS,
         'APP_DESCRIPTION' : settings.APP_DESCRIPTION,
         'APP_INTRO' : settings.APP_INTRO,
         'APP_LOGO' : settings.APP_LOGO,

-        'EMAIL_VALIDATION': settings.EMAIL_VALIDATION,
-        'FEEDBACK_SITE_URL': settings.FEEDBACK_SITE_URL,
-        'FORUM_SCRIPT_ALIAS': settings.FORUM_SCRIPT_ALIAS,
-        'LANGUAGE_CODE': settings.LANGUAGE_CODE,
+        'EMAIL_VALIDATION': 'off',
+               'SUPPORT_URL': settings.SUPPORT_URL,
+               'CONTACT_URL': settings.CONTACT_URL,
+        'FORUM_SCRIPT_ALIAS': djsettings.FORUM_SCRIPT_ALIAS,
+        'LANGUAGE_CODE': djsettings.LANGUAGE_CODE,

         'GOOGLE_SITEMAP_CODE':settings.GOOGLE_SITEMAP_CODE,
         'GOOGLE_ANALYTICS_KEY':settings.GOOGLE_ANALYTICS_KEY,
         'WIKI_ON':settings.WIKI_ON,
         'GOOGLE_SITEMAP_CODE':settings.GOOGLE_SITEMAP_CODE,
         'GOOGLE_ANALYTICS_KEY':settings.GOOGLE_ANALYTICS_KEY,
         'WIKI_ON':settings.WIKI_ON,

-        'RESOURCE_REVISION':settings.RESOURCE_REVISION,
-        'OSQA_SKIN':settings.OSQA_DEFAULT_SKIN,
+        'OSQA_SKIN':djsettings.OSQA_DEFAULT_SKIN,

         'APP_FAVICON':settings.APP_FAVICON,
         'APP_FAVICON':settings.APP_FAVICON,

+        'OSQA_VERSION': settings.OSQA_VERSION,
+        'ADMIN_MEDIA_PREFIX': djsettings.ADMIN_MEDIA_PREFIX,
+        'SVN_REVISION': settings.SVN_REVISION,

         }
     return {'settings':my_settings}
 
         }
     return {'settings':my_settings}