diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-01-04 16:54:18 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-01-04 16:54:18 -0300 |
| commit | 4ad37cc4f13474791ff51aa59953f544cc7f9da8 (patch) | |
| tree | bcaaf660f032ca87b526d10008d648b50ec7867d | |
| parent | 754f6a5be6e4a19da5ef29f5ab0a4dfd5171ef56 (diff) | |
| download | askbot-4ad37cc4f13474791ff51aa59953f544cc7f9da8.tar.gz askbot-4ad37cc4f13474791ff51aa59953f544cc7f9da8.tar.bz2 askbot-4ad37cc4f13474791ff51aa59953f544cc7f9da8.zip | |
moved custom header from live settings to the same place in the templates as custom_header.html import
| -rw-r--r-- | askbot/skins/default/templates/base.html | 5 | ||||
| -rw-r--r-- | askbot/skins/default/templates/widgets/header.html | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html index 1102007b..8287f5ba 100644 --- a/askbot/skins/default/templates/base.html +++ b/askbot/skins/default/templates/base.html @@ -17,6 +17,11 @@ <body class="{% block body_class %}{% endblock %}{% if user_messages %} user-messages{% endif %}{% if page_class %} {{page_class}}{% endif %}{% if request.user.is_anonymous() %} anon{% endif %} lang-{{settings.LANGUAGE_CODE}}"> {% include "widgets/system_messages.html" %} {% include "custom_header.html" ignore missing %} + {% if settings.CUSTOM_HEADER|trim != '' %} + <div id="custom-header"> + {{settings.CUSTOM_HEADER}} + </div> + {% endif %} {% include "widgets/header.html" %} {# Logo, user tool navigation and meta navitation #} {% include "widgets/secondary_header.html" %} {# Scope selector, search input and ask button #} <div class="content-wrapper"> diff --git a/askbot/skins/default/templates/widgets/header.html b/askbot/skins/default/templates/widgets/header.html index d4e7d66a..52e528bc 100644 --- a/askbot/skins/default/templates/widgets/header.html +++ b/askbot/skins/default/templates/widgets/header.html @@ -7,7 +7,6 @@ <div class="content-wrapper"> <div id="userToolsNav"> {% include "widgets/user_navigation.html" %} - {{settings.CUSTOM_HEADER}} </div> {% if settings.SHOW_LOGO %} {% include "widgets/logo.html" %} |