From: hernani Date: Mon, 12 Apr 2010 14:04:05 +0000 (+0000) Subject: several fixes in users profile X-Git-Tag: live~1045 X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/8b41b2f3a13b9f080d34a9ce0e7f815bc202417a several fixes in users profile git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@29 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- diff --git a/forum/skins/default/media/style/style.css b/forum/skins/default/media/style/style.css index c7142cf..7c651e6 100644 --- a/forum/skins/default/media/style/style.css +++ b/forum/skins/default/media/style/style.css @@ -530,6 +530,12 @@ blockquote { color: #666666; } +.short-summary .favorites { + width: 24px; + float: left; + text-align: center; +} + #question-table { margin-bottom: 10px; } @@ -1163,7 +1169,7 @@ div.comments-container, div.comments-container-accepted, div.comments-container- color: #314362; } -.answered-accepted { +.answer-votes.answered-accepted { background: none repeat scroll 0 0 #E6F8DD; color: #3A6231; } @@ -1847,6 +1853,7 @@ div.started .reputation-score { color: #333333; font-size: 110%; font-weight: bold; + margin-left: 3px; } .footerLinks { @@ -2296,7 +2303,7 @@ a.sidebar_button:hover { text-decoration: none; } -a.post-vote, a.favorite-mark, a.accept-answer { +a.post-vote, .favorite-mark, a.accept-answer { display: block; height: 24px; position: relative; @@ -2335,11 +2342,11 @@ a.accept-answer.on, a.accept-answer:hover { padding: 0 0 3px; } -a.favorite-mark { +.favorite-mark { background: url("/m/default/media/images/vote-favorite-off.png") no-repeat scroll center center transparent; } -a.favorite-mark.on, a.favorite-mark:hover { +.favorite-mark.on, a.favorite-mark:hover { background: url("/m/default/media/images/vote-favorite-on.png") no-repeat scroll center center transparent; } diff --git a/forum/skins/default/templates/question_list/item.html b/forum/skins/default/templates/question_list/item.html index ccaca92..e573914 100644 --- a/forum/skins/default/templates/question_list/item.html +++ b/forum/skins/default/templates/question_list/item.html @@ -1,7 +1,11 @@ {% load i18n humanize extra_filters extra_tags user_tags %}
-
-
+
{% if favorite_count %} +
+ +
{{question.favourite_count|intcomma}}
+
+ {% endif %}
{{question.score|intcomma}}
{% trans "votes" %}
@@ -15,10 +19,10 @@
-

{{question.title}}

+

{{question.title}}

{% diff_date question.last_activity_at %} - {% if question.last_activity_by %}{% user_signature_small_lite question.last_activity_by %}{% endif %} + {% if question.last_activity_by %}{% user_signature question.last_activity_by signature_type %}{% endif %}
{% for tag in question.tagname_list %} diff --git a/forum/skins/default/templates/question_list/item_extended.html b/forum/skins/default/templates/question_list/item_extended.html deleted file mode 100644 index 934c45d..0000000 --- a/forum/skins/default/templates/question_list/item_extended.html +++ /dev/null @@ -1,40 +0,0 @@ -{% load i18n %} -{% load humanize %} -{% load extra_filters %} -{% load extra_tags %} -{% load user_tags %} - -
-
-
- -
{{question.favourite_count|intcomma}}
-
-
-
{{question.score|intcomma}}
-
{% trans "votes" %}
-
-
-
{{question.answer_count|intcomma}}
-
{% trans "answers" %}
-
-
-
{{question.view_count|cnprog_intword|safe}}
-
{% trans "views" %}
-
-
- -

{{question.title}}

-
- {% diff_date question.last_activity_at %} - {% if question.last_activity_by %} - {% user_signature_small_full question.last_activity_by %} - {% endif %} -
- -
- {% for tag in question.tagname_list %} - - {% endfor %} -
-
\ No newline at end of file diff --git a/forum/skins/default/templates/questions.html b/forum/skins/default/templates/questions.html index ef7df58..31644e7 100644 --- a/forum/skins/default/templates/questions.html +++ b/forum/skins/default/templates/questions.html @@ -24,11 +24,9 @@ {% question_list_title %} {% question_sort_tabs sort_context %}
-
-{% for question in questions %} +
{% for question in questions %} {% question_list_item question %} -{% endfor %} -
+{% endfor %}
{% endblock %} {% block tail %} diff --git a/forum/skins/default/templates/user_stats.html b/forum/skins/default/templates/user_stats.html index bcb67e2..96a1f36 100644 --- a/forum/skins/default/templates/user_stats.html +++ b/forum/skins/default/templates/user_stats.html @@ -19,14 +19,14 @@ {% endspaceless %}
{% for question in questions %} - {% question_list_item_extended question %} + {% question_list_item question favorite_count=yes signature_type=badges %} {% endfor %}

{% spaceless %}

- {% blocktrans count answered_questions|length as counter %} + {% blocktrans count answers|length as counter %} 1 Answer {% plural %} {{counter}} Answers @@ -34,22 +34,22 @@

{% endspaceless %}
- {% for answered_question in answered_questions %} + {% for answer in answers %}
- - - {{ answered_question.vote_count }} + + + {{ answer.score }}
{% spaceless %} - {{answered_question.title}} + {{answer.question.title}} {% endspaceless %} - {% if answered_question.comment_count %} + {% if answer.comment_count %} - {% blocktrans count answered_question.comment_count as comment_count %} + {% blocktrans count answer.comment_count as comment_count %} (one comment) {% plural %} the answer has been commented {{comment_count}} times diff --git a/forum/skins/default/templates/users/info_small_full.html b/forum/skins/default/templates/users/info_small_full.html deleted file mode 100644 index f941d52..0000000 --- a/forum/skins/default/templates/users/info_small_full.html +++ /dev/null @@ -1,23 +0,0 @@ -{% load i18n %} - -{% spaceless %} - {% include "users/info_small_lite.html" %} - {% if gold %} - - ● - {{ gold }} - - {% endif %} - {% if silver %} - - ● - {{ silver }} - - {% endif %} - {% if bronze %} - - ● - {{ bronze }} - - {% endif %} -{% endspaceless %} \ No newline at end of file diff --git a/forum/skins/default/templates/users/info_small_lite.html b/forum/skins/default/templates/users/info_small_lite.html deleted file mode 100644 index b54094c..0000000 --- a/forum/skins/default/templates/users/info_small_lite.html +++ /dev/null @@ -1 +0,0 @@ -{% load i18n %}{{ name }} {{ reputation }} \ No newline at end of file diff --git a/forum/skins/default/templates/users/signature.html b/forum/skins/default/templates/users/signature.html new file mode 100644 index 0000000..a34893e --- /dev/null +++ b/forum/skins/default/templates/users/signature.html @@ -0,0 +1,28 @@ +{% load i18n %}{% spaceless %} +{% ifequal format "full" %} + +{% else %} + {{ user.username }} + {{ user.reputation }} + {% ifequal format "badges" %} + {% if user.gold %} + + ● + {{ user.gold }} + + {% endif %} + {% if user.silver %} + + ● + {{ user.silver }} + + {% endif %} + {% if user.bronze %} + + ● + {{ user.bronze }} + + {% endif %} + {% endifequal %} +{% endifequal %} +{% endspaceless %} \ No newline at end of file diff --git a/forum/templatetags/__init__.py b/forum/templatetags/__init__.py index e69de29..56a0b8b 100644 --- a/forum/templatetags/__init__.py +++ b/forum/templatetags/__init__.py @@ -0,0 +1,7 @@ +import re + +splitter = re.compile(r'\s*=\s*') +matcher = re.compile(r'^.+=.+$') + +def argument_parser(arguments): + return dict(splitter.split(s) for s in arguments if matcher.match(s)) \ No newline at end of file diff --git a/forum/templatetags/question_list_tags.py b/forum/templatetags/question_list_tags.py index 6238bce..72f888b 100644 --- a/forum/templatetags/question_list_tags.py +++ b/forum/templatetags/question_list_tags.py @@ -2,16 +2,29 @@ from django import template from django.utils.translation import ugettext as _ from django.utils.safestring import mark_safe from forum.models import Tag, MarkedTag +from forum.templatetags import argument_parser register = template.Library() -@register.inclusion_tag('question_list/item.html') -def question_list_item(question): - return {'question': question} +class QuestionItemNode(template.Node): + template = template.loader.get_template('question_list/item.html') -@register.inclusion_tag('question_list/item_extended.html') -def question_list_item_extended(question): - return {'question': question} + def __init__(self, question, options): + self.question = template.Variable(question) + self.options = options + + def render(self, context): + return self.template.render(template.Context({ + 'question': self.question.resolve(context), + 'favorite_count': self.options.get('favorite_count', 'no') == 'yes', + 'signature_type': self.options.get('signature_type', 'lite'), + })) + +@register.tag +def question_list_item(parser, token): + tokens = token.split_contents()[1:] + return QuestionItemNode(tokens[0], argument_parser(tokens[1:])) + @register.inclusion_tag('question_list/sort_tabs.html') def question_sort_tabs(sort_context): diff --git a/forum/templatetags/user_tags.py b/forum/templatetags/user_tags.py index 59e86d0..c880c23 100644 --- a/forum/templatetags/user_tags.py +++ b/forum/templatetags/user_tags.py @@ -2,23 +2,24 @@ from django import template register = template.Library() +class UserSignatureNode(template.Node): + template = template.loader.get_template('users/signature.html') -@register.inclusion_tag('users/info_small_lite.html') -def user_signature_small_lite(user): - return { - 'name': user.username, - 'url': user.get_absolute_url(), - 'reputation': user.reputation, - } + def __init__(self, user, format): + self.user = template.Variable(user) + self.format = template.Variable(format) -@register.inclusion_tag('users/info_small_full.html') -def user_signature_small_full(user): - return { - 'name': user.username, - 'url': user.get_absolute_url(), - 'reputation': user.reputation, - 'bronze': user.bronze, - 'silver': user.silver, - 'gold': user.gold - } - pass \ No newline at end of file + def render(self, context): + return self.template.render(template.Context({ + 'user': self.user.resolve(context), + 'format': self.format.resolve(context) + })) + +@register.tag +def user_signature(parser, token): + try: + tag_name, user, format = token.split_contents() + except ValueError: + raise template.TemplateSyntaxError, "%r tag requires exactly two arguments" % token.contents.split()[0] + + return UserSignatureNode(user, format) diff --git a/forum/views/users.py b/forum/views/users.py index 162ba2d..e3dcc08 100644 --- a/forum/views/users.py +++ b/forum/views/users.py @@ -1,5 +1,6 @@ from django.contrib.auth.decorators import login_required from forum.models import User +from django.db.models import Q, Count from django.core.paginator import Paginator, EmptyPage, InvalidPage from django.template.defaultfilters import slugify from django.contrib.contenttypes.models import ContentType @@ -146,80 +147,18 @@ def edit_user(request, id): def user_stats(request, user_id, user_view): user = get_object_or_404(User, id=user_id) - questions = Question.objects.filter(deleted=False, author=user).order_by('-added_at') - - answered_questions = Question.objects.filter(deleted=False, answers__author=user).distinct() - - """answered_questions = Question.objects.extra( - select={ - 'vote_up_count' : 'answer.vote_up_count', - 'vote_down_count' : 'answer.vote_down_count', - 'answer_id' : 'answer.id', - 'accepted' : 'answer.accepted', - 'vote_count' : 'answer.score', - 'comment_count' : 'answer.comment_count' - }, - tables=['question', 'answer'], - where=['NOT answer.deleted AND NOT question.deleted AND answer.author_id=%s AND answer.question_id=question.id'], - params=[user_id], - order_by=['-vote_count', '-answer_id'], - select_params=[user_id] - ).distinct().values('comment_count', - 'id', - 'answer_id', - 'title', - 'author_id', - 'accepted', - 'vote_count', - 'answer_count', - 'vote_up_count', - 'vote_down_count')[:100]""" + questions = user.questions.filter(deleted=False).order_by('-added_at') + answers = user.answers.filter(deleted=False).order_by('-added_at') up_votes = user.get_up_vote_count() down_votes = user.get_down_vote_count() votes_today = user.get_vote_count_today() votes_total = int(settings.MAX_VOTES_PER_DAY) - #question_id_set = set(map(lambda v: v['id'], list(questions))) \ - # | set(map(lambda v: v['id'], list(answered_questions))) + user_tags = Tag.objects.filter(Q(questions__author=user) | Q(questions__answers__author=user)) \ + .annotate(user_tag_usage_count=Count('name')).order_by('-user_tag_usage_count') - user_tags = Tag.objects.filter(questions__author=user) - try: - from django.db.models import Count - awards = Award.objects.extra( - select={'id': 'badge.id', - 'name':'badge.name', - 'description': 'badge.description', - 'type': 'badge.type'}, - tables=['award', 'badge'], - order_by=['-awarded_at'], - where=['user_id=%s AND badge_id=badge.id'], - params=[user.id] - ).values('id', 'name', 'description', 'type') - total_awards = awards.count() - awards = awards.annotate(count = Count('badge__id')) - user_tags = user_tags.annotate(user_tag_usage_count=Count('name')) - - except ImportError: - awards = Award.objects.extra( - select={'id': 'badge.id', - 'count': 'count(badge_id)', - 'name':'badge.name', - 'description': 'badge.description', - 'type': 'badge.type'}, - tables=['award', 'badge'], - order_by=['-awarded_at'], - where=['user_id=%s AND badge_id=badge.id'], - params=[user.id] - ).values('id', 'count', 'name', 'description', 'type') - total_awards = awards.count() - awards.query.group_by = ['badge_id'] - - user_tags = user_tags.extra( - select={'user_tag_usage_count': 'COUNT(1)',}, - order_by=['-user_tag_usage_count'], - ) - user_tags.query.group_by = ['name'] + awards = Badge.objects.filter(award_badge__user=user).annotate(count=Count('name')).order_by('-count') if request.user.is_superuser: moderate_user_form = ModerateUserForm(instance=user) @@ -233,7 +172,7 @@ def user_stats(request, user_id, user_view): "page_title" : user_view.page_title, "view_user" : user, "questions" : questions, - "answered_questions" : answered_questions, + "answers" : answers, "up_votes" : up_votes, "down_votes" : down_votes, "total_votes": up_votes + down_votes, @@ -241,7 +180,7 @@ def user_stats(request, user_id, user_view): "votes_total_per_day": votes_total, "user_tags" : user_tags[:50], "awards": awards, - "total_awards" : total_awards, + "total_awards" : awards.count(), }, context_instance=RequestContext(request)) def user_recent(request, user_id, user_view): @@ -507,7 +446,7 @@ def user_responses(request, user_id, user_view): def __init__(self, type, title, question_id, answer_id, time, username, user_id, content): self.type = type self.title = title - self.titlelink = reverse('question', args=[question_id]) + u'%s#%s' % (slugify(title), answer_id) + self.titlelink = reverse('question', kwargs={'id': question_id, 'slug': slugify(title)}) +u'#%s' % answer_id self.time = time self.userlink = reverse('users') + u'%s/%s/' % (user_id, username) self.username = username