From: jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Mon, 24 Oct 2011 22:14:16 +0000 (+0000)
Subject: adding a setting that allows the users to choose the comments order
X-Git-Tag: live~123
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/158a305095187b1b1c9cee417b94d15f515e5ebe

adding a setting that allows the users to choose the comments order

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1194 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/settings/view.py b/forum/settings/view.py
index 9b7cf4e..b87c33c 100644
--- a/forum/settings/view.py
+++ b/forum/settings/view.py
@@ -9,6 +9,12 @@ label = _("Embed YouTube Videos"),
 help_text = _("If you check this YouTube videos will be embedded"),
 required=False))
 
+SHOW_LATEST_COMMENTS_FIRST = Setting('SHOW_LATEST_COMMENTS_FIRST', False, VIEW_SET, dict(
+label = _("Show latest comments first"),
+help_text = _("Choose this if you want the latest comments to appear first."),
+required=False))
+
+
 SUMMARY_LENGTH = Setting('SUMMARY_LENGTH', 300, VIEW_SET, dict(
 label = _("Summary Length"),
 help_text = _("The number of characters that are going to be displayed in order to get the content summary.")))
diff --git a/forum/skins/default/templates/node/comment_skeleton.html b/forum/skins/default/templates/node/comment_skeleton.html
new file mode 100644
index 0000000..c9f95e1
--- /dev/null
+++ b/forum/skins/default/templates/node/comment_skeleton.html
@@ -0,0 +1,60 @@
+{% load extra_tags %}
+{% load i18n %}
+
+<div class="clear"></div>
+<div id="comment-{{ post.id }}-form-container" class="comment-form-container">
+    {% if can_comment %}
+    <form id="comment-{{ post.id }}-form" method="post" action="{% url comment id=post.id %}" accept-charset="utf-8">
+        {% csrf_token %}
+        <div class="comment-form-widgets-container">
+            <textarea name="comment" class="commentBox" id="comment"></textarea>
+            <div class="comment-form-buttons">
+                <span id="comment-{{ post.id }}-chars-left" class="comment-chars-left">
+                    <span class="comments-char-left-count">{{ min_length }}|{{ max_length }}</span>
+                    <span class="comments-chars-togo-msg">{% trans "characters needed" %}</span>
+                    <span class="comments-chars-left-msg">{% trans "characters left" %}</span>
+                </span>
+                <input type="submit" class="comment-submit" value="{% trans " comment" %}" />
+                <input type="submit" class="comment-cancel" value="{% trans " cancel" %}" />
+            </div>
+            <div class="clear"></div>
+            {% if user.can_use_canned_comments %}
+            <div class="canned_comment">
+                <span id="post-{{ post.id }}-menu" class="context-menu">
+                    <span id="post-{{ post.id }}-menu-trigger" class="action-link context-menu-trigger">{% trans "Use canned comment" %}</span>
+                    <ul id="post-{{ post.id }}-menu-dropdown" class="context-menu-dropdown" style="width: 275px;">
+                        {% for canned_comment in canned_comments %}
+                        <li class="item">
+                            <a style="white-space: pre-wrap;" href="javascript:void(0);" onclick="canned_comment({{ post.id }}, jQuery(this).text())">{{ canned_comment }}</a>
+                        </li>
+                        {% endfor %}
+                    </ul>
+                </span>
+            </div>
+            {% endif %}
+        </div>
+        <script type="text/html" class="new-comment-skeleton" id="new-comment-skeleton-{{ post.id }}">
+            <div class="comment{% if not comment.top_scorer %} not_top_scorer{% endif %}" id="comment-%ID%">
+                <div id="post-%ID%-score" class="comment-score"></div>
+                <div class="comment-text">%COMMENT%</div>
+                <div class="comment-info" id="comment-%ID%-info">
+                    <a id="comment-%ID%-edit" href="%EDIT_URL%" title="{% trans "Edit comment" %}"
+                        class="comment-edit" rel="nofollow"> </a>
+                    <a id="comment-%ID%-delete" href="%DELETE_URL%" title="{% trans "Delete comment" %}"
+                        class="ajax-command comment-delete confirm" rel="nofollow"> </a>
+                    <a rel="nofollow" id="comment-%ID%-convert" style="display:none;" href="%CONVERT_URL%" title="{% trans "Convert comment to answer" %}"
+                        class="ajax-command comment-convert confirm" rel="nofollow"> </a>
+
+                    <span class="comment-age">({% trans "just now" %})</span>
+                    <a class="comment-user" href="%PROFILE_URL%">%USERNAME%</a>
+                    {% if user.is_authenticated %}
+                        {% if show_gravatar %}{% gravatar user 18 %}{% endif %}
+                    {% endif %}
+                </div>
+             </div>
+        </script>
+    </form>
+    {% endif %}
+</div>
+<div class="clear"></div>
+
diff --git a/forum/skins/default/templates/node/comments.html b/forum/skins/default/templates/node/comments.html
index 3457aab..b34b58d 100644
--- a/forum/skins/default/templates/node/comments.html
+++ b/forum/skins/default/templates/node/comments.html
@@ -1,62 +1,7 @@
 {% load extra_tags %}
 {% load i18n %}
 
