diff --git a/templates/expobase.html b/templates/expobase.html index 1e9c7da69..cbefeb89f 100644 --- a/templates/expobase.html +++ b/templates/expobase.html @@ -9,10 +9,10 @@ {% block extrahead %}{% endblock %} +{% block toolbar %} +{% if troggle %}{% include 'troggletoolbar.html' %}{% endif %} +{% endblock %} -{% if troggle %} -{% include 'troggletoolbar.html' %} -{% endif %} {% block body %}{% endblock %} diff --git a/templates/expopage.html b/templates/expopage.html index e1d5ad12a..2816b8ef7 100644 --- a/templates/expopage.html +++ b/templates/expopage.html @@ -2,22 +2,11 @@ {% extends "expobase.html" %} {% block title %}{{ title }}{% endblock %} {% block bodyattrs %}{% if homepage %} id="homepage"{% endif %}{% endblock %} - -{% block body %} {% if troggle %} - + {% endif %} +{% block body %} + {{ body|safe }} {% if homepage %}