From 4ad37cc4f13474791ff51aa59953f544cc7f9da8 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 4 Jan 2012 16:54:18 -0300 Subject: moved custom header from live settings to the same place in the templates as custom_header.html import --- askbot/skins/default/templates/base.html | 5 +++++ askbot/skins/default/templates/widgets/header.html | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) 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 @@ {% include "widgets/system_messages.html" %} {% include "custom_header.html" ignore missing %} + {% if settings.CUSTOM_HEADER|trim != '' %} +

+ {{settings.CUSTOM_HEADER}} +

+ {% endif %} {% include "widgets/header.html" %} {# Logo, user tool navigation and meta navitation #} {% include "widgets/secondary_header.html" %} {# Scope selector, search input and ask button #}

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 @@

{% include "widgets/user_navigation.html" %} - {{settings.CUSTOM_HEADER}}

{% if settings.SHOW_LOGO %} {% include "widgets/logo.html" %} -- cgit v1.2.3-1-g7c22