diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-05-24 05:31:29 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-05-24 05:31:29 -0400 |
| commit | 98bfb63992324a717fa8ac550c6ff3ec1a7e3bc7 (patch) | |
| tree | 74b1f048e544b7924fbc083ab91875acab0aa448 /askbot/templates | |
| parent | a0ba548049366cc37ad91f2824b119a1f45591e5 (diff) | |
| download | askbot-98bfb63992324a717fa8ac550c6ff3ec1a7e3bc7.tar.gz askbot-98bfb63992324a717fa8ac550c6ff3ec1a7e3bc7.tar.bz2 askbot-98bfb63992324a717fa8ac550c6ff3ec1a7e3bc7.zip | |
added option to hide ad blocks from logged in users
Diffstat (limited to 'askbot/templates')
| -rw-r--r-- | askbot/templates/main_page/sidebar.html | 4 | ||||
| -rw-r--r-- | askbot/templates/question.html | 2 | ||||
| -rw-r--r-- | askbot/templates/question/content.html | 2 | ||||
| -rw-r--r-- | askbot/templates/question/sidebar.html | 4 | ||||
| -rw-r--r-- | askbot/templates/user_profile/user.html | 11 |
5 files changed, 11 insertions, 12 deletions
diff --git a/askbot/templates/main_page/sidebar.html b/askbot/templates/main_page/sidebar.html index 7acbe091..610d2b60 100644 --- a/askbot/templates/main_page/sidebar.html +++ b/askbot/templates/main_page/sidebar.html @@ -1,6 +1,6 @@ {% import "macros.html" as macros %} -{% if settings.SIDEBAR_MAIN_HEADER %} +{% if 'SIDEBAR_MAIN_HEADER'|show_block_to(request.user) %} <div class="box"> {{ settings.SIDEBAR_MAIN_HEADER }} </div> @@ -22,7 +22,7 @@ {% include "widgets/related_tags.html" %} {% endif %} -{% if settings.SIDEBARE_MAIN_FOOTER %} +{% if 'SIDEBAR_MAIN_FOOTER'|show_block_to(request.user) %} <div class="box"> {{ settings.SIDEBAR_MAIN_FOOTER }} </div> diff --git a/askbot/templates/question.html b/askbot/templates/question.html index 13593adc..ca2f4022 100644 --- a/askbot/templates/question.html +++ b/askbot/templates/question.html @@ -285,7 +285,7 @@ </script> {% endblock %} {% block content %} - {% if settings.QUESTION_PAGE_TOP_BANNER %} + {% if 'QUESTION_PAGE_TOP_BANNER'|show_block_to(request.user) %} <div class="banner">{{ settings.QUESTION_PAGE_TOP_BANNER|safe }}</div> {% endif %} {% if is_cacheable %} diff --git a/askbot/templates/question/content.html b/askbot/templates/question/content.html index 23286ce0..c8fef9a6 100644 --- a/askbot/templates/question/content.html +++ b/askbot/templates/question/content.html @@ -12,7 +12,7 @@ <div class="clean"></div> {% for answer in answers %} - {% if answers|length > 1 and loop.index == 2 %} + {% if loop.index == 2 and 'QUESTION_PAGE_ANSWER_BANNER'|show_block_to(request.user) %} <div class="banner">{{ settings.QUESTION_PAGE_ANSWER_BANNER|safe }}</div> {% endif %} {% include "question/answer_card.html" %} diff --git a/askbot/templates/question/sidebar.html b/askbot/templates/question/sidebar.html index c11a4336..523f01ff 100644 --- a/askbot/templates/question/sidebar.html +++ b/askbot/templates/question/sidebar.html @@ -1,5 +1,5 @@ {% import "macros.html" as macros %} -{% if settings.SIDEBAR_QUESTION_HEADER %} +{% if 'SIDEBAR_QUESTION_HEADER'|show_block_to(request.user) %} <div class="box"> {{ settings.SIDEBAR_QUESTION_HEADER }} </div> @@ -173,7 +173,7 @@ {#% endcache %#} {% endif %} -{% if settings.SIDEBAR_QUESTION_FOOTER %} +{% if 'SIDEBAR_QUESTION_FOOTER'|show_block_to(request.user) %} <div class="box"> {{ settings.SIDEBAR_QUESTION_FOOTER }} </div> diff --git a/askbot/templates/user_profile/user.html b/askbot/templates/user_profile/user.html index 3aee3cfa..c72dc857 100644 --- a/askbot/templates/user_profile/user.html +++ b/askbot/templates/user_profile/user.html @@ -36,11 +36,10 @@ {% endblock %} {% endblock %} {% block sidebar %} -<div class="box"> - {{ settings.SIDEBAR_PROFILE_HEADER }} -</div> -<div class="box"> - {{ settings.SIDEBAR_PROFILE_FOOTER }} -</div> + {% if 'SIDEBAR_PROFILE'|show_block_to(request.user) %} + <div class="box"> + {{ settings.SIDEBAR_PROFILE }} + </div> + {% endif %} {% endblock %} <!-- end of user.html --> |