Merge lp:~pietroalbini/ubuntu-it-ask/fix-lp1211675 into lp:ubuntu-it-ask

[Pietro Albini]

Fixed bug 1211675.
Restored gold badges icon.

[Riccardo Padovani (rpadovani)]

Works good for me, thanks!

review: Approve

=== added file 'forum/skins/light/templates/users/signature.html'
--- forum/skins/light/templates/users/signature.html	1970-01-01 00:00:00 +0000
+++ forum/skins/light/templates/users/signature.html	2013-08-13 09:30:31 +0000
@@ -0,0 +1,33 @@
+{% load i18n extra_filters %}{% spaceless %}
+
+{% if not user.is_suspended %}
+    {% ifequal format "full" %}
+
+    {% else %}
+        <a href="{{ user.get_absolute_url }}">{{ user.decorated_name }}</a>
+        <span class="score" title="{{ user.reputation }} {% trans "reputation" %}">{{ user.reputation|decorated_int:"" }}</span>
+        {% ifequal format "badges" %}
+            {% if user.gold %}
+            <span title="{{ user.gold }} {% trans "badges" %}">
+                <span class="gold">&#9679;</span>
+                <span class="badgecount">{{ user.gold }}</span>
+            </span>
+            {% endif %}
+            {% if user.silver %}
+            <span title="{{ user.silver }} {% trans "badges" %}">
+                <span class="silver">&#9679;</span>
+                <span class="badgecount">{{ user.silver }}</span>
+            </span>
+            {% endif %}
+            {% if user.bronze %}
+            <span title="{{ user.bronze }} {% trans "badges" %}">
+                <span class="bronze">&#9679;</span>
+                <span class="badgecount">{{ user.bronze }}</span>
+            </span>
+            {% endif %}
+        {% endifequal %}
+    {% endifequal %}
+{% else %}
+    <a class="suspended-user" href="{{ user.get_absolute_url }}">{{ user.decorated_name }}</a>{% trans "(suspended)" %}
+{% endif %}
+{% endspaceless %}

=== modified file 'forum/templatetags/extra_tags.py'
--- forum/templatetags/extra_tags.py	2012-08-19 11:02:51 +0000
+++ forum/templatetags/extra_tags.py	2013-08-13 09:30:31 +0000
@@ -58,7 +58,7 @@
     BADGE_TEMPLATE = '<span class="score" title="%(reputation)s %(reputationword)s">%(repstr)s</span>'
     if user.gold > 0 :
         BADGE_TEMPLATE = '%s%s' % (BADGE_TEMPLATE, '<span title="%(gold)s %(badgesword)s">'
-        '<span class="badge1">&#9679;</span>'
+        '<span class="gold">&#9679;</span>'
         '<span class="badgecount">%(gold)s</span>'
         '</span>')
     if user.silver > 0: