From 4d1bb62eadf82829aad37825d6ef9653d99837b7 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sat, 14 Jul 2012 13:45:36 -0400
Subject: fixed display glitch in the closed question

---
 askbot/skins/default/templates/question/content.html       | 5 -----
 askbot/skins/default/templates/question/question_card.html | 6 ++++++
 askbot/skins/default/templates/reopen.html                 | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/askbot/skins/default/templates/question/content.html b/askbot/skins/default/templates/question/content.html
index 58b1bcca..906b1953 100644
--- a/askbot/skins/default/templates/question/content.html
+++ b/askbot/skins/default/templates/question/content.html
@@ -3,11 +3,6 @@
 {# ==== BEGIN: question/question_card.html ==== #}
 {% include "question/question_card.html" %}
 {# ==== END: question/question_card.html ==== #}
-{% if thread.closed %}
-    {# ==== START: question/closed_question_info.html ==== #}
-    {% include "question/closed_question_info.html" %}
-    {# ==== END: question/closed_question_info.html ==== #}
-{% endif %}
 
 {% if answers %}
     <div class="clean"></div>
diff --git a/askbot/skins/default/templates/question/question_card.html b/askbot/skins/default/templates/question/question_card.html
index dd52ea0f..c787bf34 100644
--- a/askbot/skins/default/templates/question/question_card.html
+++ b/askbot/skins/default/templates/question/question_card.html
@@ -25,6 +25,12 @@
                 }
             })();
         </script>
+        {% if thread.closed %}
+            <div class="clearfix"></div>
+            {# ==== START: question/closed_question_info.html ==== #}
+            {% include "question/closed_question_info.html" %}
+            {# ==== END: question/closed_question_info.html ==== #}
+        {% endif %}
         {% include "question/question_comments.html" %}
     </div>
 
diff --git a/askbot/skins/default/templates/reopen.html b/askbot/skins/default/templates/reopen.html
index 52d926ce..4ddd6f31 100644
--- a/askbot/skins/default/templates/reopen.html
+++ b/askbot/skins/default/templates/reopen.html
@@ -9,8 +9,8 @@
         <span class="big">{{ question.get_question_title()|escape }}</span>
     </a>
 </p>
-<p>{% trans %}This question has been closed by 
-    <a href="{{closed_by_profile_url}}">{{closed_by_username|escape}}</a>
+<p>{% trans username = closed_by_username|escape %}This question has been closed by 
+    <a href="{{closed_by_profile_url}}">{{username}}</a>
 {% endtrans %}
 </p>
 <p>
-- 
cgit v1.2.3-1-g7c22