X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/cd19cb00154021685ea43d164a4dc8599b2e0a0e..32509c7ba5495ee0b0e42b0343cbd2a6125532cd:/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 fb6fcde..656c0ce 100644
--- a/forum/skins/default/templates/users/info.html
+++ b/forum/skins/default/templates/users/info.html
@@ -4,8 +4,11 @@
 {% load humanize %}
 {% load smart_if %}
 {% load i18n %}
-<div id="subheader" class="headUser">
-    {{view_user.username}}
+{% load markup %}
+{% load user_tags %}
+
+<div id="subheader" class="headUser{% if view_user.is_suspended %} suspended-user{% endif %}">
+    {{view_user.decorated_name}}
 </div>
 <table class="user-info-table">
     <tr>
@@ -18,38 +21,34 @@
                 </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>
+                    <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>
@@ -64,12 +63,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_activity }}">{% diff_date view_user.last_activity %}</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,15 +82,23 @@
                 <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 %}
-                {% if request.user.is_superuser %}
+                {% if can_view_private %}
                 <tr>
                     <td>{% trans "email" %}</td>
-                    <td><a href="mailto: {{ view_user.email }}">{{ view_user.email }}</a></td>
+                    <td>
+                        <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>
+                            {% endifequal %}
+                        {% endif %}
+                    </td>
                 </tr>
                 {% endif %}
 				<!--
@@ -107,7 +114,7 @@
         <td width="380">
             <div class="user-about">
             {% if view_user.about %}
-                {{view_user.about|safe|linebreaks}}
+                {{view_user.about|markdown}}
             {% endif %}
             </div>
         </td>