From d56d3f8c8ca7d178d0861668a7258b64e30642db Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sat, 12 Mar 2016 00:18:49 +0100 Subject: [PATCH] Revert "Default theme: Move elements into Twig blocks" This reverts commit a3fa373119c12cae834bcfab758a11b036234c76. At first glance this adds flexibility, but at the moment it is impossible with Twig to ensure the existance of a block. As a result, custom themes may break the plugin. A custom theme should overwrite a plugin's template explicitly. --- themes/default/index.twig | 90 ++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 53 deletions(-) diff --git a/themes/default/index.twig b/themes/default/index.twig index 1b9f2ce..37f8f16 100644 --- a/themes/default/index.twig +++ b/themes/default/index.twig @@ -1,67 +1,51 @@ - + - {% block documentHeader %} - {% block title %}{% if meta.title %}{{ meta.title }} | {% endif %}{{ site_title }}{% endblock %} - {% if meta.description %} - - {% endif %}{% if meta.robots %} - - {% endif %} - {% endblock %} + {% if meta.title %}{{ meta.title }} | {% endif %}{{ site_title }} + {% if meta.description %} + + {% endif %}{% if meta.robots %} + + {% endif %} - {% block stylesheets %} - - - {% endblock %} + + - {% block javascript %} - - {% endblock %} + - {% block pageHeader %} - - {% endblock %} + - {% block pageContent %} -
-
- {% block content content %} -
-
- {% endblock %} +
+
+ {{ content }} +
+
- {% block pageFooter %} - - {% endblock %} +