diff --git a/sapl/base/templatetags/common_tags.py b/sapl/base/templatetags/common_tags.py index 419899632..501b36acf 100644 --- a/sapl/base/templatetags/common_tags.py +++ b/sapl/base/templatetags/common_tags.py @@ -117,6 +117,14 @@ def str2intabs(value): except: return '' +@register.filter +def has_iframe(request): + iframe = request.session.get('iframe', False) + if not iframe and 'iframe' in request.GET: + request.session['iframe'] = True + return True + return iframe + @register.filter def url(value): diff --git a/sapl/templates/base.html b/sapl/templates/base.html index 647fcdc15..f9d961c0b 100644 --- a/sapl/templates/base.html +++ b/sapl/templates/base.html @@ -28,6 +28,7 @@
+ {% if not request|has_iframe %} {% block navigation %} {% endblock navigation %} + {% endif %} {# Header #} {% block main_header %} @@ -103,7 +105,6 @@ {# Main content #} {% block content_container %}
-
{# Feedback messages #} @@ -147,7 +148,7 @@ {% endblock content_container %} - + {% if not request|has_iframe %} {% block footer_container %}
@@ -204,6 +205,7 @@
{% endblock footer_container %} + {% endif %} {% block foot_js %}