OSQA-713, smart unicode the username for the accept rate user tool

[osqa.git] / forum / templatetags / general_sidebar_tags.py

diff --git a/forum/templatetags/general_sidebar_tags.py b/forum/templatetags/general_sidebar_tags.py
index 09f30cccf215d8923c741f42c25c3ee23f9bf768..2f70fa2c62fa2b31dde5137646dde20bfcd7f232 100644 (file)
--- a/forum/templatetags/general_sidebar_tags.py
+++ b/forum/templatetags/general_sidebar_tags.py
@@ -2,25 +2,23 @@ from django import template
 from forum.models import Tag, Award\r
 from forum import settings\r
 \r
-#todo: move to settings\r
-RECENT_TAGS_SIZE = 25\r
-RECENT_AWARD_SIZE = 15\r
+from extra_filters import static_content\r
 \r
 register = template.Library()\r
 \r
-@register.inclusion_tag('sidebar/recent_tags.html')\r
-def recent_tags():\r
-    return {'tags': Tag.active.order_by('-id')[:RECENT_TAGS_SIZE]}\r
+@register.inclusion_tag('sidebar/markdown_help.html')\r
+def markdown_help():\r
+    return {}\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]}\r
+    return {'awards': Award.objects.order_by('-awarded_at')[:settings.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
+        'content': static_content(settings.SIDEBAR_UPPER_TEXT, settings.SIDEBAR_UPPER_RENDER_MODE),\r
         'wrap': not settings.SIDEBAR_UPPER_DONT_WRAP,\r
         'blockid': 'sidebar-upper'\r
     }\r
@@ -29,7 +27,13 @@ def sidebar_upper():
 def sidebar_lower():\r
     return {\r
         'show': settings.SIDEBAR_LOWER_SHOW,\r
-        'content': settings.SIDEBAR_LOWER_TEXT,\r
+        'content': static_content(settings.SIDEBAR_LOWER_TEXT, settings.SIDEBAR_LOWER_RENDER_MODE),\r
         'wrap': not settings.SIDEBAR_LOWER_DONT_WRAP,\r
         'blockid': 'sidebar-lower'\r
     }\r
+\r
+@register.inclusion_tag('sidebar/recent_tags.html')\r
+def recent_tags():\r
+    return {'tags': Tag.active.order_by('-id')[:settings.RECENT_TAGS_SIZE]}\r
+\r
+    
\ No newline at end of file