From 1c91a39e43ebcd1c7abd5dfc6a6b6d9ff7a6cadc Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Tue, 5 Dec 2017 07:37:31 -0500 Subject: [PATCH] The quotening Signed-off-by: Andrew Welch --- templates/404.twig | 4 +-- templates/503.twig | 4 +-- templates/_layouts/_amp_layout.twig | 20 +++++------ templates/_layouts/_layout.twig | 48 ++++++++++++--------------- templates/_partials/_amp_navbar.twig | 4 +-- templates/_partials/_info_header.twig | 2 +- templates/_partials/_macros.twig | 2 +- templates/error.twig | 4 +-- templates/index.twig | 4 +-- templates/offline.twig | 4 +-- 10 files changed, 44 insertions(+), 52 deletions(-) diff --git a/templates/404.twig b/templates/404.twig index 80bfc2f..935763b 100755 --- a/templates/404.twig +++ b/templates/404.twig @@ -1,11 +1,11 @@ {# @var craft \craft\web\twig\variables\CraftVariable #} {% set entry = craft.entries.section("notFound").limit(1).one() %} -{% extends "_layouts/_layout" %} +{% extends "_layouts/_layout.twig" %} {% block _inline_css %} {% endblock %} diff --git a/templates/503.twig b/templates/503.twig index d65a119..b969b23 100755 --- a/templates/503.twig +++ b/templates/503.twig @@ -1,11 +1,11 @@ {# @var craft \craft\web\twig\variables\CraftVariable #} {% set entry = craft.entries.section("serviceUnavailable").limit(1).one() %} -{% extends "_layouts/_layout" %} +{% extends "_layouts/_layout.twig" %} {% block _inline_css %} {% endblock %} diff --git a/templates/_layouts/_amp_layout.twig b/templates/_layouts/_amp_layout.twig index fa4bbb1..d34f1a5 100755 --- a/templates/_layouts/_amp_layout.twig +++ b/templates/_layouts/_amp_layout.twig @@ -2,11 +2,7 @@ {% minify %} {% set baseUrl = craft.app.config.general.custom.baseUrl %} {% set staticAssetsVersion = craft.app.config.general.custom.staticAssetsVersion %} -{% header "Link: " ~ -"<" ~ baseUrl ~ ">; rel=dns-prefetch;" ~ -"," ~ -"<" ~ baseUrl ~ ">; rel=preconnect; crossorigin;" -%} +{% header "Link: <#{baseUrl}>; rel=dns-prefetch;,<#{baseUrl}>; rel=preconnect; crossorigin;" %} @@ -15,8 +11,8 @@ - {% import '_partials/_macros.html' as macro %} - {% include '_partials/_global_header' %} + {% import "_partials/_macros.twig" as macro %} + {% include "_partials/_global_header.twig" %} {% block _head_links %} {% endblock %} @@ -28,15 +24,15 @@ {% block _inline_css %} {% endblock %} - {# -- Site fonts -- #} - {% include '_inlinecss/_site_fonts.css' %} + {# -- Site fonts -- #} + {% include "_inlinecss/_site_fonts.css" %}
- {% include '_partials/_amp_navbar' %} + {% include "_partials/_amp_navbar.twig" %}
{% block content %} @@ -46,9 +42,9 @@ {% block subcontent %} {% endblock %} - {% include '_partials/_amp_info_footer' %} + {% include "_partials/_amp_info_footer.twig" %} - {% include '_partials/_global_footer' %} + {% include "_partials/_global_footer.twig" %}
diff --git a/templates/_layouts/_layout.twig b/templates/_layouts/_layout.twig index 7add671..7581697 100755 --- a/templates/_layouts/_layout.twig +++ b/templates/_layouts/_layout.twig @@ -2,11 +2,7 @@ {% minify %} {% set baseUrl = craft.app.config.general.custom.baseUrl %} {% set staticAssetsVersion = craft.app.config.general.custom.staticAssetsVersion %} -{% header "Link: " ~ - "<" ~ baseUrl ~ ">; rel=dns-prefetch;" ~ - "," ~ - "<" ~ baseUrl ~ ">; rel=preconnect; crossorigin;" -%} +{% header "Link: <#{baseUrl}>; rel=dns-prefetch;,<#{baseUrl}>; rel=preconnect; crossorigin;" %} {% endminify %} @@ -22,33 +18,33 @@ {% block _head_links %} {% endblock %} - {% import '_partials/_macros.twig' as macro %} - {% include '_partials/_global_header' %} + {% import "_partials/_macros.twig" as macro %} + {% include "_partials/_global_header.twig" %} {# -- ServiceWorker, loadjs, and tiny-cookie -- #} {% endminify %} {# -- CRITICAL CSS -- #} - + {% block _inline_css %} {% endblock %} {% minify %} @@ -61,28 +57,28 @@ {# -- PictureFill polyfill -- #} {# -- Site fonts -- #} {% endminify %} {# -- FontFaceObserver -- #} {% minify %} @@ -104,7 +100,7 @@
- {% include '_partials/_info_header' %} + {% include "_partials/_info_header.twig" %}
{% block content %} @@ -115,10 +111,10 @@ {% endblock %} {# -- Info footer -- #} - {% include '_partials/_info_footer' %} + {% include "_partials/_info_footer.twig" %} {# -- HTML Footer -- #} - {% include '_partials/_global_footer' %} + {% include "_partials/_global_footer.twig" %} {# -- Inline JS -- #} {% block _inline_js %} diff --git a/templates/_partials/_amp_navbar.twig b/templates/_partials/_amp_navbar.twig index 1877004..539b82c 100755 --- a/templates/_partials/_amp_navbar.twig +++ b/templates/_partials/_amp_navbar.twig @@ -1,5 +1,5 @@ {# @var craft \craft\web\twig\variables\CraftVariable #} - +
  • Blog
    • @@ -9,7 +9,7 @@ - {% include '_partials/_navbar' %} + {% include "_partials/_navbar.twig" %} \ No newline at end of file diff --git a/templates/_partials/_macros.twig b/templates/_partials/_macros.twig index 8052a8a..3a595a0 100755 --- a/templates/_partials/_macros.twig +++ b/templates/_partials/_macros.twig @@ -1,4 +1,4 @@ {# @var craft \craft\web\twig\variables\CraftVariable #} {% macro dateFormatted(givenDate) %} - {{ givenDate | date('jS F Y') }} + {{ givenDate | date("jS F Y") }} {% endmacro %} diff --git a/templates/error.twig b/templates/error.twig index 7d87adb..17453d3 100755 --- a/templates/error.twig +++ b/templates/error.twig @@ -1,11 +1,11 @@ {# @var craft \craft\web\twig\variables\CraftVariable #} {% set entry = craft.entries.section("genericError").limit(1).one() %} -{% extends "_layouts/_layout" %} +{% extends "_layouts/_layout.twig" %} {% block _inline_css %} {% endblock %} diff --git a/templates/index.twig b/templates/index.twig index 8ed7371..a9a6ae7 100755 --- a/templates/index.twig +++ b/templates/index.twig @@ -1,9 +1,9 @@ {# @var craft \craft\web\twig\variables\CraftVariable #} -{% extends "_layouts/_layout" %} +{% extends "_layouts/_layout.twig" %} {% block _inline_css %} {% endblock %} diff --git a/templates/offline.twig b/templates/offline.twig index 0dd3bcc..6d64d31 100755 --- a/templates/offline.twig +++ b/templates/offline.twig @@ -1,9 +1,9 @@ {# @var craft \craft\web\twig\variables\CraftVariable #} -{% extends "_layouts/_layout" %} +{% extends "_layouts/_layout.twig" %} {% block _inline_css %} {% endblock %}