diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index 289fe5e1..5dc1a4bf 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -33,3 +33,4 @@ imports: - '../../data/companies.yml' - '../../data/events.yml' - '../../data/links.yml' + - '../../data/talks.yml' diff --git a/data/talks.yml b/data/talks.yml new file mode 100644 index 00000000..68d06edb --- /dev/null +++ b/data/talks.yml @@ -0,0 +1,22 @@ +talks: + - title: 'Drupal and the LDAP module' + events: + - event: swdug + date: '2013-07-10' + + - title: 'About the Drupal Association' + events: + - event: swdug + date: '2014-08-19' + + - title: 'Automated testing with Drupal 8 and PHPUnit' + type: Workshop + events: + - event: drupal_bristol + date: '2018-06-27' + + - title: 'Episode #175 - Automated Testing' + type: Podcast + events: + - event: talking_drupal + date: '2018-09-05' diff --git a/source/talks/archive.html.twig b/source/talks/archive.html.twig new file mode 100644 index 00000000..67a29dd5 --- /dev/null +++ b/source/talks/archive.html.twig @@ -0,0 +1,14 @@ +--- +layout: default +title: Talks Archive +use: [talks] +--- +{% block content %} +

Here are most of my previous conference and meetup talks, workshops and podcasts.

+ + {% include "talks-table" with { + talks: getPastTalks(data.talks|merge(site.talks), site.events) + } %} + +

Upcoming talks can be found on the talks page.

+{% endblock %} diff --git a/source/talks.html.twig b/source/talks/index.html.twig similarity index 59% rename from source/talks.html.twig rename to source/talks/index.html.twig index 0aa9f313..5cb9ba52 100644 --- a/source/talks.html.twig +++ b/source/talks/index.html.twig @@ -4,21 +4,6 @@ title: Talks meta: description: 'Information about previous and upcoming talks that Oliver has presented at conferences and user groups' use: [talks] -talks: - - title: 'Drupal and the LDAP module' - events: - - { event: swdug, date: '2013-07-10' } - - title: 'About the Drupal Association' - events: - - { event: swdug, date: '2014-08-19' } - - title: 'Automated testing with Drupal 8 and PHPUnit' - type: Workshop - events: - - { event: drupal_bristol, date: '2018-06-27' } - - title: 'Episode #175 - Automated Testing' - type: Podcast - events: - - { event: talking_drupal, date: '2018-09-05' } --- {% block content %}

@@ -29,7 +14,7 @@ talks:

Upcoming Talks

- {% set upcoming_talks = getUpcomingTalks(data.talks|merge(page.talks), site.events) %} + {% set upcoming_talks = getUpcomingTalks(data.talks|merge(site.talks), site.events) %} {% if not upcoming_talks.empty %} {% include "talks-table" with { talks: upcoming_talks, @@ -41,10 +26,12 @@ talks:
-

Past Talks

+

Last 5 Talks

{% include "talks-table" with { - talks: getPastTalks(data.talks|merge(page.talks), site.events) + talks: getPastTalks(data.talks|merge(site.talks), site.events)|slice(0,5) } %} + +

To see more of my previous talks, go to the talks archive.

{% endblock %}