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

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@211 0cfe37f9-358a-4d5e-be75-b63607b5c754

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",

diff --git a/forum/skins/default/templates/index.html b/forum/skins/default/templates/index.html
index 29d0502191fb26c499504e1e59db496bfd86507f..0e24806957f37152ff591b911f7e921d6a36f1d1 100644 (file)
--- a/forum/skins/default/templates/index.html
+++ b/forum/skins/default/templates/index.html
@@ -16,9 +16,11 @@
     </div>\r
     {% endif %}\r
     {% question_list_count %}\r
+    {% sidebar_upper %}\r
     {% if request.user.is_authenticated %}\r
         {% tag_selector %}\r
     {% endif %}\r
+    {% sidebar_lower %}\r
     {% recent_tags %}\r
     {% recent_awards %}\r
 {% endblock %}\r

diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index fceff20104176d75c06eb2987c0b2359f65eb7e0..37e5fe3f76bb18632cfa07c0991e0bae8c8e9c2f 100644 (file)
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -3,6 +3,7 @@
 {% load node_tags %}\r
 {% load extra_tags %}\r
 {% load extra_filters %}\r
+{% load general_sidebar_tags %}\r
 {% load smart_if %}\r
 {% load humanize %}\r
 {% load i18n %}\r
@@ -234,6 +235,7 @@
 {% endblock %}\r
 \r
 {% block sidebar %}\r
+{% sidebar_upper %}\r
 <div class="boxC" id="subscription_box">\r
     {% include "subscription_status.html" %}\r
 </div>\r
@@ -260,6 +262,7 @@
     </p>\r
 </div>\r
 {% endcache %}\r
+{% sidebar_lower %}\r
 <div class="boxC">\r
     <h3 class="subtitle">{% trans "Related questions" %}</h3>\r
     <div class="questions-related">\r

diff --git a/forum/skins/default/templates/questions.html b/forum/skins/default/templates/questions.html
index f4f10ec770e31f7af62a1b7bea76c8fdedf16310..66d9d409803023b2880e750e935a269f865722e3 100644 (file)
--- a/forum/skins/default/templates/questions.html
+++ b/forum/skins/default/templates/questions.html
@@ -25,8 +25,8 @@
     {% question_list_count %}\r
     {% sidebar_upper %}\r
     {% tag_selector %}\r
-    {% question_list_related_tags questions %}\r
     {% sidebar_lower %}\r
+    {% question_list_related_tags questions %}\r
 \r
 {% endblock %}\r
 <!-- end questions.html -->\r