From a707ee16bde652462d8ed43e6ad10851e24cdfa6 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Thu, 27 Oct 2011 16:54:31 -0300
Subject: added title "Comments" to the post_comment_widget macro

---
 askbot/skins/default/templates/macros.html         |  3 ++
 .../default/templates/question/answer_card.html    | 32 ++++++++--------------
 .../default/templates/question/question_card.html  |  2 --
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/askbot/skins/default/templates/macros.html b/askbot/skins/default/templates/macros.html
index 23111514..e9181ed7 100644
--- a/askbot/skins/default/templates/macros.html
+++ b/askbot/skins/default/templates/macros.html
@@ -326,6 +326,9 @@ for the purposes of the AJAX comment editor #}
     )
 -%}
     {% spaceless %}
+    {% if post.comment_count > 0 %}
+        <h2 id="comment-title">Comments</h2>
+    {% endif %}
     {% set widget_id = 'comments-for-' + post.post_type + '-' + post.id|string %}
     <div class="comments" id="{{widget_id}}">
         <div class="content">
diff --git a/askbot/skins/default/templates/question/answer_card.html b/askbot/skins/default/templates/question/answer_card.html
index 9b759a20..cbfb0a3e 100644
--- a/askbot/skins/default/templates/question/answer_card.html
+++ b/askbot/skins/default/templates/question/answer_card.html
@@ -3,30 +3,20 @@
     id="answer-container-{{ answer.id }}"
     class="{{ macros.answer_classes(answer, question) }}">
     <div class="answer-table">
-        <div>
-            <div>
-                <div class="vote-buttons">
-                    {% include "question/answer_vote_buttons.html" %}
+        <div class="vote-buttons">
+            {% include "question/answer_vote_buttons.html" %}
+        </div>
+        <div class="item-right">
+            <div class="answer-body">
+                <div class="post-update-info-container">
+                    {% include "question/answer_author_info.html" %}
                 </div>
+                {{ answer.html }}
             </div>
-            <div>
-                <div class="item-right">
-                    <div class="answer-body">
-                        <div class="post-update-info-container">
-                            {% include "question/answer_author_info.html" %}
-                        </div>
-                        {{ answer.html }}
-                    </div>
-                    
-                    <div class="answer-controls post-controls">
-                        
-                        {% include "question/answer_controls.html" %} 
-                    </div>
-                    <!-- Needs a validation if comments exists -->
-                    <h1 id="comment-title">Comments</h1>
-                    {% include "question/answer_comments.html" %}
-                </div>
+            <div class="answer-controls post-controls">
+                {% include "question/answer_controls.html" %} 
             </div>
+            {% include "question/answer_comments.html" %}
         </div>
     </div>
 </div>
diff --git a/askbot/skins/default/templates/question/question_card.html b/askbot/skins/default/templates/question/question_card.html
index 215f6766..b1fa1743 100644
--- a/askbot/skins/default/templates/question/question_card.html
+++ b/askbot/skins/default/templates/question/question_card.html
@@ -16,8 +16,6 @@
         <div id="question-controls" class="post-controls">
             {% include "question/question_controls.html" %} 
         </div>
-        <!-- Needs a validation if comments exists -->
-        <h1 id="comment-title">Comments</h1>
         {% include "question/question_comments.html" %}
     </div>
 </div>
-- 
cgit v1.2.3-1-g7c22