Some extra admin stuff and applied a patch from Ekalinin on OSQA 95.

[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..919ab8b240f889d98bf6551c374ec84347e4e8c5 100644 (file)
--- a/forum/skins/default/templates/users/info.html
+++ b/forum/skins/default/templates/users/info.html
@@ -4,6 +4,8 @@
 {% load humanize %}
 {% load smart_if %}
 {% load i18n %}
+{% load markup %}
+{% load user_tags %}
 <div id="subheader" class="headUser">
     {{view_user.username}}
 </div>
@@ -28,26 +30,22 @@
             <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 class="moderation" align="left" colspan="2">
+                        {% comment %}{% user_moderation request.user view_user %}{% endcomment %}
                     </td>
                 </tr>
                 {% endif %}
-                {% ifequal request.user view_user %}
+                {% if can_view_private %}
                 <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>
+                            <span class="user-edit-link"><a href="{% url edit_user id=view_user.id %}">{% trans "update profile" %}</a></span>
                         {% separator %}
-                            <a href="{% url user_authsettings %}">authentication settings</a>
+                            <a href="{% url user_authsettings id=view_user.id %}">{% trans "authentication settings" %}</a>
                         {% endjoinitems %}
                     </td>
                 </tr>  
-                {% endifequal %}
+                {% endif %}
                 <tr>
                     <th colspan="2" align="left"><h3>{% trans "Registered user" %}</h3></th>
                 </tr>
@@ -83,8 +81,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 +105,7 @@
         <td width="380">
             <div class="user-about">
             {% if view_user.about %}
-                {{view_user.about|safe|linebreaks}}
+                {{view_user.about|markdown}}
             {% endif %}
             </div>
         </td>