X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/410bfa05ee36ed1d99356c443a5f3f6aa3ee9578..671e6b60e7e199dcb32f33b9534c3f6e695ee986:/forum/views/meta.py

diff --git a/forum/views/meta.py b/forum/views/meta.py
index 03ffc6d..fc050c2 100644
--- a/forum/views/meta.py
+++ b/forum/views/meta.py
@@ -1,8 +1,9 @@
+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.utils.translation import ugettext as _
@@ -12,20 +13,17 @@ from forum.models import Badge, Award, User
 from forum.badges.base import BadgesMeta
 from forum import settings
 from forum.utils.mail import send_email
-from forum.settings.settingsmarkdown import SettingsExtension, markdown
 import re
 
 def favicon(request):
     return HttpResponseRedirect(str(settings.APP_FAVICON))
 
-def about(request):
-    return render_to_response('about.html', {'text': settings.ABOUT_PAGE_TEXT.value }, context_instance=RequestContext(request))
-
-def faq(request):
-    md = markdown.Markdown([SettingsExtension({})])
-    text = md.convert(settings.FAQ_PAGE_TEXT.value)
+def static(request, title, content):
+    return render_to_response('static.html', {'content' : content, 'title': title}, context_instance=RequestContext(request))
 
-    return render_to_response('faq.html', {'text' : text}, context_instance=RequestContext(request))
+def opensearch(request):   
+    return render_to_response('opensearch.html', {'settings' : settings}, context_instance=RequestContext(request))
+    
 
 def feedback(request):
     if request.method == "POST":
@@ -37,6 +35,7 @@ def feedback(request):
                 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)]
 
@@ -71,14 +70,18 @@ def badges(request):
     return render_to_response('badges.html', {
         'badges' : badges,
         'mybadges' : my_badges,
-        'feedback_faq_url' : reverse('feedback'),
     }, context_instance=RequestContext(request))
 
 def badge(request, id, slug):
     badge = Badge.objects.get(id=id)
-    awards = Award.objects.filter(badge=badge).annotate(count=Count('user')).distinct('user').order_by('-count')
+    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))