osqa-342

[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 fb6fcde2ad2751e04b579668b020309e5d88e2f7..b533f00d605808b7e55b33db641e28a8630f8646 100644 (file)
--- a/forum/skins/default/templates/users/info.html
+++ b/forum/skins/default/templates/users/info.html
@@ -4,7 +4,10 @@
 {% load humanize %}
 {% load smart_if %}
 {% load i18n %}
-<div id="subheader" class="headUser">
+{% load markup %}
+{% load user_tags %}
+
+<div id="subheader" class="headUser{% if view_user.is_suspended %} suspended-user{% endif %}">
     {{view_user.username}}
 </div>
 <table class="user-info-table">
@@ -18,36 +21,20 @@
                 </tr>
                 <tr>
                     <td align="center">
-                        <div class="scoreNumber">{{view_user.reputation|intcomma}}</div>
-                        <p><b style="color:#777;">{% trans "reputation" %}</b></p>
+                        {% if not view_user.is_suspended %}
+                            <div class="scoreNumber" id="user-reputation">{{view_user.reputation|intcomma}}</div>
+                            <p><b style="color:#777;">{% trans "reputation" %}</b></p>
+                        {% else %}
+                            <div class="scoreNumber">{% trans "Suspended" %}</div>
+                            <p>{{ view_user.suspension.extra.publicmsg }}</p>
+                        {% endif %}
                     </td>
                 </tr>
             </table>
         </td>
         <td width="360" style="vertical-align: top;">
+        {% if can_view_private %}{% user_menu request.user view_user %}{% endif %}
             <table class="user-details">
-                {% if view_user != request.user and request.user.is_superuser %}
-                <tr>
-                    <td class="admin" align="left" colspan="2">
-                        <h3>{% trans "Moderate this user" %}</h3>
-                        <form id="moderate_user_form" method="post">
-                            {{moderate_user_form.as_p}}
-                        </form>
-                        <p id="action_status"></p>
-                    </td>
-                </tr>
-                {% endif %}
-                {% ifequal request.user view_user %}
-                <tr>
-                    <td class="user-profile-tool-links" align="left" colspan="2">
-                        {% joinitems using ' | ' %}
-                            <span class="user-edit-link"><a href="{% url users %}{{ view_user.id }}/{% trans "edit/" %}">{% trans "update profile" %}</a></span>
-                        {% separator %}
-                            <a href="{% url user_authsettings %}">authentication settings</a>
-                        {% endjoinitems %}
-                    </td>
-                </tr>  
-                {% endifequal %}
                 <tr>
                     <th colspan="2" align="left"><h3>{% trans "Registered user" %}</h3></th>
                 </tr>
@@ -64,12 +51,12 @@
                 {% if view_user.last_seen %}
                 <tr>
                     <td>{% trans "last seen" %}</td>
-                    <td><strong title="{{ view_user.last_seen }}">{% diff_date view_user.last_seen %}</strong></td>
+                    <td><strong title="{{ view_user.last_login }}">{% diff_date view_user.last_login %}</strong></td>
                 </tr>
                 {% endif %}
                 {% if view_user.website %}
                 <tr>
-                    <td>{% trans "user website" %}</td>
+                    <td>{% trans "user's website" %}</td>
                     <td><a rel="nofollow" target="_blank" href="{{view_user.website}}">{{view_user.website}}</a></td>
                 </tr>
                 {% endif  %}
@@ -83,8 +70,8 @@
                 <tr>
                                        <!--todo  - redo this with blocktrans -->
                     {% if view_user.date_of_birth.year != 1900%}
-                        <td>{% trans "age" %}</td>
-                        <td>{% get_age view_user.date_of_birth %} {% trans "age unit" %}</td>
+                    <td>{% trans "age" %}</td>
+                    <td>{% get_age view_user.date_of_birth %} {% trans "age unit" %}</td>
                     {% endif %}
                 </tr>
                 {% endif %}
@@ -107,7 +94,7 @@
         <td width="380">
             <div class="user-about">
             {% if view_user.about %}
-                {{view_user.about|safe|linebreaks}}
+                {{view_user.about|markdown}}
             {% endif %}
             </div>
         </td>