4 files changed, 90 insertions, 29 deletions
diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less
index 50acb24d..8d6b4afb 100644
--- a/askbot/skins/default/media/style/style.less
+++ b/askbot/skins/default/media/style/style.less
@@ -1219,10 +1219,22 @@ ul#related-tags li {
     color: #1A1A1A;
 }
 
-.users-page h1,
-.tags-page h1,
-.groups-page h1 {
-    float: left;
+.users-page,
+.tags-page,
+.groups-page,
+.moderate-tags-page {
+    h1 {
+        float: left;
+        padding-top: 7px;
+    }
+}
+
+.moderate-tags-page {
+    th, tr {
+        vertical-align: top;
+        text-align: left;
+        padding-right: 20px;
+    }
 }
 
 .main-page h1 {
@@ -2299,7 +2311,6 @@ ul#related-tags li {
 /* tags page */
 
 .tabBar-tags{
-    width:270px;
     margin-bottom:15px;
 }
 
diff --git a/askbot/skins/default/templates/moderate_tags.html b/askbot/skins/default/templates/moderate_tags.html
new file mode 100644
index 00000000..59aa239a
--- /dev/null
+++ b/askbot/skins/default/templates/moderate_tags.html
@@ -0,0 +1,39 @@
+{% extends "two_column_body.html" %}
+{% import "macros.html" as macros %}
+<!-- tags.html -->
+{% block title %}{% spaceless %}{% trans %}Moderated Tags{% endtrans %}{% endspaceless %}{% endblock %}
+{% block content %}
+    {% include "tags/header.html" %}
+    {% if tags %}
+        <table>
+            <thead>
+                <tr>
+                    <th>{% trans %}Name{% endtrans %}</th>
+                    <th>{% trans %}Used count{% endtrans %}</th>
+                    <th>{% trans %}Suggested by{% endtrans %}</th>
+                    <th>{% trans %}In questions{% endtrans %}</th>
+                </tr>
+            </thead>
+            <tbody>
+            {% for tag in tags %}
+                <tr>
+                    <td>{{ tag.name }}</td>
+                    <td>{{ tag.used_count }}</td>
+                    <td>
+                        {% for user in tag.users.all() %}
+                            <p>{{ user.get_profile_link() }}</p>
+                        {% endfor %}
+                    </td>
+                    <td>
+                        {% for thread in tag.threads.all() %}
+                            <p><a href="{{ thread.get_absolute_url() }}">{{ thread.title|escape }}</a></p>
+                        {% endfor %}
+                    </td>
+                </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+    {% else %}
+        <span>{% trans %}Nothing found{% endtrans %}</span>
+    {% endif %}
+{% endblock %}
diff --git a/askbot/skins/default/templates/tags.html b/askbot/skins/default/templates/tags.html
index 007388af..e9049e8e 100644
--- a/askbot/skins/default/templates/tags.html
+++ b/askbot/skins/default/templates/tags.html
@@ -4,30 +4,7 @@
 {% block title %}{% spaceless %}{% trans %}Tags{% endtrans %}{% endspaceless %}{% endblock %}
 {% block content %}
 <!-- Tabs -->
-<div id="content-header">
-    {% if stag %}
-        <h1 class="section-title">{% trans %}Tags, matching "{{ stag }}"{% endtrans %}</h1>
-    {% else %}
-        <h1 class="section-title">{% trans %}Tag list{% endtrans %}</h1>
-    {% endif %}
-    <div class="tabBar tabBar-tags">
-        <div class="tabsA">
-            <span class="label">{% trans %}Sort by &raquo;{% endtrans %}</span>
-            <a
-                id="sort_name"
-                href="{% url tags %}?sort=name"
-                {% if tab_id == 'name' %}class="on"{% endif %}
-                title="{% trans %}sorted alphabetically{% endtrans %}"
-            ><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 %}"
-            ><span>{% trans %}by popularity{% endtrans %}</span></a>
-        </div>
-    </div>
-</div>
+{% include "tags/header.html" %}
 {% if tag_list_type == 'list' %}
     {% if not tags.object_list %}
         <span>{% trans %}Nothing found{% endtrans %}</span>
diff --git a/askbot/skins/default/templates/tags/header.html b/askbot/skins/default/templates/tags/header.html
new file mode 100644
index 00000000..4f614f30
--- /dev/null
+++ b/askbot/skins/default/templates/tags/header.html
@@ -0,0 +1,34 @@
+<div id="content-header">
+    {% if stag %}
+        <h1 class="section-title">{% trans %}Tags, matching "{{ stag }}"{% endtrans %}</h1>
+    {% else %}
+        <h1 class="section-title">{% trans %}Tags{% endtrans %}</h1>
+    {% endif %}
+    <div class="tabBar tabBar-tags">
+        <div class="tabsA">
+            <span class="label">{% trans %}Sort by &raquo;{% endtrans %}</span>
+            <a
+                id="sort_name"
+                href="{% url tags %}?sort=name"
+                {% if tab_id == 'name' %}class="on"{% endif %}
+                title="{% trans %}sorted alphabetically{% endtrans %}"
+            ><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 %}"
+            ><span>{% trans %}by popularity{% endtrans %}</span></a>
+            {% if settings.ENABLE_TAG_MODERATION %}
+                {% if request.user.is_authenticated() and request.user.is_administrator_or_moderator() %}
+                    <a 
+                        href="{% url moderate_tags %}"
+                        {% if tab_id == 'used' %}class="on"{% endif %}
+                        title="{% trans %}suggested{% endtrans %}"
+                    ><span>{% trans %}moderated{% endtrans %}</span></a>
+                {% endif %}
+            {% endif %}
+        </div>
+    </div>
+</div>
+<div class="clearfix"></div>