Jira OSQA-618, adding a setting that allows to remove the interesting and ignored...

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

diff --git a/forum/settings/sidebar.py b/forum/settings/sidebar.py
index 78145942459313c0fae951f4ae40c002ca7f9413..4e5ad394a0e5ef7d78e1bd15b952f87ac377a1b4 100644 (file)
--- a/forum/settings/sidebar.py
+++ b/forum/settings/sidebar.py
@@ -11,6 +11,11 @@ label = _("Show the Welcome box"),
 help_text = _("Do you want to show the welcome box when a user first visits your site."),
 required=False))
 
+SHOW_INTERESTING_TAGS_BOX = Setting('SHOW_INTERESTING_TAGS_BOX', True, SIDEBAR_SET, dict(
+label = _("Show interesting tags in the sidebar"),
+help_text = _("Check this if you want to see the interesting tags container in the sidebar."),
+required=False))
+
 APP_INTRO = Setting('APP_INTRO', u'<p>Ask and answer questions, make the world better!</p>', SIDEBAR_SET, dict(
 label = _("Application intro"),
 help_text = _("The introductory page that is visible in the sidebar for anonymous users."),

diff --git a/forum/skins/default/templates/question_list/tag_selector.html b/forum/skins/default/templates/question_list/tag_selector.html
index f507d646efde2994dbe784995a9fb6397961c660..89817a972952a8a84a284b2bff42265df3abe006 100644 (file)
--- a/forum/skins/default/templates/question_list/tag_selector.html
+++ b/forum/skins/default/templates/question_list/tag_selector.html
@@ -1,6 +1,7 @@
 {% load i18n %}
 {% load extra_tags %}
 
+{% if show_interesting_tags %}
 {% if user_authenticated %}
 <div id="tagSelector" class="boxC">
        <h3 class="subtitle">{% trans "Interesting tags" %}</h3>
@@ -47,3 +48,4 @@
     {% endcomment %}
 </div>
 {% endif %}
+{% endif %}

diff --git a/forum/skins/default/templates/tag_selector.html b/forum/skins/default/templates/tag_selector.html
deleted file mode 100644 (file)
index 91967b2..0000000
--- a/forum/skins/default/templates/tag_selector.html
+++ /dev/null
@@ -1,42 +0,0 @@
-{% load i18n %}
-{% load extra_tags %}
-<div id="tagSelector" class="boxC">
-       <h3 class="subtitle">{% trans "Interesting tags" %}</h3>
-    <div class="tags interesting marked-tags">
-    {% for tag_name in interesting_tag_names %}
-        {% spaceless %}
-        <span class="deletable-tag tag-link-{{ tag }}" id="interesting-tag-{{tag_name}}">
-            <a rel="tag" 
-                title="{% blocktrans with tag as tagname %}see questions tagged '{{ tag_name }}'{% endblocktrans %}"
-                href="{% url tag_questions tag_name|urlencode %}">{{tag_name}}</a>
-            <img class="delete-icon" 
-                src="{% media  "/media/images/close-small-dark.png" %}"
-                title="{% blocktrans %}remove '{{tag_name}}' from the list of interesting tags{% endblocktrans %}"/>
-        </span>
-        {% endspaceless %}
-    {% endfor %}
-    </div>
-    <input id="interestingTagInput" autocomplete="off" type="text"/>
-    <input id="interestingTagAdd" type="submit" value="{% trans "Add" %}"/>
-       <h3 class="subtitle">{% trans "Ignored tags" %}</h3>
-    <div class="tags ignored marked-tags">
-    {% for tag_name in ignored_tag_names %}
-        {% spaceless %}
-        <span class="deletable-tag tag-link-{{ tag }}" id="ignored-tag-{{tag_name}}">
-            <a rel="tag" 
-                title="{% blocktrans with tag as tagname %}see questions tagged '{{ tag_name }}'{% endblocktrans %}"
-                href="{% url tag_questions tag_name|urlencode %}">{{tag_name}}</a>
-            <img class="delete-icon" 
-                src="{% media  "/media/images/close-small-dark.png" %}"
-                title="{% blocktrans %}remove '{{tag_name}}' from the list of ignored tags{% endblocktrans %}"/>
-        </span>
-        {% endspaceless %}
-    {% endfor %}
-    </div>
-    <input id="ignoredTagInput" autocomplete="off" type="text"/>
-    <input id="ignoredTagAdd" type="submit" value="{% trans "Add" %}"/>
-    <p id="hideIgnoredTagsControl">
-    <input id="hideIgnoredTagsCb" type="checkbox" {% if request.user.hide_ignored_questions %}checked="checked"{% endif %} />
-    <label id="hideIgnoredTagsLabel" for="hideIgnoredTagsCb">{% trans "keep ignored questions hidden" %}</label>
-    <p>
-</div>

diff --git a/forum/templatetags/question_list_tags.py b/forum/templatetags/question_list_tags.py
index 8cef6fc44f14fb0373ffd040757d68dfae865769..642a5a32e008a09bd8d7b071e195c62576759304 100644 (file)
--- a/forum/templatetags/question_list_tags.py
+++ b/forum/templatetags/question_list_tags.py
@@ -65,6 +65,7 @@ def question_list_related_tags(questions):
 @register.inclusion_tag('question_list/tag_selector.html', takes_context=True)\r
 def tag_selector(context):\r
     request = context['request']\r
+    show_interesting_tags = settings.SHOW_INTERESTING_TAGS_BOX\r
 \r
     if request.user.is_authenticated():\r
         pt = MarkedTag.objects.filter(user=request.user)\r
@@ -73,6 +74,7 @@ def tag_selector(context):
             "interesting_tag_names": pt.filter(reason='good').values_list('tag__name', flat=True),\r
             'ignored_tag_names': pt.filter(reason='bad').values_list('tag__name', flat=True),\r
             'user_authenticated': True,\r
+            'show_interesting_tags' : show_interesting_tags,\r
         }\r
     else:\r
-        return { 'request' : request, 'user_authenticated': False}\r
+        return { 'request' : request, 'user_authenticated': False, 'show_interesting_tags' : show_interesting_tags }\r