From 2d632b335c4cb536518e35e602ccb3d290196bf4 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Mon, 7 Oct 2013 12:03:49 +0200 Subject: [PATCH] Add a new 'container' block --- .../web/login/layout/base-layout.html.twig | 82 ++++++++++--------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/templates/web/login/layout/base-layout.html.twig b/templates/web/login/layout/base-layout.html.twig index b962eb5cad..bacdf737f7 100644 --- a/templates/web/login/layout/base-layout.html.twig +++ b/templates/web/login/layout/base-layout.html.twig @@ -82,52 +82,54 @@ {% endblock google_chrome_frame %} -
- {% block content_scaffholding %}{% endblock %} - {% block footer_scaffholding %} -
-
-
- {% block footer %} -
-
- {% block footer_content %} -
-
    -
  • - {% trans "Home" %} -
    • -
  • - {% trans "Help" %} -
    • - {% if has_terms_of_use %} -
  • - {% block tou_link %} - {% trans "Terms of use" %} - {% endblock tou_link %} + {% block container %} +
    + {% block content_scaffholding %}{% endblock %} + {% block footer_scaffholding %} +
    +
    +
    + {% block footer %} +
    +
    + {% block footer_content %} +
    +
      +
    • + {% trans "Home" %}
      • - {% endif %} -
    • - {% block copyright %} - © Copyright Alchemy 2005-{{ "now"|date("Y") }} - {% endblock copyright %} -
      • -
    +
  • + {% trans "Help" %} +
    • + {% if has_terms_of_use %} +
  • + {% block tou_link %} + {% trans "Terms of use" %} + {% endblock tou_link %} +
    • + {% endif %} +
  • + {% block copyright %} + © Copyright Alchemy 2005-{{ "now"|date("Y") }} + {% endblock copyright %} +
    • +
+
+ {% endblock footer_content %} +
+
+
+ {% block footer_logo %}Phraseanet{% endblock footer_logo %}
- {% endblock footer_content %} -
-
-
- {% block footer_logo %}Phraseanet{% endblock footer_logo %}
-
- {% endblock footer %} + {% endblock footer %} +
-
- {% endblock footer_scaffholding %} - + {% endblock footer_scaffholding %} + + {% endblock %} {% block analytics %} {% include 'common/analytics.html.twig' %} {% endblock analytics %}