be able to pass additional context to the _edit_question view

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

diff --git a/forum/settings/basic.py b/forum/settings/basic.py
index 25afd95172800d42e111fd74fa363c0c4aebd05d..a4efd6f105eb78af4e459e0b1f11f75c760f8784 100644 (file)
--- a/forum/settings/basic.py
+++ b/forum/settings/basic.py
@@ -8,7 +8,7 @@ from django.forms.widgets import Textarea
 \r
 BASIC_SET = SettingSet('basic', _('Basic settings'), _("The basic settings for your application"), 1)\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
@@ -35,21 +35,18 @@ label = _("Application description"),
 help_text = _("The description of your application"),\r
 widget=Textarea))\r
 \r
-APP_INTRO = Setting('APP_INTRO', u'<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', u'Copyright OSQA, 2010. Some rights reserved under creative commons license.', BASIC_SET, dict(\r
 label = _("Copyright notice"),\r
 help_text = _("The copyright notice visible at the footer of your page.")))\r
 \r
-FEEDBACK_SITE_URL = Setting('FEEDBACK_SITE_URL', '', BASIC_SET, dict(\r
-label = _("Feedback site url"),\r
-help_text = _("If you have a specific place to get feedback from your users, use this field and the fedback link on the footer will point there."),\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
-SHOW_WELCOME_BOX = Setting('SHOW_WELCOME_BOX', False, BASIC_SET, dict(\r
-label = _("Show the Welcome box"),\r
-help_text = _("Do you want to show the welcome box when a user first visits your site."),\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