X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/0f2d00f9d7d5d28149707f66c719b28edfe51aed..1cbbc10ec680da017745add73b98986197988bd3:/forum/skins/default/templates/users/info.html?ds=sidebyside

diff --git a/forum/skins/default/templates/users/info.html b/forum/skins/default/templates/users/info.html
index 690fc7e..efe2b43 100644
--- a/forum/skins/default/templates/users/info.html
+++ b/forum/skins/default/templates/users/info.html
@@ -4,6 +4,9 @@
 {% load humanize %}
 {% load smart_if %}
 {% load i18n %}
+{% load markup %}
+{% load user_tags %}
+
 <div id="subheader" class="headUser">
     {{view_user.username}}
 </div>
@@ -18,36 +21,15 @@
                 </tr>
                 <tr>
                     <td align="center">
-                        <div class="scoreNumber">{{view_user.reputation|intcomma}}</div>
+                        <div class="scoreNumber" id="user-reputation">{{view_user.reputation|intcomma}}</div>
                         <p><b style="color:#777;">{% trans "reputation" %}</b></p>
                     </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>
@@ -82,8 +64,10 @@
                 {% if view_user.date_of_birth%}
                 <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>
+                    {% endif %}
                 </tr>
                 {% endif %}
                 {% if request.user.is_superuser %}
@@ -105,7 +89,7 @@
         <td width="380">
             <div class="user-about">
             {% if view_user.about %}
-                {{view_user.about|safe|linebreaks}}
+                {{view_user.about|markdown}}
             {% endif %}
             </div>
         </td>