add an ability to attach extra classes to post controls - helps to reduce redundant...

[osqa.git] / forum / templatetags / node_tags.py

diff --git a/forum/templatetags/node_tags.py b/forum/templatetags/node_tags.py
index 4eebaf7fadba8064ffde7a60d46faac4934f3cc7..aee496a8e4f2982f63c6d39679cdb36a542237e1 100644 (file)
--- a/forum/templatetags/node_tags.py
+++ b/forum/templatetags/node_tags.py
@@ -7,6 +7,7 @@ from django.utils.translation import ungettext, ugettext as _
 from django.utils.html import strip_tags\r
 from django.utils.encoding import smart_unicode\r
 from django.utils.safestring import mark_safe\r
+from django.conf import settings as django_settings\r
 from django.core.urlresolvers import reverse\r
 from django import template\r
 from forum.actions import *\r
@@ -76,12 +77,22 @@ def post_classes(post):
 \r
     return " ".join(classes)\r
 \r
-def post_control(text, url, command=False, withprompt=False, confirm=False, title="", copy=False):\r
+def post_control(text, url, command=False, withprompt=False, confirm=False, title="", copy=False, extra_classes=[]):\r
     classes = (command and "ajax-command" or " ") + (withprompt and " withprompt" or " ") + (confirm and " confirm" or " ") + \\r
         (copy and " copy" or " ")\r
+\r
+    for extra_class in extra_classes:\r
+        classes += " %s" % extra_class\r
+\r
     return {'text': text, 'url': url, 'classes': classes, 'title': title}\r
 \r
-@register.inclusion_tag('node/post_controls.html')\r
+\r
+moderation_enabled = False\r
+for m in django_settings.MODULE_LIST:\r
+    if m.__name__.endswith('moderation'):\r
+        moderation_enabled = True\r
+\r
+@register.inclusion_tag('node/post_controls.html' if not moderation_enabled else "modules/moderation/node/post_controls.html")\r
 def post_controls(post, user):\r
     controls = []\r
     menu = []\r
@@ -122,8 +133,16 @@ def post_controls(post, user):
             if user.can_view_offensive_flags(post):\r
                 label =  "%s (%d)" % (label, post.flag_count)\r
 \r
-            controls.append(post_control(label, reverse('flag_post', kwargs={'id': post.id}),\r
-                    command=True, withprompt=True, title=_("report as offensive (i.e containing spam, advertising, malicious text, etc.)")))\r
+\r
+            report_control = post_control(label, reverse('flag_post', kwargs={'id': post.id}),\r
+                    command=True, withprompt=True,\r
+                    title=_("report as offensive (i.e containing spam, advertising, malicious text, etc.)"))\r
+\r
+            # Depending on the setting choose where to attach the control\r
+            if settings.REPORT_OFFENSIVE_CONTROL_POSITION.value == "more":\r
+                menu.append(report_control)\r
+            else:\r
+                controls.append(report_control)\r
 \r
         if user.can_delete_post(post):\r
             if post.nis.deleted:\r
@@ -175,7 +194,8 @@ def post_controls(post, user):
 \r
 @register.inclusion_tag('node/comments.html')\r
 def comments(post, user):\r
-    all_comments = post.comments.filter_state(deleted=False).order_by('added_at')\r
+    all_comments = post.comments.filter_state(deleted=False)\\r
+                                .order_by('-added_at' if settings.SHOW_LATEST_COMMENTS_FIRST else 'added_at')\r
 \r
     if len(all_comments) <= 5:\r
         top_scorers = all_comments\r
@@ -214,6 +234,7 @@ def comments(post, user):
         })\r
         canned_comments.append(t.render(c))\r
 \r
+    total = len(all_comments)\r
     return {\r
         'comments': comments,\r
         'canned_comments': canned_comments,\r
@@ -223,7 +244,9 @@ def comments(post, user):
         'min_length': settings.FORM_MIN_COMMENT_BODY,\r
         'show_gravatar': settings.FORM_GRAVATAR_IN_COMMENTS,\r
         'showing': showing,\r
-        'total': len(all_comments),\r
+        'total': total,\r
+        'more_comments_count' : int(total - showing),\r
+        'show_latest_comments_first' : settings.SHOW_LATEST_COMMENTS_FIRST,\r
         'user': user,\r
     }\r
 \r