From: jordan Date: Sun, 25 Mar 2012 00:18:56 +0000 (+0000) Subject: adding wrapping divs to user blocks X-Git-Tag: live~80 X-Git-Url: https://git.openstreetmap.org/osqa.git/commitdiff_plain/0df1608e9f603e6f40b306a3aff20e52e7318d5a adding wrapping divs to user blocks git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1237 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- diff --git a/forum/models/action.py b/forum/models/action.py index e8d0765..3aa6582 100644 --- a/forum/models/action.py +++ b/forum/models/action.py @@ -300,7 +300,7 @@ class ActionRepute(models.Model): return 0 def _add_to_rep(self, value): - if (self.user.reputation + value < 1) and not settings.ALLOW_NEGATIVE_REPUTATION: + if int(self.user.reputation + value) < 1 and not settings.ALLOW_NEGATIVE_REPUTATION: return 0 else: return models.F('reputation') + value diff --git a/forum/skins/default/templates/users/stats.html b/forum/skins/default/templates/users/stats.html index fe34b19..358771d 100644 --- a/forum/skins/default/templates/users/stats.html +++ b/forum/skins/default/templates/users/stats.html @@ -6,7 +6,7 @@ {% load humanize %} {% load question_list_tags %} {% block usercontent %} - +
{% spaceless %}

@@ -19,7 +19,7 @@ href="{{ view_user.get_asked_url }}?type=rss" title="{% trans "subscribe to question RSS feed" %}">

{% endspaceless %} -
{{ questions.paginator.sort_tabs }}
+
{{ questions.paginator.sort_tabs }}
{% for question in questions.paginator.page %} {% question_list_item question favorite_count=yes signature_type=badges %} @@ -28,7 +28,9 @@
{{ questions.paginator.page_numbers }}

+
+
{% spaceless %}

@@ -39,7 +41,7 @@ {% endblocktrans %}

{% endspaceless %} -
{{ answers.paginator.sort_tabs }}
+
{{ answers.paginator.sort_tabs }}
{% for answer in answers.paginator.page %}
@@ -61,6 +63,9 @@
{{ answers.paginator.page_numbers }}

+
+ + {% spaceless %}