Prevents questions on which the slug comes out empty to enter a redirect loop.

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

diff --git a/forum/settings/sidebar.py b/forum/settings/sidebar.py
index 179229fe5ebb3c8b01a48e81bcd78efc2ce42179..a2b3f231a7df14e9b97ebcd4328289054fd5104b 100644 (file)
--- a/forum/settings/sidebar.py
+++ b/forum/settings/sidebar.py
@@ -1,39 +1,64 @@
 from base import Setting, SettingSet
 from django.forms.widgets import Textarea
 from base import Setting, SettingSet
 from django.forms.widgets import Textarea

+from django.utils.translation import ugettext_lazy as _

 
 

-SIDEBAR_SET = SettingSet('sidebar', 'Sidebar content', "Enter contents to display in the sidebar. You can use markdown and some basic html tags.", 1000, True)
+SIDEBAR_SET = SettingSet('sidebar', 'Sidebar content', "Enter contents to display in the sidebar. You can use markdown and some basic html tags.", 10, True)

 
 

-SIDEBAR_UPPER_SHOW = Setting('SIDEBAR_UPPER_SHOW', False, SIDEBAR_SET, dict(
-label = "Include Upper Sidebar Block",
-help_text = "Check if your pages should include the upper sidebar block.",
+SHOW_WELCOME_BOX = Setting('SHOW_WELCOME_BOX', True, SIDEBAR_SET, dict(
+label = _("Show the Welcome box"),
+help_text = _("Do you want to show the welcome box when a user first visits your site."),

 required=False))
 
 required=False))
 

+APP_INTRO = Setting('APP_INTRO', u'<p>Ask and answer questions, make the world better!</p>', SIDEBAR_SET, dict(
+label = _("Application intro"),
+help_text = _("The introductory page that is visible in the sidebar for anonymous users."),
+widget=Textarea))
+
+
+SIDEBAR_UPPER_SHOW = Setting('SIDEBAR_UPPER_SHOW', True, SIDEBAR_SET, dict(
+label = "Show Upper Block",
+help_text = "Check if your pages should display the upper sidebar block.",
+required=False))
+
+SIDEBAR_UPPER_DONT_WRAP = Setting('SIDEBAR_UPPER_DONT_WRAP', False, SIDEBAR_SET, dict(
+label = "Don't Wrap Upper Block",
+help_text = "Don't wrap upper block with the standard style.",
+required=False))

 
 SIDEBAR_UPPER_TEXT = Setting('SIDEBAR_UPPER_TEXT',
 u"""
 
 SIDEBAR_UPPER_TEXT = Setting('SIDEBAR_UPPER_TEXT',
 u"""

-## Host your own OSQA at WebFaction
+[![WebFaction logo][2]][1]
+## [Reliable OSQA Hosting][1]

 
 

-We recommend WebFaction for hosting OSQA. Their affordable,
-reliable servers have everything you need!
-""", SIDEBAR_SET, dict(
-label = "Sidebar (Upper)",
+We recommend [**WebFaction**][1] for OSQA hosting. For \
+under $10/month their reliable servers get the job done. See our \
+[**step-by-step setup guide**](http://wiki.osqa.net/display/docs/Installing+OSQA+on+WebFaction).
+
+[1]: http://www.webfaction.com?affiliate=osqa
+[2]: /m/default/media/images/webfaction.png""", SIDEBAR_SET, dict(
+label = "Upper Block Content",

 help_text = " The upper sidebar block. ",
 widget=Textarea(attrs={'rows': '10'})))
 
 
 help_text = " The upper sidebar block. ",
 widget=Textarea(attrs={'rows': '10'})))
 
 

-SIDEBAR_LOWER_SHOW = Setting('SIDEBAR_LOWER_SHOW', False, SIDEBAR_SET, dict(
-label = "Include Lower Sidebar Block",
-help_text = "Check if your pages should include the lower sidebar block.",
+SIDEBAR_LOWER_SHOW = Setting('SIDEBAR_LOWER_SHOW', True, SIDEBAR_SET, dict(
+label = "Show Lower Block",
+help_text = "Check if your pages should display the lower sidebar block.",

 required=False))
 
 required=False))
 

+SIDEBAR_LOWER_DONT_WRAP = Setting('SIDEBAR_LOWER_DONT_WRAP', False, SIDEBAR_SET, dict(
+label = "Don't Wrap Lower Block",
+help_text = "Don't wrap lower block with the standard style.",
+required=False))

 
 SIDEBAR_LOWER_TEXT = Setting('SIDEBAR_LOWER_TEXT',
 u"""
 ## Learn more about OSQA
 
 
 SIDEBAR_LOWER_TEXT = Setting('SIDEBAR_LOWER_TEXT',
 u"""
 ## Learn more about OSQA
 

-The OSQA website and wiki are also great resources to help you
-learn more about the OSQA open source Q&A system!
+The [**OSQA website**](http://www.osqa.net/) and [**OSQA wiki**](http://wiki.osqa.net/) \
+are great resources to help you learn more about the OSQA open source Q&A system. \
+[**Join the OSQA chat!**](http://meta.osqa.net/question/79/is-there-an-online-chat-room-or-irc-channel-for-osqa#302)

 """, SIDEBAR_SET, dict(
 """, SIDEBAR_SET, dict(

-label = "Sidebar (Lower)",
+label = "Lower Block Content",

 help_text = " The lower sidebar block. ",
 widget=Textarea(attrs={'rows': '10'})))
\ No newline at end of file
 help_text = " The lower sidebar block. ",
 widget=Textarea(attrs={'rows': '10'})))
\ No newline at end of file