From 472a21aa55aa065115a449ef01b139bc2877e001 Mon Sep 17 00:00:00 2001 From: Max Myers Date: Mon, 29 Apr 2019 12:09:06 -0400 Subject: [PATCH] Update all default templates with new layout/content --- templates/footer.twig | 13 +++++++ templates/html-header.twig | 29 ++++++++++------ templates/layouts/base.twig | 39 ++++++++++++--------- templates/nav.twig | 2 +- templates/pages/404.twig | 12 ++++++- templates/pages/author.twig | 49 +++++++++++++++++++++++--- templates/pages/index.twig | 63 +++++++++++++++++++++++++++++---- templates/pages/page.twig | 23 +++++++------ templates/pages/single.twig | 69 +++++++++++++++++++++---------------- 9 files changed, 219 insertions(+), 80 deletions(-) diff --git a/templates/footer.twig b/templates/footer.twig index 23037df..8161953 100644 --- a/templates/footer.twig +++ b/templates/footer.twig @@ -1,2 +1,15 @@ \ No newline at end of file diff --git a/templates/html-header.twig b/templates/html-header.twig index dc44a5e..f82b897 100644 --- a/templates/html-header.twig +++ b/templates/html-header.twig @@ -1,18 +1,27 @@ - - - - + + + + {% set page_title %}{% if wp_title %}{{ wp_title }} - {{ site.name }}{% else %}{{ site.name }}{% endif %}{% endset %} - + - - - + + + {% if options.google_site_verification %} + + {% endif %} + + + + + + + {{ page_title }} - + - {{function('wp_head')}} + {{ function('wp_head') }} diff --git a/templates/layouts/base.twig b/templates/layouts/base.twig index a6153bb..e29455e 100644 --- a/templates/layouts/base.twig +++ b/templates/layouts/base.twig @@ -4,32 +4,37 @@ {% endblock %} {% endblock %} - - + +{% do action('body_top') %} {% block nav %} {% include 'nav.twig' %} {% endblock nav %} -
-
- {% if title %}

{{title}}

{% endif %} -
- {% block content %} - Sorry, no content - {% endblock %} -
- {% if sidebar %} - +
+
+ {% if title %} +
+
+
+

{{ title }}

+
+
+
{% endif %} -
-
+ {% block content %} + Sorry, no content + {% endblock %} + + {% if sidebar %} + + {% endif %} + {% block footer %} {% include 'footer.twig' %} {{ function('wp_footer') }} {% endblock %} {% block javascripts %} - {% endblock %} \ No newline at end of file diff --git a/templates/nav.twig b/templates/nav.twig index 616435c..611ac88 100644 --- a/templates/nav.twig +++ b/templates/nav.twig @@ -2,13 +2,13 @@