added a jinja2 macro for the tag cloud

4 files changed, 22 insertions, 25 deletions

diff --git a/askbot/skins/default/templates/macros.html b/askbot/skins/default/templates/macros.html
index e19a04bd..a749df54 100644
--- a/askbot/skins/default/templates/macros.html
+++ b/askbot/skins/default/templates/macros.html
@@ -311,6 +311,14 @@ poor design of the data or methods on data objects #}
     {%- endif -%}
 {%- endmacro -%}
 
+{%- macro tag_cloud(tags = None, font_sizes = None) -%}
+    {% for tag in tags %}
+    <span class="tag-size-{{ font_sizes[tag.name] }}">
+        <a class="link-typeA" title="Number of entries: {{ tag.used_count }}" href="{% url questions %}?tags={{ tag.name }}">{{ tag.name }}</a>
+    </span>
+    {% endfor %}
+{%- endmacro -%}
+
 {%- macro tag_list_widget(
             tags,
             id = None,
diff --git a/askbot/skins/default/templates/main_page/sidebar.html b/askbot/skins/default/templates/main_page/sidebar.html
index c755c3c8..b6b88abf 100644
--- a/askbot/skins/default/templates/main_page/sidebar.html
+++ b/askbot/skins/default/templates/main_page/sidebar.html
@@ -37,11 +37,7 @@
             {% endfor %}
         </ul>
         {% else %}
-            {% for tag in tags %}
-            <span class="tag-size-{{ font_size[tag.name] }}">
-                <a class="link-typeA" title="Number of entries: {{ tag.used_count }}" href="{% url questions %}?tags={{ tag.name }}">{{ tag.name }}</a>
-            </span>
-            {% endfor %}
+            {{ macros.tag_cloud(tags = tags, font_sizes = font_size) }}
         {% endif %}
     </div>
     {% endcache %}
diff --git a/askbot/skins/default/templates/tags.html b/askbot/skins/default/templates/tags.html
index 824df95c..d37cc9e7 100644
--- a/askbot/skins/default/templates/tags.html
+++ b/askbot/skins/default/templates/tags.html
@@ -5,7 +5,12 @@
 {% block content %}
 <!-- Tabs -->
 <div class="tabBar">
-    <h1>{% trans %}Tag list{% endtrans %}</h1>
+    {% if stag %}
+        <h1>{% trans %}Tags, matching "{{ stag }}"{% endtrans %}</h1>
+    {% else %}
+        <h1>{% trans %}Tag list{% endtrans %}</h1>
+    {% endif %}
+
     <div class="tabsA">
         <a
             id="sort_name"
@@ -22,14 +27,9 @@
     </div>
 </div>
 {% if tag_list_type == 'list' %}
-<p>
-    {% if stag %}
-        {% trans %}All tags matching '<span class="darkred"><strong>{{ stag }}</strong></span>'{% endtrans %}:
-    {% endif %}
     {% if not tags.object_list %}
         <span>{% trans %}Nothing found{% endtrans %}</span>
     {% endif %}
-</p>
     {% if tags.object_list %}
         <ul class='tags'>
             {% for tag in tags.object_list %}
@@ -45,25 +45,18 @@
             </li>
             {% endfor %}
         </ul>
-    <div class="pager">
-        {{macros.paginator(paginator_context)}}
-    </div>
+        <div class="pager">
+            {{macros.paginator(paginator_context)}}
+        </div>
     {% endif %}
 {% else %}
-<p>
-    {% if stag %}
-        {% trans %}All tags matching '<span class="darkred"><strong>{{ stag }}</strong></span>'{% endtrans %}:
-    {% endif %}
+    <div class="clearfix"></div>
     {% if not tags %}
         <span>{% trans %}Nothing found{% endtrans %}</span>
     {% endif %}
-</p>
-    {% for tag in tags %}
-    <span class="tag-size-{{ font_size[tag.name] }}">
-        <a class="link-typeA" title="Number of entries: {{ tag.used_count }}" href="/questions/?tags={{ tag.name }}">{{ tag.name }}</a>
-    </span>
-    {% endfor %}
+    {{ macros.tag_cloud(tags = tags, font_sizes = font_size) }}
 {% endif %}
+
 {% endblock %}
 {% block endjs %}
     <script type="text/javascript">
diff --git a/askbot/views/readers.py b/askbot/views/readers.py
index d512cf83..20d13adc 100644
--- a/askbot/views/readers.py
+++ b/askbot/views/readers.py
@@ -97,7 +97,7 @@ def questions(request):
     
     #force cloud to sort by name
     if tag_list_type == 'cloud':
-        related_tags = sorted(related_tags, key=operator.attrgetter('name'))
+        related_tags = sorted(related_tags, key = operator.attrgetter('name'))
 
     font_size = extra_tags.get_tag_font_size(related_tags)