Reordered the sidebar block so subscription block is above upper user-defined block.

[osqa.git] / forum / skins / default / templates / question.html

diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index 47e654a68d70168209ba70fc75d7da6178f87c34..1f30f7c2447a0e7e3e230146d4403956ca5ac58a 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 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
 {% load smart_if %}\r
 {% load humanize %}\r
 {% load i18n %}\r


@@ -22,7 +23,10 @@
         $().ready(function(){\r
             $("#nav_questions").attr('className',"on");\r
             var answer_sort_tab = "{{ tab_id }}";\r
         $().ready(function(){\r
             $("#nav_questions").attr('className',"on");\r
             var answer_sort_tab = "{{ tab_id }}";\r

-            $("#" + answer_sort_tab).attr('className',"on");\r
+\r
+            if (answer_sort_tab) {\r
+                $("#" + answer_sort_tab).attr('className',"on");\r
+            }\r

 \r
             $('#editor').TextAreaResizer();\r
             \r
 \r
             $('#editor').TextAreaResizer();\r
             \r


@@ -234,6 +238,7 @@
 <div class="boxC" id="subscription_box">\r
     {% include "subscription_status.html" %}\r
 </div>\r
 <div class="boxC" id="subscription_box">\r
     {% include "subscription_status.html" %}\r
 </div>\r

+{% sidebar_upper %}\r

 {% cache 60 questions_tags settings.APP_URL question.id %}\r
 <div class="boxC">\r
     <p>\r
 {% cache 60 questions_tags settings.APP_URL question.id %}\r
 <div class="boxC">\r
     <p>\r


@@ -257,6 +262,7 @@
     </p>\r
 </div>\r
 {% endcache %}\r
     </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
 <div class="boxC">\r
     <h3 class="subtitle">{% trans "Related questions" %}</h3>\r
     <div class="questions-related">\r