From 4d1bb62eadf82829aad37825d6ef9653d99837b7 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev 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 %}
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 @@ } })(); + {% if thread.closed %} +
+ {# ==== START: question/closed_question_info.html ==== #} + {% include "question/closed_question_info.html" %} + {# ==== END: question/closed_question_info.html ==== #} + {% endif %} {% include "question/question_comments.html" %} 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 @@ {{ question.get_question_title()|escape }}

-

{% trans %}This question has been closed by - {{closed_by_username|escape}} +

{% trans username = closed_by_username|escape %}This question has been closed by + {{username}} {% endtrans %}

-- cgit v1.2.3-1-g7c22 From 16a80edf18fcd95dfd3d5611be38412718b2d921 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Sun, 15 Jul 2012 15:51:43 -0400 Subject: fixed the broken "follow user" function --- askbot/skins/default/templates/macros.html | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/askbot/skins/default/templates/macros.html b/askbot/skins/default/templates/macros.html index 3e463c1c..261c860f 100644 --- a/askbot/skins/default/templates/macros.html +++ b/askbot/skins/default/templates/macros.html @@ -6,23 +6,6 @@ >{% if icon == False %}{% if site_label %}{{ site_label }}{% else %}{{ site }}{% endif %}{% endif %} {%- endmacro -%} -{%- macro follow_toggle(follow, name, alias, id) -%} - {# follow - boolean; name - object type name; alias - e.g. users name; id - object id #} -

- {% if follow %} - - {% else %} -
-
{% trans %}unfollow {{alias}}{% endtrans %}
-
{% trans %}following {{alias}}{% endtrans %}
-
- {% endif %} -
-{%- endmacro -%} - {%- macro inbox_post_snippet(response, inbox_section) -%}
@@ -530,8 +513,8 @@ answer {% if answer.accepted() %}accepted-answer{% endif %} {% if answer.author_ {%- macro follow_toggle(follow, name, alias, id) -%} {# follow - boolean; name - object type name; alias - e.g. users name; id - object id #}