Merge pull request #26 from udacity/remove_dj_version

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

diff --git a/forum/settings/basic.py b/forum/settings/basic.py
index ec4d1418d806c57a687ce2de6e2ca256f416c523..1f9ddc90214217060033882eff931da998575f06 100644 (file)
--- a/forum/settings/basic.py
+++ b/forum/settings/basic.py
@@ -1,52 +1,52 @@
-import os.path\r
-\r
-from base import Setting, SettingSet\r
-from forms import ImageFormWidget\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
-\r
-APP_LOGO = Setting('APP_LOGO', '/m/default/media/images/logo.png', BASIC_SET, dict(\r
-label = _("Application logo"),\r
-help_text = _("Your site main logo."),\r
-widget=ImageFormWidget))\r
-\r
-APP_FAVICON = Setting('APP_FAVICON', '/m/default/media/images/favicon.ico', BASIC_SET, dict(\r
-label = _("Favicon"),\r
-help_text = _("Your site favicon."),\r
-widget=ImageFormWidget))\r
-\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
-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
-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
-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
-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
-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
+import os.path
+
+from base import Setting, SettingSet
+from forms import ImageFormWidget
+
+from django.utils.translation import ugettext_lazy as _
+from django.forms.widgets import Textarea
+
+BASIC_SET = SettingSet('basic', _('Basic settings'), _("The basic settings for your application"), 1)
+
+APP_LOGO = Setting('APP_LOGO', '/upfiles/logo.png', BASIC_SET, dict(
+label = _("Application logo"),
+help_text = _("Your site main logo."),
+widget=ImageFormWidget))
+
+APP_FAVICON = Setting('APP_FAVICON', '/m/default/media/images/favicon.ico', BASIC_SET, dict(
+label = _("Favicon"),
+help_text = _("Your site favicon."),
+widget=ImageFormWidget))
+
+APP_TITLE = Setting('APP_TITLE', u'OSQA: Open Source Q&A Forum', BASIC_SET, dict(
+label = _("Application title"),
+help_text = _("The title of your application that will show in the browsers title bar")))
+
+APP_SHORT_NAME = Setting(u'APP_SHORT_NAME', 'OSQA', BASIC_SET, dict(
+label = _("Application short name"),
+help_text = "The short name for your application that will show up in many places."))
+
+APP_KEYWORDS = Setting('APP_KEYWORDS', u'OSQA,CNPROG,forum,community', BASIC_SET, dict(
+label = _("Application keywords"),
+help_text = _("The meta keywords that will be available through the HTML meta tags.")))
+
+APP_DESCRIPTION = Setting('APP_DESCRIPTION', u'Ask and answer questions.', BASIC_SET, dict(
+label = _("Application description"),
+help_text = _("The description of your application"),
+widget=Textarea))
+
+APP_COPYRIGHT = Setting('APP_COPYRIGHT', u'Copyright OSQA, 2010. Some rights reserved under creative commons license.', BASIC_SET, dict(
+label = _("Copyright notice"),
+help_text = _("The copyright notice visible at the footer of your page.")))
+
+SUPPORT_URL = Setting('SUPPORT_URL', '', BASIC_SET, dict(
+label = _("Support URL"),
+help_text = _("The URL provided for users to get support. It can be http: or mailto: or whatever your preferred support scheme is."),
+required=False))
+
+CONTACT_URL = Setting('CONTACT_URL', '', BASIC_SET, dict(
+label = _("Contact URL"),
+help_text = _("The URL provided for users to contact you. It can be http: or mailto: or whatever your preferred contact scheme is."),
+required=False))
+
+