From: hernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Sat, 12 Jun 2010 01:35:49 +0000 (+0000)
Subject: Some more places to show a user is suspended.
X-Git-Tag: live~720
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/e56473b84a25d665bd56725cafc4cc284121ed93?ds=sidebyside

Some more places to show a user is suspended.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@412 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/skins/default/templates/users/info.html b/forum/skins/default/templates/users/info.html
index ab6a34f..b533f00 100644
--- a/forum/skins/default/templates/users/info.html
+++ b/forum/skins/default/templates/users/info.html
@@ -7,7 +7,7 @@
 {% load markup %}
 {% load user_tags %}
 
-<div id="subheader" class="headUser">
+<div id="subheader" class="headUser{% if view_user.is_suspended %} suspended-user{% endif %}">
     {{view_user.username}}
 </div>
 <table class="user-info-table">
@@ -21,8 +21,13 @@
                 </tr>
                 <tr>
                     <td align="center">
-                        <div class="scoreNumber" id="user-reputation">{{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>
@@ -46,7 +51,7 @@
                 {% 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 %}
diff --git a/forum/skins/default/templates/users/menu.html b/forum/skins/default/templates/users/menu.html
index 65d726e..18b886f 100644
--- a/forum/skins/default/templates/users/menu.html
+++ b/forum/skins/default/templates/users/menu.html
@@ -25,8 +25,11 @@
                 </li>
                 {% endif %}
             {% endif %}
-
-            <li class="item"><span class="user-award_rep"></span><a href="{% url user_award_points id=user.id %}" id="award-rep-points">{% trans "reputation bonus" %}</a></li>
+            {% if not user.is_suspended %}
+                <li class="item"><span class="user-award_rep"></span>
+                    <a href="{% url user_award_points id=user.id %}" id="award-rep-points">{% trans "reputation bonus" %}</a>
+                </li>
+            {% endif %}
                 {% if not user.is_superuser %}
                     {% if not user.is_staff %}
                     <li class="item"><span class="user-moderator"></span>
diff --git a/forum/skins/default/templates/users/users.html b/forum/skins/default/templates/users/users.html
index 2247f5b..a79058d 100644
--- a/forum/skins/default/templates/users/users.html
+++ b/forum/skins/default/templates/users/users.html
@@ -48,7 +48,7 @@
                     <div class="user">
                         <ul>
                             <li class="thumb"><a href="{{ user.get_profile_url }} ">{% gravatar user 32 %}</a></li>
-                            <li><a {% if user.is_suspended %}class="suspended-user" {% endif %}href=" {{ user.get_profile_url }} ">{{ user.get_profile_link }}</a></li>
+                            <li><a {% if user.is_suspended %}class="suspended-user" {% endif %}href="{{ user.get_profile_url }}">{{ user.username }}</a></li>
                             <li>{% get_score_badge user %}</li>
                         </ul>
                     </div>