1 files changed, 26 insertions, 26 deletions
diff --git a/askbot/skins/default/templates/tags.html b/askbot/skins/default/templates/tags.html
index c23b57f9..619c35bf 100644
--- a/askbot/skins/default/templates/tags.html
+++ b/askbot/skins/default/templates/tags.html
@@ -5,49 +5,49 @@
 {% block content %}
 <!-- Tabs -->
 <div class="tabBar">
-    <div class="headUsers">{% trans %}Tag list{% endtrans %}</div>
+    <h1>{% trans %}Tag list{% endtrans %}</h1>
     <div class="tabsA">
         <a
             id="sort_name"
             href="{% url tags %}?sort=name"
             {% if tab_id == 'name' %}class="on"{% endif %}
             title="{% trans %}sorted alphabetically{% endtrans %}"
-        >{% trans %}by name{% endtrans %}</a>
+        ><span>{% trans %}by name{% endtrans %}</span></a>
         <a
             id="sort_used"
             href="{% url tags %}?sort=used"
             {% if tab_id == 'used' %}class="on"{% endif %}
             title="{% trans %}sorted by frequency of tag use{% endtrans %}"
-        >{% trans %}by popularity{% endtrans %}</a>
+        ><span>{% trans %}by popularity{% endtrans %}</span></a>
     </div>
 </div>
-<div id="searchtags">
-    <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="tagsList tags">
-    {% for tag in tags.object_list %}
-       <li>
-        <a href="{% url questions %}?tags={{tag|urlencode}}&start_over=true" 
-            title="{% trans %}see questions tagged '{{ tag }}'{% endtrans %}" rel="tag">
-            {{ tag }}
-        </a>&nbsp;
-        <span class="tag-number">&#215; {{ tag.used_count|intcomma }}</span>
-        <br/>
+<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 %}
+        <li>
+            {{ macros.tag_widget(
+                        tag = tag.name,
+                        url_params = 'start_over=true',
+                        html_tag = 'div',
+                        extra_content = '<span class="tag-number">&#215; ' ~
+                                        tag.used_count|intcomma ~ '</span>'
+                )
+            }}
         </li>
-    {% endfor %}
+        {% endfor %}
     </ul>
-    {% endif %}
-</div>
+{% endif %}
 <div class="pager">
     {{macros.paginator(paginator_context)}}
-</div>              
+</div>
 {% endblock %}
 {% block endjs %}
     <script type="text/javascript">