From 7583f53740161fda6ab647afadbb9f905def527c Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Mon, 6 Mar 2017 06:06:18 +0000
Subject: [PATCH] Update talk layouts and partials

---
 source/_partials/talk/location.twig |  3 ---
 source/_partials/talk/logo.twig     |  7 -------
 source/_partials/talk/pager.twig    | 17 -----------------
 source/_partials/talk/slides.twig   |  1 +
 source/_partials/talk/video.twig    |  1 +
 source/_views/talk.twig             |  9 ++-------
 6 files changed, 4 insertions(+), 34 deletions(-)
 delete mode 100644 source/_partials/talk/location.twig
 delete mode 100644 source/_partials/talk/logo.twig
 delete mode 100644 source/_partials/talk/pager.twig

diff --git a/source/_partials/talk/location.twig b/source/_partials/talk/location.twig
deleted file mode 100644
index d6b651eb..00000000
--- a/source/_partials/talk/location.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-<p class="talk-location">
-    At {{ page.location }} on {{ page.date|date('jS F Y') }}.
-</p>
diff --git a/source/_partials/talk/logo.twig b/source/_partials/talk/logo.twig
deleted file mode 100644
index 11ce2edb..00000000
--- a/source/_partials/talk/logo.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-{% if page.logo %}
-    <div class="talk-logo">
-        {% if page.logo_link %}<a href="{{ page.logo_link }}" title="{{ page.location }}" target="_blank">{% endif -%}
-            <img src="{{ site.url }}/{{ page.logo }}" alt="{{ page.location }}">
-        {%- if page.logo_link %}</a>{% endif %}
-    </div>
-{% endif %}
diff --git a/source/_partials/talk/pager.twig b/source/_partials/talk/pager.twig
deleted file mode 100644
index 6b87f8cd..00000000
--- a/source/_partials/talk/pager.twig
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="talk-pager is-flex">
-    {% if page.previous_talk %}
-        <div class="is-half">
-           <a href="{{ page.previous_talk.url }}">
-                &laquo; {{ page.previous_talk.title }}
-            </a>
-        </div>
-    {% endif %}
-
-    {% if page.next_talk %}
-        <div class="is-half text-right">
-            <a href="{{ page.next_talk.url }}">
-                {{ page.next_talk.title }} &raquo;
-            </a>
-        </div>
-    {% endif %}
-</div>
diff --git a/source/_partials/talk/slides.twig b/source/_partials/talk/slides.twig
index 950a46f1..d7e3a36e 100644
--- a/source/_partials/talk/slides.twig
+++ b/source/_partials/talk/slides.twig
@@ -1,5 +1,6 @@
 {% if page.slides_embed %}
     <div class="talk-slides">
+        <h2>Slides</h2>
         {{ page.slides_embed|raw }}
     </div>
 {% endif %}
diff --git a/source/_partials/talk/video.twig b/source/_partials/talk/video.twig
index 30925189..a5fb8ec4 100644
--- a/source/_partials/talk/video.twig
+++ b/source/_partials/talk/video.twig
@@ -1,5 +1,6 @@
 {% if page.video_embed %}
     <div class="talk-video">
+        <h2>Video</h2>
         <div class="embed-container">
             {{ page.video_embed|raw }}
         </div>
diff --git a/source/_views/talk.twig b/source/_views/talk.twig
index 82a5a53d..b2af49ff 100644
--- a/source/_views/talk.twig
+++ b/source/_views/talk.twig
@@ -5,15 +5,10 @@
 {% endblock %}
 
 {% block content_wrapper %}
-    {% include 'talk/location' %}
-    {% include 'talk/slides' %}
-    {% include 'talk/video' %}
-
     <div class="talk-description">
-        {% include 'talk/logo' %}
-
         {% block content %}{% endblock %}
     </div>
 
-    {% include 'talk/pager' %}
+    {% include 'talk/slides' %}
+    {% include 'talk/video' %}
 {% endblock %}