From 7052f4d969409734a852a0dc46fcb9087dd81d09 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sun, 30 Dec 2018 00:02:06 +0000
Subject: [PATCH] Re-combine talks pages

---
 source/_redirects                                 |  1 +
 source/{talks/index.html.twig => talks.html.twig} |  6 ++----
 source/talks/archive.html.twig                    | 14 --------------
 3 files changed, 3 insertions(+), 18 deletions(-)
 rename source/{talks/index.html.twig => talks.html.twig} (86%)
 delete mode 100644 source/talks/archive.html.twig

diff --git a/source/_redirects b/source/_redirects
index 3898f629..c29749c0 100644
--- a/source/_redirects
+++ b/source/_redirects
@@ -138,6 +138,7 @@
 /talks/2016/11/17/goodbye-drush-make-hello-composer-drupal-bristol /talks/goodbye-drush-make-hello-composer
 /talks/2017/01/18/getting-your-data-into-drupal-8-drupal-bristol /talks/getting-your-data-into-drupal-8
 /talks/2017/03/04/getting-your-data-into-drupal-8-drupalcamp-london-2017 /talks/getting-your-data-into-drupal-8
+/talks/archive /talks
 /talks/deploying-php-applications-with-fabric /talks/deploying-php-fabric
 /talks/drupal-vm-generator-2 /talks/drupal-vm-generator
 /talks/drupalorg-2015-2 /talks/drupalorg-2015
diff --git a/source/talks/index.html.twig b/source/talks.html.twig
similarity index 86%
rename from source/talks/index.html.twig
rename to source/talks.html.twig
index 5cb9ba52..109895bc 100644
--- a/source/talks/index.html.twig
+++ b/source/talks.html.twig
@@ -26,12 +26,10 @@ use: [talks]
     </div>
 
     <div>
-        <h2>Last 5 Talks</h2>
+        <h2>Previous Talks</h2>
 
         {% include "talks-table" with {
-            talks: getPastTalks(data.talks|merge(site.talks), site.events)|slice(0,5)
+            talks: getPastTalks(data.talks|merge(site.talks), site.events)
         } %}
-
-        <p>To see more of my previous talks, go to the <a href="/talks/archive" class="link">talks archive</a>.</p>
     </div>
 {% endblock %}
diff --git a/source/talks/archive.html.twig b/source/talks/archive.html.twig
deleted file mode 100644
index 67a29dd5..00000000
--- a/source/talks/archive.html.twig
+++ /dev/null
@@ -1,14 +0,0 @@
----
-layout: default
-title: Talks Archive
-use: [talks]
----
-{% block content %}
-    <p>Here are most of my previous conference and meetup talks, workshops and podcasts.</p>
-
-    {% include "talks-table" with {
-        talks: getPastTalks(data.talks|merge(site.talks), site.events)
-    } %}
-
-    <p>Upcoming talks can be found on the <a href="/talks" class="link">talks page</a>.</p>
-{% endblock %}