From b8f951d5b467dfc091fd183da07e9e0154706016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 30 Jul 2017 13:01:57 +0200 Subject: [PATCH] templates: divide bodyargs into bodyclasses and bodyattrs (#17843) --- templates/combo/page_template.html | 15 +++++++++------ templates/fargo/base_iframe.html | 2 +- templates/theme.html | 2 +- templates/variants/alfortville/prepare-template.py | 2 +- .../hautes-alpes/combo/page_template_commune.html | 2 +- templates/variants/minint/theme.html | 2 +- templates/variants/montpellier/theme.html | 2 +- templates/variants/nancy-2017/prepare-template.py | 2 +- templates/variants/nancy-2017/theme.html | 4 ++-- 9 files changed, 18 insertions(+), 15 deletions(-) diff --git a/templates/combo/page_template.html b/templates/combo/page_template.html index 8fa9859..cf47bf2 100644 --- a/templates/combo/page_template.html +++ b/templates/combo/page_template.html @@ -19,14 +19,17 @@ {% end_skeleton_extra_placeholder %} {% endblock %} -{% block bodyargs %} -class="page-{{ page.slug }} {% if pages %}section-{{pages.0.slug}}{% endif %} -{% skeleton_extra_placeholder extra-body-class %} -{% end_skeleton_extra_placeholder %}" -{% skeleton_extra_placeholder extra-body-args %} -{% end_skeleton_extra_placeholder %} +{% block bodyattrs %} data-api-root="{{ site_base }}/api/" {% if check_badges %}data-check-badges="true"{% endif %} +{% skeleton_extra_placeholder extra-body-args %} +{% end_skeleton_extra_placeholder %} +{% endblock %} + +{% block bodyclasses %} +page-{{ page.slug }} {% if pages %}section-{{pages.0.slug}}{% endif %} +{% skeleton_extra_placeholder extra-body-class %} +{% end_skeleton_extra_placeholder %} {% endblock %} {% block title %} - {% if render_skeleton %}{% skeleton_extra_placeholder title %}{{ site_title }}{% end_skeleton_extra_placeholder %}{% else %}{{page.title}}{% endif %}{% endblock %} diff --git a/templates/fargo/base_iframe.html b/templates/fargo/base_iframe.html index 5230693..55547fc 100644 --- a/templates/fargo/base_iframe.html +++ b/templates/fargo/base_iframe.html @@ -11,7 +11,7 @@ {% block extra_head %} {% endblock %} - + {% block content %} {% endblock %} diff --git a/templates/theme.html b/templates/theme.html index 6ac9532..be6b8fd 100644 --- a/templates/theme.html +++ b/templates/theme.html @@ -26,7 +26,7 @@ {% block extra_scripts %} {% endblock %} - +