diff options
| author | NoahY <yuttadhammo@yahoo.com> | 2011-07-29 13:44:58 +0530 |
|---|---|---|
| committer | NoahY <yuttadhammo@yahoo.com> | 2011-07-29 13:44:58 +0530 |
| commit | dde31e560b8d999d8c8b2a628bbf2817b9fc6ee1 (patch) | |
| tree | 87d9d341a232e9d325ddcf7b5fd2df2bf88e81ce | |
| parent | e18374dbc6a1eda87b5ad76c4240031cdf0bc136 (diff) | |
| download | askbot-dde31e560b8d999d8c8b2a628bbf2817b9fc6ee1.tar.gz askbot-dde31e560b8d999d8c8b2a628bbf2817b9fc6ee1.tar.bz2 askbot-dde31e560b8d999d8c8b2a628bbf2817b9fc6ee1.zip | |
fixing up sidebar
| -rw-r--r-- | askbot/skins/default/templates/main_page/sidebar.html | 10 | ||||
| -rw-r--r-- | askbot/skins/default/templates/question.html | 4 | ||||
| -rw-r--r-- | askbot/skins/default/templates/user_profile/user.html | 7 |
3 files changed, 14 insertions, 7 deletions
diff --git a/askbot/skins/default/templates/main_page/sidebar.html b/askbot/skins/default/templates/main_page/sidebar.html index c755c3c8..7673ba0b 100644 --- a/askbot/skins/default/templates/main_page/sidebar.html +++ b/askbot/skins/default/templates/main_page/sidebar.html @@ -1,8 +1,8 @@ {% import "macros.html" as macros %} -{{ settings.SIDEBAR_HEADER }} +{{ settings.SIDEBAR_MAIN_HEADER }} -{% if contributors and settings.SIDEBAR_SHOW_AVATARS %} +{% if contributors and settings.SIDEBAR_MAIN_SHOW_AVATARS %} {% cache 600 "contributors" contributors search_tags scope sort query context.page context.page_size language_code %} <div id="contrib-users" class="boxC"> <h2>{% trans %}Contributors{% endtrans %}</h2> @@ -15,11 +15,11 @@ {% endcache %} {% endif %} -{% if request.user.is_authenticated() and settings.SIDEBAR_SHOW_TAG_SELECTOR %} +{% if request.user.is_authenticated() and settings.SIDEBAR_MAIN_SHOW_TAG_SELECTOR %} {% include "blocks/tag_selector.html" %} {% endif %} -{% if tags and settings.SIDEBAR_SHOW_TAGS %} +{% if tags and settings.SIDEBAR_MAIN_SHOW_TAGS %} {% cache 0 "tags" tags search_tags scope sort query context.page context.page_size language_code %} <div class="boxC"> <h2>{% trans %}Related tags{% endtrans %}</h2> @@ -47,4 +47,4 @@ {% endcache %} {% endif %} -{{ settings.SIDEBAR_FOOTER }} +{{ settings.SIDEBAR_MAIN_FOOTER }} diff --git a/askbot/skins/default/templates/question.html b/askbot/skins/default/templates/question.html index a5a04f09..fd82574f 100644 --- a/askbot/skins/default/templates/question.html +++ b/askbot/skins/default/templates/question.html @@ -404,8 +404,8 @@ {{ settings.SIDEBAR_QUESTION_HEADER }} +{% cache 0 "questions_tags" questions_tags question.id language_code %} {% if settings.SIDEBAR_QUESTION_SHOW_TAGS %} - {% cache 0 "questions_tags" questions_tags question.id language_code %} <div class="boxC"> <p> {% trans %}Question tags{% endtrans %}: @@ -425,7 +425,6 @@ {% endfor %} </ul> </div> - {% endcache %} {% endif %} {% if settings.SIDEBAR_QUESTION_SHOW_META %} @@ -441,6 +440,7 @@ </p> </div> {% endif %} +{% endcache %} {% if similar_questions.data and settings.SIDEBAR_QUESTION_SHOW_RELATED %} {% cache 1800 "related_questions" related_questions question.id language_code %} diff --git a/askbot/skins/default/templates/user_profile/user.html b/askbot/skins/default/templates/user_profile/user.html index cc1895fb..ad3d564b 100644 --- a/askbot/skins/default/templates/user_profile/user.html +++ b/askbot/skins/default/templates/user_profile/user.html @@ -32,4 +32,11 @@ {% block userjs %} {% endblock %} {% endblock %} +{% block sidebar %} + +{{ settings.SIDEBAR_PROFILE_HEADER }} + +{{ settings.SIDEBAR_PROFILE_FOOTER }} + +{% endblock %} <!-- end of user.html --> |