Make RequestHolder thread-safe

[osqa.git] / forum / settings / basic.py

diff --git a/forum/settings/basic.py b/forum/settings/basic.py
index 80c8a626f9f30792e52599ac2d882217a7678131..a4efd6f105eb78af4e459e0b1f11f75c760f8784 100644 (file)
--- a/forum/settings/basic.py
+++ b/forum/settings/basic.py
@@ -6,9 +6,9 @@ from forms import ImageFormWidget
 from django.utils.translation import ugettext_lazy as _\r
 from django.forms.widgets import Textarea\r
 \r
 from django.utils.translation import ugettext_lazy as _\r
 from django.forms.widgets import Textarea\r
 \r

-BASIC_SET = SettingSet('basic', _('Basic Settings'), _("The basic settings for your application"), 1)\r
+BASIC_SET = SettingSet('basic', _('Basic settings'), _("The basic settings for your application"), 1)\r

 \r
 \r

-APP_LOGO = Setting('APP_LOGO', '/m/default/media/images/logo.png', BASIC_SET, dict(\r
+APP_LOGO = Setting('APP_LOGO', '/upfiles/logo.png', BASIC_SET, dict(\r

 label = _("Application logo"),\r
 help_text = _("Your site main logo."),\r
 widget=ImageFormWidget))\r
 label = _("Application logo"),\r
 help_text = _("Your site main logo."),\r
 widget=ImageFormWidget))\r


@@ -18,28 +18,35 @@ label = _("Favicon"),
 help_text = _("Your site favicon."),\r
 widget=ImageFormWidget))\r
 \r
 help_text = _("Your site favicon."),\r
 widget=ImageFormWidget))\r
 \r

-APP_TITLE = Setting('APP_TITLE', 'OSQA: Open Source Q&A Forum', BASIC_SET, dict(\r
+APP_TITLE = Setting('APP_TITLE', u'OSQA: Open Source Q&A Forum', BASIC_SET, dict(\r

 label = _("Application title"),\r
 help_text = _("The title of your application that will show in the browsers title bar")))\r
 \r
 label = _("Application title"),\r
 help_text = _("The title of your application that will show in the browsers title bar")))\r
 \r

-APP_SHORT_NAME = Setting('APP_SHORT_NAME', 'OSQA', BASIC_SET, dict(\r
+APP_SHORT_NAME = Setting(u'APP_SHORT_NAME', 'OSQA', BASIC_SET, dict(\r

 label = _("Application short name"),\r
 help_text = "The short name for your application that will show up in many places."))\r
 \r
 label = _("Application short name"),\r
 help_text = "The short name for your application that will show up in many places."))\r
 \r

-APP_KEYWORDS = Setting('APP_KEYWORDS', 'OSQA,CNPROG,forum,community', BASIC_SET, dict(\r
+APP_KEYWORDS = Setting('APP_KEYWORDS', u'OSQA,CNPROG,forum,community', BASIC_SET, dict(\r

 label = _("Application keywords"),\r
 help_text = _("The meta keywords that will be available through the HTML meta tags.")))\r
 \r
 label = _("Application keywords"),\r
 help_text = _("The meta keywords that will be available through the HTML meta tags.")))\r
 \r

-APP_DESCRIPTION = Setting('APP_DESCRIPTION', 'Ask and answer questions.', BASIC_SET, dict(\r
+APP_DESCRIPTION = Setting('APP_DESCRIPTION', u'Ask and answer questions.', BASIC_SET, dict(\r

 label = _("Application description"),\r
 help_text = _("The description of your application"),\r
 widget=Textarea))\r
 \r
 label = _("Application description"),\r
 help_text = _("The description of your application"),\r
 widget=Textarea))\r
 \r

-APP_INTRO = Setting('APP_INTRO', '<p>Ask and answer questions, make the world better!</p>', BASIC_SET, dict(\r
-label = _("Application intro"),\r
-help_text = _("The introductory page that is visible in the sidebar for anonymous users."),\r
-widget=Textarea))\r
-\r
-APP_COPYRIGHT = Setting('APP_COPYRIGHT', 'Copyright OSQA, 2010. Some rights reserved under creative commons license.', BASIC_SET, dict(\r
+APP_COPYRIGHT = Setting('APP_COPYRIGHT', u'Copyright OSQA, 2010. Some rights reserved under creative commons license.', BASIC_SET, dict(\r

 label = _("Copyright notice"),\r
 label = _("Copyright notice"),\r

-help_text = _("The copyright notice visible at the footer of your page.")))
\ No newline at end of file
+help_text = _("The copyright notice visible at the footer of your page.")))\r
+\r
+SUPPORT_URL = Setting('SUPPORT_URL', '', BASIC_SET, dict(\r
+label = _("Support URL"),\r
+help_text = _("The URL provided for users to get support. It can be http: or mailto: or whatever your preferred support scheme is."),\r
+required=False))\r
+\r
+CONTACT_URL = Setting('CONTACT_URL', '', BASIC_SET, dict(\r
+label = _("Contact URL"),\r
+help_text = _("The URL provided for users to contact you. It can be http: or mailto: or whatever your preferred contact scheme is."),\r
+required=False))\r
+\r
+\r