return deleted gravatar tag + hw

apps/forum/templatetags/forum_extras.py

@@ -1,5 +1,11 @@
 # -*- coding: utf-8
 from datetime import datetime, timedelta
+import urllib
+try:
+    from hashlib import md5
+except ImportError:
+    import md5
+    md5 = md5.new
 
 from django import template
 from django.core.urlresolvers import reverse
@@ -16,6 +22,7 @@ from apps.forum.models import Forum, Topic, Post, Read, PrivateMessage, Report
 from apps.forum.unread import cache_unreads
 from apps.forum import settings as forum_settings
 
+
 register = template.Library()
 
 # TODO:
@@ -258,3 +265,17 @@ def pm_unreads(user):
 @register.simple_tag
 def new_reports():
     return Report.objects.filter(zapped=False).count()
+
+@register.simple_tag
+def gravatar(email):
+    if forum_settings.GRAVATAR_SUPPORT:
+        size = max(forum_settings.AVATAR_WIDTH, forum_settings.AVATAR_HEIGHT)
+        url = "http://www.gravatar.com/avatar.php?"
+        url += urllib.urlencode({
+            'gravatar_id': md5(email.lower()).hexdigest(),
+            'size': size,
+            'default': forum_settings.GRAVATAR_DEFAULT,
+        })
+        return url
+    else:
+        return ''

apps/forum/views.py

@@ -249,6 +249,8 @@ def show_topic(request, topic_id, full=True):
         subscribed = True
     else:
         subscribed = False
+
+    highlight_word = request.GET.get('hw', '')
     if full:
         return {'categories': Category.objects.all(),
                 'topic': topic,
@@ -257,6 +259,7 @@ def show_topic(request, topic_id, full=True):
                 'moderator': moderator,
                 'subscribed': subscribed,
                 'paged_qs': posts,
+                'highlight_word': highlight_word,
                 }
     else:
         pages, paginator, paged_list_name = paginate(posts, request, forum_settings.TOPIC_PAGE_SIZE)