diff --git a/lacre_basic/templates/modular/2col.html.twig b/lacre_basic/templates/modular/2col.html.twig index cda7d92..b059717 100644 --- a/lacre_basic/templates/modular/2col.html.twig +++ b/lacre_basic/templates/modular/2col.html.twig @@ -3,13 +3,7 @@ {% block content %} -{% if page.header.wider_column == 'left' %} - {% set colsize = ['six', 'five'] %} -{% elseif page.header.wider_column == 'right' %} - {% set colsize = ['five', 'six'] %} -{% else %} - {% set colsize = ['six', 'six'] %} -{% endif %} +{% set colsize = [page.header.leftcol, page.header.rightcol] %}
@@ -20,6 +14,8 @@ {% endfor %}
+ {% include 'modular/ribbon.html.twig' %} + {% endblock %} diff --git a/lacre_basic/templates/modular/ribbon.html.twig b/lacre_basic/templates/modular/ribbon.html.twig index a74d5f7..b0def09 100644 --- a/lacre_basic/templates/modular/ribbon.html.twig +++ b/lacre_basic/templates/modular/ribbon.html.twig @@ -1,13 +1,4 @@ -{% block content %} - -{% if page.header.section_id %} -
-{% else %} -
-{% endif %} -
- {{ page.content|raw }} {% if page.header.ribbon == "left" %} {% elseif page.header.ribbon == "right" %} @@ -16,5 +7,3 @@ {% endif %}
-
-{% endblock %}