From 9f537eb6764eb35519469d16bd9e240cc0b72aa3 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Thu, 10 Sep 2015 02:59:20 +0100
Subject: [PATCH] Re-added some blocks

---
 source/blog.html                              | 52 ++++++++++---------
 source/testimonials.html.twig                 | 44 +++++++++-------
 .../oliverdavies/_layouts/default.html.twig   |  2 +-
 3 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/source/blog.html b/source/blog.html
index 37dd421e..27ee9be2 100644
--- a/source/blog.html
+++ b/source/blog.html
@@ -8,31 +8,35 @@ pagination:
 use:
     - posts
 ---
-<h1>Blog</h1>
+{% block content %}
+    <h1>Blog</h1>
 
-<ul class="posts">
-{% for post in page.pagination.items %}
-    <li class="post">
-        {% include 'post_header' with { page: post, title_tag: 'h2' } %}
+    <ul class="posts">
+    {% for post in page.pagination.items %}
+        <li class="post">
+            {% include 'post_header' with { page: post, title_tag: 'h2' } %}
 
-        {% if post.blocks.excerpt %}
-            {{ post.blocks.excerpt|raw }}
-        {% else %}
-            <p>{{ post.blocks.content|raw|split(' ')|slice(0,50)|join(' ')|replace({ 'h2':'h3' })|raw }} &hellip;</p>
-        {% endif %}
+            {% if post.blocks.excerpt %}
+                {{ post.blocks.excerpt|raw }}
+            {% else %}
+                <p>{{ post.blocks.content|raw|split(' ')|slice(0,50)|join(' ')|replace({ 'h2':'h3' })|raw }} &hellip;</p>
+            {% endif %}
 
-        <a href="{{ post.url }}">Read more &rarr;</a>
-    </li>
-{% endfor %}
-</ul>
+            <a href="{{ post.url }}">Read more &rarr;</a>
+        </li>
+    {% endfor %}
+    </ul>
 
-{% if page.pagination.previous_page or page.pagination.next_page %}
-    <nav>
-        {% if page.pagination.previous_page %}
-            <a href="{{ site.url }}{{ page.pagination.previous_page.url }}">Newer Items</a>
-        {% endif %}
-        {% if page.pagination.next_page %}
-            <a href="{{ site.url }}{{ page.pagination.next_page.url }}">Older Items</a>
-        {% endif %}
-    </nav>
-{% endif %}
+    {% if page.pagination.previous_page or page.pagination.next_page %}
+        <nav>
+            {% if page.pagination.previous_page %}
+                <a href="{{ site.url }}{{ page.pagination.previous_page.url }}">Newer Items</a>
+            {% endif %}
+            {% if page.pagination.next_page %}
+                <a href="{{ site.url }}{{ page.pagination.next_page.url }}">Older Items</a>
+            {% endif %}
+        </nav>
+    {% endif %}
+{% endblock %}
+
+{% block body_classes 'page--blog page--blog__list' %}
diff --git a/source/testimonials.html.twig b/source/testimonials.html.twig
index 8d26982a..07ed8a1e 100644
--- a/source/testimonials.html.twig
+++ b/source/testimonials.html.twig
@@ -79,27 +79,31 @@ testimonials:
           <p>Everything we have thrown at Oliver, he has approached with an open and flexible mind that has allowed him
           to work on a wide range of projects and features for Drupal products.</p>
 ---
-<h1>Testimonials</h1>
-<p>Here are some examples of the nice things that clients and former colleagues have said.</p>
-<p>You can view more recommendations on my <a href="{{ site.linkedin.url }}">LinkedIn profile</a>.</p>
+{% block content %}
+    <h1>Testimonials</h1>
+    <p>Here are some examples of the nice things that clients and former colleagues have said.</p>
+    <p>You can view more recommendations on my <a href="{{ site.linkedin.url }}">LinkedIn profile</a>.</p>
 
-{% for testimonial in page.testimonials|reverse|slice(0,5) %}
-    <article class="testimonial">
-        <h2 class="testimonial__name">{{ testimonial.name }}</h2>
+    {% for testimonial in page.testimonials|reverse|slice(0,5) %}
+        <article class="testimonial">
+            <h2 class="testimonial__name">{{ testimonial.name }}</h2>
 
-        {% if testimonial.role or testimonial.company %}{% spaceless %}
-            <p>
-                {{ testimonial.role }} at
-                {% if testimonial.url %}<a href="{{ testimonial.url }}" title="{{ testimonial.company }}">{% endif %}
-                {{ testimonial.company }}
-                {% if testimonial.url %}</a>{% endif %}
-            </p>
-        {% endspaceless %}{% endif %}
+            {% if testimonial.role or testimonial.company %}{% spaceless %}
+                <p>
+                    {{ testimonial.role }} at
+                    {% if testimonial.url %}<a href="{{ testimonial.url }}" title="{{ testimonial.company }}">{% endif %}
+                    {{ testimonial.company }}
+                    {% if testimonial.url %}</a>{% endif %}
+                </p>
+            {% endspaceless %}{% endif %}
 
-        {% if testimonial.image %}
-            <img class="testimonial__image" src="{{ testimonial.image }}" alt="{{ testimonial.name }}"/>
-        {% endif %}
+            {% if testimonial.image %}
+                <img class="testimonial__image" src="{{ testimonial.image }}" alt="{{ testimonial.name }}"/>
+            {% endif %}
 
-        {{ testimonial.text|raw }}
-    </article>
-{% endfor %}
+            {{ testimonial.text|raw }}
+        </article>
+    {% endfor %}
+{% endblock %}
+
+{% block body_classes 'page--testimonials' %}
diff --git a/source/themes/opdavies/oliverdavies/_layouts/default.html.twig b/source/themes/opdavies/oliverdavies/_layouts/default.html.twig
index 8c9fa9af..1b0ff29d 100644
--- a/source/themes/opdavies/oliverdavies/_layouts/default.html.twig
+++ b/source/themes/opdavies/oliverdavies/_layouts/default.html.twig
@@ -29,7 +29,7 @@
             <link rel="icon" href="{{ site.gravatar.url }}?s={{ size }}" sizes="{{ size }}x{{ size }}">
         {% endfor %}
     </head>
-    <body>
+    <body{% if page.blocks.body_classes %} class="{{ page.blocks.body_classes }}"{% endif %}>
         <nav class="navbar navbar-inverse navbar-fixed-top">
             <div class="container">
                 <div class="navbar-header">