Re-combine talks pages

This commit is contained in:
Oliver Davies 2018-12-30 00:02:06 +00:00
parent ced4121eff
commit 7052f4d969
3 changed files with 3 additions and 18 deletions

View file

@ -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

View file

@ -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 %}

View file

@ -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 %}