X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/1a949f7c97dc2f34c135f5cdf088df2927d3d652..f32577466e18584c0adb9e9845a0f50faa5db777:/forum/views/meta.py diff --git a/forum/views/meta.py b/forum/views/meta.py index 9172087..97c852f 100644 --- a/forum/views/meta.py +++ b/forum/views/meta.py @@ -1,107 +1,94 @@ +from itertools import groupby from django.shortcuts import render_to_response, get_object_or_404 from django.core.urlresolvers import reverse -from django.template import RequestContext +from django.template import RequestContext, loader from django.http import HttpResponseRedirect, HttpResponse -from django.conf import settings +from forum import settings from forum.forms import FeedbackForm from django.core.urlresolvers import reverse -from django.core.mail import mail_admins from django.utils.translation import ugettext as _ +from django.db.models import Count from forum.utils.forms import get_next_url -from forum.models import Badge, Award -from forum.badges import ALL_BADGES -from markdown2 import Markdown +from forum.models import Badge, Award, User +from forum.badges.base import BadgesMeta from forum import settings +from forum.utils.mail import send_email +import re def favicon(request): return HttpResponseRedirect(str(settings.APP_FAVICON)) -def about(request): - markdowner = Markdown(html4tags=True) - text = markdowner.convert(settings.ABOUT_PAGE_TEXT.value) - return render_to_response('about.html', {'text': text }, context_instance=RequestContext(request)) +def static(request, title, content): + return render_to_response('static.html', {'content' : content, 'title': title}, context_instance=RequestContext(request)) + +def markdown_help(request): + # md = markdown.Markdown([SettingsExtension({})]) + # text = md.convert(settings.FAQ_PAGE_TEXT.value) + + return render_to_response('markdown_help.html', context_instance=RequestContext(request)) -def faq(request): - data = { - 'gravatar_faq_url': reverse('faq') + '#gravatar', - #'send_email_key_url': reverse('send_email_key'), - 'ask_question_url': reverse('ask'), - } - return render_to_response('faq.html', data, context_instance=RequestContext(request)) + +def opensearch(request): + return render_to_response('opensearch.html', {'settings' : settings}, context_instance=RequestContext(request)) + def feedback(request): - data = {} - form = None if request.method == "POST": form = FeedbackForm(request.POST) if form.is_valid(): + context = {'user': request.user} + if not request.user.is_authenticated: - data['email'] = form.cleaned_data.get('email',None) - data['message'] = form.cleaned_data['message'] - data['name'] = form.cleaned_data.get('name',None) - message = render_to_response('feedback_email.txt',data,context_instance=RequestContext(request)) - mail_admins(_('Q&A forum feedback'), message) + context['email'] = form.cleaned_data.get('email',None) + context['message'] = form.cleaned_data['message'] + context['name'] = form.cleaned_data.get('name',None) + context['ip'] = request.META['REMOTE_ADDR'] + + recipients = [(adm.username, adm.email) for adm in User.objects.filter(is_superuser=True)] + + send_email(settings.EMAIL_SUBJECT_PREFIX + _("Feedback message from %(site_name)s") % {'site_name': settings.APP_SHORT_NAME}, + recipients, "notifications/feedback.html", context) + msg = _('Thanks for the feedback!') request.user.message_set.create(message=msg) return HttpResponseRedirect(get_next_url(request)) else: form = FeedbackForm(initial={'next':get_next_url(request)}) - data['form'] = form - return render_to_response('feedback.html', data, context_instance=RequestContext(request)) + return render_to_response('feedback.html', {'form': form}, context_instance=RequestContext(request)) feedback.CANCEL_MESSAGE=_('We look forward to hearing your feedback! Please, give it next time :)') def privacy(request): return render_to_response('privacy.html', context_instance=RequestContext(request)) -def logout(request):#refactor/change behavior? -#currently you click logout and you get -#to this view which actually asks you again - do you really want to log out? -#I guess rationale was to tell the user that s/he may be still logged in -#through their external login sytem and we'd want to remind them about it -#however it might be a little annoying -#why not just show a message: you are logged out of osqa, but -#if you really want to log out -> go to your openid provider +def logout(request): return render_to_response('logout.html', { 'next' : get_next_url(request), }, context_instance=RequestContext(request)) -def badges(request):#user status/reputation system - badges = Badge.objects.all().order_by('name') - - badges_dict = dict([(badge.badge, badge.description) for badge in ALL_BADGES]) - - for badge in badges: - if badge.description != badges_dict.get(badge.slug, badge.description): - badge.description = badges_dict[badge.slug] - badge.save() +def badges(request): + badges = [b.ondb for b in sorted(BadgesMeta.by_id.values(), lambda b1, b2: cmp(b1.name, b2.name))] - my_badges = [] if request.user.is_authenticated(): - my_badges = Award.objects.filter(user=request.user).values('badge_id') - #my_badges.query.group_by = ['badge_id'] + my_badges = Award.objects.filter(user=request.user).values('badge_id').distinct() + else: + my_badges = [] return render_to_response('badges.html', { 'badges' : badges, 'mybadges' : my_badges, - 'feedback_faq_url' : reverse('feedback'), }, context_instance=RequestContext(request)) -def badge(request, id): - badge = get_object_or_404(Badge, id=id) - awards = Award.objects.extra( - select={'id': 'auth_user.id', - 'name': 'auth_user.username', - 'rep':'forum_user.reputation', - 'gold': 'forum_user.gold', - 'silver': 'forum_user.silver', - 'bronze': 'forum_user.bronze'}, - tables=['award', 'auth_user', 'forum_user'], - where=['badge_id=%s AND user_id=auth_user.id AND forum_user.user_ptr_id = auth_user.id'], - params=[id] - ).distinct('id') +def badge(request, id, slug): + badge = Badge.objects.get(id=id) + awards = list(Award.objects.filter(badge=badge).order_by('user', 'awarded_at')) + award_count = len(awards) + + awards = sorted([dict(count=len(list(g)), user=k) for k, g in groupby(awards, lambda a: a.user)], + lambda c1, c2: c2['count'] - c1['count']) return render_to_response('badge.html', { + 'award_count': award_count, 'awards' : awards, 'badge' : badge, }, context_instance=RequestContext(request))