-<div class="clear"></div>
-<div id="comment-{{ post.id }}-form-container" class="comment-form-container">
-    {% if can_comment %}
-    <form id="comment-{{ post.id }}-form" method="post" action="{% url comment id=post.id %}" accept-charset="utf-8">
-        {% csrf_token %}
-        <div class="comment-form-widgets-container">
-            <textarea name="comment" class="commentBox" id="comment"></textarea>
-            <div class="comment-form-buttons">
-                <span id="comment-{{ post.id }}-chars-left" class="comment-chars-left">
-                    <span class="comments-char-left-count">{{ min_length }}|{{ max_length }}</span>
-                    <span class="comments-chars-togo-msg">{% trans "characters needed" %}</span>
-                    <span class="comments-chars-left-msg">{% trans "characters left" %}</span>
-                </span>
-                <input type="submit" class="comment-submit" value="{% trans " comment" %}" />
-                <input type="submit" class="comment-cancel" value="{% trans " cancel" %}" />
-            </div>
-            <div class="clear"></div>
-            {% if user.can_use_canned_comments %}
-            <div class="canned_comment">
-                <span id="post-{{ post.id }}-menu" class="context-menu">
-                    <span id="post-{{ post.id }}-menu-trigger" class="action-link context-menu-trigger">{% trans "Use canned comment" %}</span>
-                    <ul id="post-{{ post.id }}-menu-dropdown" class="context-menu-dropdown" style="width: 275px;">
-                        {% for canned_comment in canned_comments %}
-                        <li class="item">
-                            <a style="white-space: pre-wrap;" href="javascript:void(0);" onclick="canned_comment({{ post.id }}, jQuery(this).text())">{{ canned_comment }}</a>
-                        </li>
-                        {% endfor %}
-                    </ul>
-                </span>
-            </div>
-            {% endif %}
-        </div>
-        <script type="text/html" class="new-comment-skeleton" id="new-comment-skeleton-{{ post.id }}">
-            <div class="comment{% if not comment.top_scorer %} not_top_scorer{% endif %}" id="comment-%ID%">
-                <div id="post-%ID%-score" class="comment-score"></div>
-                <div class="comment-text">%COMMENT%</div>
-                <div class="comment-info" id="comment-%ID%-info">
-                    <a id="comment-%ID%-edit" href="%EDIT_URL%" title="{% trans "Edit comment" %}"
-                        class="comment-edit" rel="nofollow"> </a>
-                    <a id="comment-%ID%-delete" href="%DELETE_URL%" title="{% trans "Delete comment" %}"
-                        class="ajax-command comment-delete confirm" rel="nofollow"> </a>
-                    <a rel="nofollow" id="comment-%ID%-convert" style="display:none;" href="%CONVERT_URL%" title="{% trans "Convert comment to answer" %}"
-                        class="ajax-command comment-convert confirm" rel="nofollow"> </a>
-
-                    <span class="comment-age">({% trans "just now" %})</span>
-                    <a class="comment-user" href="%PROFILE_URL%">%USERNAME%</a>
-                    {% if user.is_authenticated %}
-                        {% if show_gravatar %}{% gravatar user 18 %}{% endif %}
-                    {% endif %}
-                </div>
-             </div>
-        </script>
-    </form>
-    {% endif %}
-</div>
-<div class="clear"></div>
+{% if show_latest_comments_first %}{% include "node/comment_skeleton.html" %}{% endif %}
 
 <div class="comments-container" id="comments-container-{{ post.id }}">
     {% for comment in comments %}
@@ -104,3 +49,5 @@
         <a href="#" class="add-comment-link">{% trans "add new comment" %}</a>
     {% endif %}
 </div>
+
+{% if not show_latest_comments_first %}{% include "node/comment_skeleton.html" %}{% endif %}
diff --git a/forum/templatetags/node_tags.py b/forum/templatetags/node_tags.py
index 5cdd3b0..69260c4 100644
--- a/forum/templatetags/node_tags.py
+++ b/forum/templatetags/node_tags.py
@@ -182,7 +182,8 @@ def post_controls(post, user):
 
 @register.inclusion_tag('node/comments.html')
 def comments(post, user):
-    all_comments = post.comments.filter_state(deleted=False).order_by('-added_at')
+    all_comments = post.comments.filter_state(deleted=False)\
+                                .order_by('-added_at' if settings.SHOW_LATEST_COMMENTS_FIRST else 'added_at')
 
     if len(all_comments) <= 5:
         top_scorers = all_comments
@@ -233,6 +234,7 @@ def comments(post, user):
         'showing': showing,
         'total': total,
         'more_comments_count' : int(total - showing),
+        'show_latest_comments_first' : settings.SHOW_LATEST_COMMENTS_FIRST,
         'user': user,
     }