osqa-23

when displaying a tags questions we no longer filter them.

also, i took some javascript out of the main javascript file and put it in the question_edit_tips.html file.

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

diff --git a/forum/skins/default/media/js/osqa.main.js b/forum/skins/default/media/js/osqa.main.js
index 20ecf9311d5fe71256bef6dc0899dcfb53252406..a0617a3deb5cfc9fa616f7acf1d799f0bae57aa4 100644 (file)
--- a/forum/skins/default/media/js/osqa.main.js
+++ b/forum/skins/default/media/js/osqa.main.js
@@ -936,22 +936,3 @@ var notify = function() {
         isVisible: function() { return visible; }\r
     };\r
 } ();\r
-\r
-\r
-function changeSideBar(enabled_bar) {\r
-    $(currentSideBar).hide();\r
-    currentSideBar = enabled_bar;\r
-    $(currentSideBar).fadeIn('slow');\r
-\r
-}\r
-\r
-var currentSideBar = 'div#title_side_bar';\r
-$(function () {\r
-    $('div#editor_side_bar').hide();\r
-    $('div#tags_side_bar').hide();\r
-\r
-    $('input#id_title').focus(function(){changeSideBar('div#title_side_bar')});\r
-    $('textarea#editor').focus(function(){changeSideBar('div#editor_side_bar')});\r
-    $('input#id_tags').focus(function(){changeSideBar('div#tags_side_bar')});\r
-});\r
-\r

diff --git a/forum/skins/default/templates/question_edit_tips.html b/forum/skins/default/templates/question_edit_tips.html
index 1a27be38079c7005e70352c25bf3b811e6c2866c..7e1bafe217b82b3b3477e02e232380fe32c296d8 100644 (file)
--- a/forum/skins/default/templates/question_edit_tips.html
+++ b/forum/skins/default/templates/question_edit_tips.html
@@ -1,5 +1,24 @@
 <!-- question_edit_tips.html -->
 {% load i18n %}
+{% block forejs %}
+        <script type="text/javascript">
+            var currentSideBar = 'div#title_side_bar';
+            function changeSideBar(enabled_bar) {
+                $(currentSideBar).hide();
+                currentSideBar = enabled_bar;
+                $(currentSideBar).fadeIn('slow');
+
+            }
+            $(function () {
+                $('div#editor_side_bar').hide();
+                $('div#tags_side_bar').hide();
+
+                $('input#id_title').focus(function(){changeSideBar('div#title_side_bar')});
+                $('textarea#editor').focus(function(){changeSideBar('div#editor_side_bar')});
+                $('input#id_tags').focus(function(){changeSideBar('div#tags_side_bar')});
+            });
+        </script>
+{% endblock %}
 <div class="boxC" id="title_side_bar">
     <p class="subtitle darkred">{% trans "Title Tips" %}</p>
     <div>

diff --git a/forum/views/readers.py b/forum/views/readers.py
index bac3c0c244b5c3ae05e4e08f6b8c9de1136f3f61..42950a977b47a35c45dee6a622be980eedb73576 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -59,15 +59,19 @@ def questions(request):
 def tag(request, tag):
     return question_list(request, Question.objects.filter(tags__name=unquote(tag)),
                         mark_safe(_('Questions tagged <span class="tag">%(tag)s</span>') % {'tag': tag}),
-                        'active', None, mark_safe(_('Questions tagged %(tag)s') % {'tag': tag}))
+                        'active',
+                        None,
+                        mark_safe(_('Questions tagged %(tag)s') % {'tag': tag}),
+                        True)
 
 @decorators.list('questions', QUESTIONS_PAGE_SIZE)
-def question_list(request, initial, list_description=_('questions'), sort=None, base_path=None, page_title=None):
+def question_list(request, initial, list_description=_('questions'), sort=None, base_path=None, page_title=None, ignoringTags=False):
     questions = initial.filter(deleted=None, in_moderation=None)
 
-    if request.user.is_authenticated():
-        questions = questions.filter(
-                ~Q(tags__id__in=request.user.marked_tags.filter(user_selections__reason='bad')))
+    test = request.user.marked_tags
+
+    if request.user.is_authenticated() and  not ignoringTags:
+        questions = questions.filter(~Q(tags__id__in = request.user.marked_tags.filter(user_selections__reason = 'bad')))
 
     if sort is not False:
         if sort is None:
@@ -81,7 +85,7 @@ def question_list(request, initial, list_description=_('questions'), sort=None,
 
     if page_title is None:
         page_title = _("Questions")
-        
+
     return {
         "questions" : questions,
         "questions_count" : questions.count(),