Support for two new blocks of optional, user-defined sidebar content.

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

diff --git a/forum/settings/sidebar.py b/forum/settings/sidebar.py
index 179229fe5ebb3c8b01a48e81bcd78efc2ce42179..394466bb78345f97c21f117aba73856b2057924c 100644 (file)
--- a/forum/settings/sidebar.py
+++ b/forum/settings/sidebar.py
@@ -1,39 +1,38 @@
 from base import Setting, SettingSet
 from django.forms.widgets import Textarea
 
 from base import Setting, SettingSet
 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.", 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(
 
 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.",
+label = "Show Upper Block",
+help_text = "Check if your pages should display the upper sidebar block.",

 required=False))
 
 
 SIDEBAR_UPPER_TEXT = Setting('SIDEBAR_UPPER_TEXT',
 u"""
 required=False))
 
 
 SIDEBAR_UPPER_TEXT = Setting('SIDEBAR_UPPER_TEXT',
 u"""

-## Host your own OSQA at WebFaction
+## [Try WebFaction](http://www.webfaction.com?affiliate=osqa)

 
 

-We recommend WebFaction 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!

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

-label = "Sidebar (Upper)",
+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(
 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.",
+label = "Show Lower Block",
+help_text = "Check if your pages should display the lower sidebar block.",

 required=False))
 
 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 also great resources to help you learn more about the OSQA open source Q&A system!

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

diff --git a/forum/skins/default/templates/questions.html b/forum/skins/default/templates/questions.html
index 9eea455bc53023797b53fb231f5ca9033d7883c4..f4f10ec770e31f7af62a1b7bea76c8fdedf16310 100644 (file)
--- a/forum/skins/default/templates/questions.html
+++ b/forum/skins/default/templates/questions.html
@@ -3,6 +3,7 @@
 {% load question_list_tags %}\r
 {% load i18n %}\r
 {% load extra_tags %}\r
 {% load question_list_tags %}\r
 {% load i18n %}\r
 {% load extra_tags %}\r

+{% load general_sidebar_tags %}\r

 \r
 {% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}\r
 {% block content %}\r
 \r
 {% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}\r
 {% block content %}\r


@@ -22,7 +23,10 @@
 \r
 {% block sidebar %}\r
     {% question_list_count %}\r
 \r
 {% block sidebar %}\r
     {% question_list_count %}\r

+    {% sidebar_upper %}\r

     {% tag_selector %}\r
     {% question_list_related_tags questions %}\r
     {% tag_selector %}\r
     {% question_list_related_tags questions %}\r

+    {% sidebar_lower %}\r
+\r

 {% endblock %}\r
 <!-- end questions.html -->\r
 {% endblock %}\r
 <!-- end questions.html -->\r

diff --git a/forum/skins/default/templates/sidebar/user_blocks.html b/forum/skins/default/templates/sidebar/user_blocks.html
new file mode 100644 (file)
index 0000000..4303e31
--- /dev/null
+++ b/forum/skins/default/templates/sidebar/user_blocks.html
@@ -0,0 +1,9 @@
+{% load markup %}
+
+{% if show %}
+<div id="{{ blockid }}" class="boxC">
+    <div class="body">
+        {{ content|markdown }}
+     </div>
+</div>
+{% endif %}
\ No newline at end of file

diff --git a/forum/templatetags/general_sidebar_tags.py b/forum/templatetags/general_sidebar_tags.py
index 445f0cb6c3cfc1a81563129ff49bd3dff8266b08..5741d1baa5a6e3c3dbd13819aca7f40bd2b772ad 100644 (file)
--- a/forum/templatetags/general_sidebar_tags.py
+++ b/forum/templatetags/general_sidebar_tags.py
@@ -1,5 +1,6 @@
 from django import template\r
 from forum.models import Tag, Award\r
 from django import template\r
 from forum.models import Tag, Award\r

+from forum import settings\r

 \r
 #todo: move to settings\r
 RECENT_TAGS_SIZE = 25\r
 \r
 #todo: move to settings\r
 RECENT_TAGS_SIZE = 25\r


@@ -13,4 +14,20 @@ def recent_tags():
 \r
 @register.inclusion_tag('sidebar/recent_awards.html')\r
 def recent_awards():\r
 \r
 @register.inclusion_tag('sidebar/recent_awards.html')\r
 def recent_awards():\r

-    return {'awards': Award.objects.order_by('-awarded_at')[:RECENT_AWARD_SIZE]}
\ No newline at end of file
+    return {'awards': Award.objects.order_by('-awarded_at')[:RECENT_AWARD_SIZE]}\r
+\r
+@register.inclusion_tag('sidebar/user_blocks.html')\r
+def sidebar_upper():\r
+    return {\r
+        'show': settings.SIDEBAR_UPPER_SHOW,\r
+        'content': settings.SIDEBAR_UPPER_TEXT,\r
+        'blockid': 'sidebar-upper'\r
+    }\r
+\r
+@register.inclusion_tag('sidebar/user_blocks.html')\r
+def sidebar_lower():\r
+    return {\r
+        'show': settings.SIDEBAR_LOWER_SHOW,\r
+        'content': settings.SIDEBAR_LOWER_TEXT,\r
+        'blockid': 'sidebar-lower'\r
+    }\r