Add replacement for the markdown filter (removed in Django 1.6)

[osqa.git] / forum / skins / default / templates / users / info.html

diff --git a/forum/skins/default/templates/users/info.html b/forum/skins/default/templates/users/info.html
index e14cbf8adc694c03b5d1ff6723fa963985620120..c7d50e51683d77b9e9ec3b9a85336c9d26e000ed 100644 (file)
--- a/forum/skins/default/templates/users/info.html
+++ b/forum/skins/default/templates/users/info.html
@@ -4,7 +4,6 @@
 {% load humanize %}
 {% load smart_if %}
 {% load i18n %}
-{% load markup %}
 {% load user_tags %}
 
 <div id="subheader" class="headUser{% if view_user.is_suspended %} suspended-user{% endif %}">
@@ -36,7 +35,19 @@
         {% if can_view_private %}{% user_menu request.user view_user %}{% endif %}
             <table class="user-details">
                 <tr>
-                    <th colspan="2" align="left"><h3>{% trans "Registered user" %}</h3></th>
+                    <th colspan="2" align="left">
+                        <h3>
+                            {% if view_user.is_superuser %}
+                                {% trans "Administrator" %}
+                            {% else %}
+                                {% if view_user.is_staff %}
+                                    {% trans "Moderator" %}
+                                {% else %}
+                                    {% trans "Registered user" %}
+                                {% endif %}
+                            {% endif %}
+                        </h3>
+                    </th>
                 </tr>
                 {% if view_user.real_name %}
                 <tr>
@@ -51,7 +62,7 @@
                 {% if view_user.last_seen %}
                 <tr>
                     <td>{% trans "last seen" %}</td>
-                    <td><strong title="{{ view_user.last_login }}">{% diff_date view_user.last_login %}</strong></td>
+                    <td><strong title="{{ view_user.last_activity }}">{% diff_date view_user.last_activity %}</strong></td>
                 </tr>
                 {% endif %}
                 {% if view_user.website %}
@@ -79,16 +90,24 @@
                 <tr>
                     <td>{% trans "email" %}</td>
                     <td>
-                        <a href="mailto: {{ view_user.email }}">{{ view_user.email }}</a>
+                        <a href="mailto:{{ view_user.email }}">{{ view_user.email }}</a>
                         {% if not view_user.email_isvalid %}
                             ({% trans "not validated" %})
                             {% ifequal request.user view_user %}
-                                </td></tr><tr><td></td><td><a href="{% url send_validation_email %}">{% trans "Send me a validation link." %}</a>
+                                </td></tr><tr><td></td><td><a href="{% url "send_validation_email" %}">{% trans "Send me a validation link." %}</a>
                             {% endifequal %}
                         {% endif %}
                     </td>
                 </tr>
                 {% endif %}
+
+                <tr>
+                    <td colspan="2" style="text-align:right">
+                        <a href="{% url "user_report" user.pk %}" class="ajax-command withprompt">
+                        Report user
+                        </a>
+                    </td>
+                </tr>
                                <!--
                 {% if votes_today_left %}
                 <tr>
@@ -100,11 +119,13 @@
             </table>
         </td>
         <td width="380">
+            {% if not view_user.is_suspended %}
             <div class="user-about">
             {% if view_user.about %}
-                {{view_user.about|markdown}}
+                {{view_user.about|static_content:"markdown-safe"}}
             {% endif %}
             </div>
+            {% endif %}
         </td>
     </tr>
 </table>