Minor tweaks to default user sidebar content wording and block display order.

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

diff --git a/forum/settings/sidebar.py b/forum/settings/sidebar.py
index 394466bb78345f97c21f117aba73856b2057924c..1f33df9e15483646bad23cb125c4c4ec68197a1b 100644 (file)
--- a/forum/settings/sidebar.py
+++ b/forum/settings/sidebar.py
@@ -3,7 +3,7 @@ from django.forms.widgets import Textarea
 
 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(
+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))
@@ -13,15 +13,16 @@ SIDEBAR_UPPER_TEXT = Setting('SIDEBAR_UPPER_TEXT',
 u"""
 ## [Try WebFaction](http://www.webfaction.com?affiliate=osqa)
 
-We recommend [**WebFaction**](http://www.webfaction.com?affiliate=osqa)
-for hosting OSQA. Their affordable, reliable servers have everything you need!
+We recommend [**WebFaction**](http://www.webfaction.com?affiliate=osqa) \
+for hosting OSQA. Their affordable, reliable servers have everything you need! \
+[Step-by-step instructions...](http://wiki.osqa.net/display/docs/Installing+OSQA+on+WebFaction)
 """, SIDEBAR_SET, dict(
 label = "Upper Block Content",
 help_text = " The upper sidebar block. ",
 widget=Textarea(attrs={'rows': '10'})))
 
 
-SIDEBAR_LOWER_SHOW = Setting('SIDEBAR_LOWER_SHOW', False, SIDEBAR_SET, dict(
+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))
@@ -30,7 +31,7 @@ SIDEBAR_LOWER_TEXT = Setting('SIDEBAR_LOWER_TEXT',
 u"""
 ## Learn more about OSQA
 
-The [**OSQA website**](http://www.osqa.net/) and [**OSQA wiki**](http://wiki.osqa.net/)
+The [**OSQA website**](http://www.osqa.net/) and [**OSQA wiki**](http://wiki.osqa.net/) \
 are also great resources to help you learn more about the OSQA open source Q&A system!
 """, SIDEBAR_SET, dict(
 label = "Lower Block Content",