From 2017cbd3e796117e1fdf57181d7b7443f8696657 Mon Sep 17 00:00:00 2001
From: rick <rick@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Tue, 11 May 2010 02:44:51 +0000
Subject: [PATCH] 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
---
 forum/settings/sidebar.py                    | 11 ++++++-----
 forum/skins/default/templates/index.html     |  2 ++
 forum/skins/default/templates/question.html  |  3 +++
 forum/skins/default/templates/questions.html |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/forum/settings/sidebar.py b/forum/settings/sidebar.py
index 394466b..1f33df9 100644
--- 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 29d0502..0e24806 100644
--- a/forum/skins/default/templates/index.html
+++ b/forum/skins/default/templates/index.html
@@ -16,9 +16,11 @@
     </div>
     {% endif %}
     {% question_list_count %}
+    {% sidebar_upper %}
     {% if request.user.is_authenticated %}
         {% tag_selector %}
     {% endif %}
+    {% sidebar_lower %}
     {% recent_tags %}
     {% recent_awards %}
 {% endblock %}
diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index fceff20..37e5fe3 100644
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -3,6 +3,7 @@
 {% load node_tags %}
 {% load extra_tags %}
 {% load extra_filters %}
+{% load general_sidebar_tags %}
 {% load smart_if %}
 {% load humanize %}
 {% load i18n %}
@@ -234,6 +235,7 @@
 {% endblock %}
 
 {% block sidebar %}
+{% sidebar_upper %}
 <div class="boxC" id="subscription_box">
     {% include "subscription_status.html" %}
 </div>
@@ -260,6 +262,7 @@
     </p>
 </div>
 {% endcache %}
+{% sidebar_lower %}
 <div class="boxC">
     <h3 class="subtitle">{% trans "Related questions" %}</h3>
     <div class="questions-related">
diff --git a/forum/skins/default/templates/questions.html b/forum/skins/default/templates/questions.html
index f4f10ec..66d9d40 100644
--- a/forum/skins/default/templates/questions.html
+++ b/forum/skins/default/templates/questions.html
@@ -25,8 +25,8 @@
     {% question_list_count %}
     {% sidebar_upper %}
     {% tag_selector %}
-    {% question_list_related_tags questions %}
     {% sidebar_lower %}
+    {% question_list_related_tags questions %}
 
 {% endblock %}
 <!-- end questions.html -->
-- 
2.39.5