user profile fixes

[osqa.git] / forum / skins / default / templates / user_info.html

diff --git a/forum/skins/default/templates/user_info.html b/forum/skins/default/templates/user_info.html
index 0ce4e77a13e7f531143c27b94cca19cda9a364eb..d5b2666069b0aa3bf2eb5a57371d8dbf54d64a22 100644 (file)
--- a/forum/skins/default/templates/user_info.html
+++ b/forum/skins/default/templates/user_info.html
@@ -26,7 +26,7 @@
         </td>
         <td width="360" style="vertical-align: top;">
             <table class="user-details">
-                {% if view_user != request.user and request.user|can_moderate_users %}
+                {% if view_user != request.user and request.user.is_superuser %}
                 <tr>
                     <td class="admin" align="left" colspan="2">
                         <h3>{% trans "Moderate this user" %}</h3>
@@ -37,25 +37,17 @@
                     </td>
                 </tr>
                 {% endif %}
-                {% if request.user|can_view_user_edit:view_user %}
+                {% ifequal request.user view_user %}
                 <tr>
                     <td class="user-profile-tool-links" align="left" colspan="2">
                         {% joinitems using ' | ' %}
-                            {% if request.user|can_view_user_edit:view_user %}
                             <span class="user-edit-link"><a href="{% url users %}{{ view_user.id }}/{% trans "edit/" %}">{% trans "update profile" %}</a></span>
-                            {% endif %}
                         {% separator %}
-                            {% ifequal request.user view_user %}
-                            <a href="{% url auth_signin %}">add authentication method</a>
-                            {% endifequal %}
-                        {% separator %}
-                            {% if request.user.has_usable_password %}
-                                <a href="{% url user_changepw %}">change password</a>
-                            {% endif %}
+                            <a href="{% url user_authsettings %}">authentication settings</a>
                         {% endjoinitems %}
                     </td>
                 </tr>  
-                {% endif %}
+                {% endifequal %}
                 <tr>
                     <th colspan="2" align="left"><h3>{% trans "Registered user" %}</h3></th>
                 </tr>