From b4a3965c24206ebbbc691bbb03004b4401a86ef5 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Aug 2015 12:07:55 +0100 Subject: [PATCH 1/6] Rename to talks.twig --- source/{talks.html.twig => talks.twig} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename source/{talks.html.twig => talks.twig} (100%) diff --git a/source/talks.html.twig b/source/talks.twig similarity index 100% rename from source/talks.html.twig rename to source/talks.twig From 7a474faf0ae25a1debd76e06009db868220dfe3b Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Aug 2015 12:08:14 +0100 Subject: [PATCH 2/6] Removed _talks --- .../2012-09-05-what-is-this-drupal-thing.md | 10 ---------- source/_talks/2013-07-10-drupal-ldap.md | 10 ---------- source/_talks/2014-03-01-git-flow.md | 12 ------------ .../2014-07-02-drush-make-drupalbristol.md | 13 ------------- .../_talks/2014-08-19-drupal-association.md | 15 --------------- source/_talks/2015-01-18-drupalorg-2015.md | 11 ----------- source/_talks/2015-02-28-drupalorg-2015.md | 12 ------------ source/_talks/2015-04-08-drupal8.md | 16 ---------------- ...2015-07-25-test-drive-twig-with-sculpin.md | 19 ------------------- source/_talks/2015-08-25-drupal.md | 9 --------- source/_talks/2015-11-01-accessible-drupal.md | 12 ------------ source/_talks/2015-11-19-sculpin.md | 13 ------------- 12 files changed, 152 deletions(-) delete mode 100644 source/_talks/2012-09-05-what-is-this-drupal-thing.md delete mode 100644 source/_talks/2013-07-10-drupal-ldap.md delete mode 100644 source/_talks/2014-03-01-git-flow.md delete mode 100644 source/_talks/2014-07-02-drush-make-drupalbristol.md delete mode 100644 source/_talks/2014-08-19-drupal-association.md delete mode 100644 source/_talks/2015-01-18-drupalorg-2015.md delete mode 100644 source/_talks/2015-02-28-drupalorg-2015.md delete mode 100644 source/_talks/2015-04-08-drupal8.md delete mode 100644 source/_talks/2015-07-25-test-drive-twig-with-sculpin.md delete mode 100644 source/_talks/2015-08-25-drupal.md delete mode 100644 source/_talks/2015-11-01-accessible-drupal.md delete mode 100644 source/_talks/2015-11-19-sculpin.md diff --git a/source/_talks/2012-09-05-what-is-this-drupal-thing.md b/source/_talks/2012-09-05-what-is-this-drupal-thing.md deleted file mode 100644 index e7a81753..00000000 --- a/source/_talks/2012-09-05-what-is-this-drupal-thing.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: So, what is this Drupal thing? -location: Unified Diff -slug: what-this-drupal-thing -tags: - - meetup - - unified-diff - - drupal - - cardiff ---- diff --git a/source/_talks/2013-07-10-drupal-ldap.md b/source/_talks/2013-07-10-drupal-ldap.md deleted file mode 100644 index 9d6177c1..00000000 --- a/source/_talks/2013-07-10-drupal-ldap.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -title: An overview of the Drupal LDAP module -location: SWDUG -slug: drupal-ldap -tags: - - meetup - - drupal - - swdug - - cardiff ---- diff --git a/source/_talks/2014-03-01-git-flow.md b/source/_talks/2014-03-01-git-flow.md deleted file mode 100644 index 4aca121f..00000000 --- a/source/_talks/2014-03-01-git-flow.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: Never Commit to Master: An Introduction to Git Flow -location: DrupalCamp London -slug: git-flow -slides: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow -slides_embed: -tags: - - conference - - git - - drupalcamp - - drupalcamp-london ---- diff --git a/source/_talks/2014-07-02-drush-make-drupalbristol.md b/source/_talks/2014-07-02-drush-make-drupalbristol.md deleted file mode 100644 index dee44c4d..00000000 --- a/source/_talks/2014-07-02-drush-make-drupalbristol.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: drush make drupalbristol -location: Drupal Bristol -slides: https://speakerdeck.com/opdavies/drush-make-drupalbristol -slides_embed: -tags: - - meetup - - drupal - - drupal-bristol - - drush - - drush-make - - bristol ---- diff --git a/source/_talks/2014-08-19-drupal-association.md b/source/_talks/2014-08-19-drupal-association.md deleted file mode 100644 index 7514bff8..00000000 --- a/source/_talks/2014-08-19-drupal-association.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: About the Drupal Association -location: SWDUG -slug: drupal-association -tags: - - conference - - drupal - - drupalcamp - - drupalcamp-brighton - - drupalorg - - drupal-association - - cardiff ---- -An impromptu talk about the [Drupal Association](https://assoc.drupal.org) - what it is and does, and what I've been -working on since starting my new role there in May. diff --git a/source/_talks/2015-01-18-drupalorg-2015.md b/source/_talks/2015-01-18-drupalorg-2015.md deleted file mode 100644 index 12f3e236..00000000 --- a/source/_talks/2015-01-18-drupalorg-2015.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: Drupal.org in 2015: What's Coming Next -location: DrupalCamp Brighton -slug: drupalorg-2015 -tags: - - drupal - - drupalcamp - - drupalcamp-brighton - - drupalorg - - drupal-association ---- diff --git a/source/_talks/2015-02-28-drupalorg-2015.md b/source/_talks/2015-02-28-drupalorg-2015.md deleted file mode 100644 index 46410864..00000000 --- a/source/_talks/2015-02-28-drupalorg-2015.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: Drupal.org in 2015: What's Coming Next -location: DrupalCamp London -slug: drupalorg-2015 -tags: - - conference - - drupal - - drupalcamp - - drupalcamp-london - - drupalorg - - drupal-association ---- diff --git a/source/_talks/2015-04-08-drupal8.md b/source/_talks/2015-04-08-drupal8.md deleted file mode 100644 index d6be4be2..00000000 --- a/source/_talks/2015-04-08-drupal8.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: Drupal 8 -location: PHPSW -slides: https://speakerdeck.com/opdavies/drupal-8 -slides_embed: -joindin: https://joind.in/talk/view/14380 -tags: - - meetup - - php - - phpsw - - drupal - - drupal8 - - bristol ---- -This talk was a ten-minute lightning talk, intended to highlight some of the major architectural and cultural changes -that are currently happening in the Drupal community, to my local PHP community. diff --git a/source/_talks/2015-07-25-test-drive-twig-with-sculpin.md b/source/_talks/2015-07-25-test-drive-twig-with-sculpin.md deleted file mode 100644 index 75274680..00000000 --- a/source/_talks/2015-07-25-test-drive-twig-with-sculpin.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -title: Test Drive Twig with Sculpin -location: DrupalCamp North -slug: test-drive-twig-sculpin -slides: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin -slides_embed: -tags: - - conference - - drupalcamp - - drupalcamp-north - - sculpin - - twig ---- -This session covers how to download and install Sculpin on your computer, and how to build a Sculpin site using YAML, -Markdown and Twig which you can use as a stand-alone static website or as a HTML prototype that you can copy and paste -into your Drupal 8 theme. - -We'll also cover tips and tricks such as Sculpin themes, layouts and partials, and common Twig methods such as blocks -and template inheritance, loops, conditional statements and filters. diff --git a/source/_talks/2015-08-25-drupal.md b/source/_talks/2015-08-25-drupal.md deleted file mode 100644 index 01381897..00000000 --- a/source/_talks/2015-08-25-drupal.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -title: Drupal -location: Umbraco Bristol -tags: - - meetup - - drupal - - bristol ---- -TBC diff --git a/source/_talks/2015-11-01-accessible-drupal.md b/source/_talks/2015-11-01-accessible-drupal.md deleted file mode 100644 index 743544a0..00000000 --- a/source/_talks/2015-11-01-accessible-drupal.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: Accessible Drupal -location: Accessible Bristol -tags: - - meetup - - accessible-bristol - - accessibility - - drupal - - bristol -fuzzy_date: true ---- -TBC diff --git a/source/_talks/2015-11-19-sculpin.md b/source/_talks/2015-11-19-sculpin.md deleted file mode 100644 index a4fbba5e..00000000 --- a/source/_talks/2015-11-19-sculpin.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: Building Static Websites with Sculpin -location: Unified Diff -slug: sculpin -draft: true -fuzzy_date: true -tags: - - meetup - - unified-diff - - sculpin - - cardiff ---- -TBC From 95a72eb20c62b3133cff8b4b8c59f0eacc5927b2 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Aug 2015 12:08:38 +0100 Subject: [PATCH 3/6] Removed the talks content type --- app/config/sculpin_kernel.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/config/sculpin_kernel.yml b/app/config/sculpin_kernel.yml index 4ec85b6b..2ab79060 100644 --- a/app/config/sculpin_kernel.yml +++ b/app/config/sculpin_kernel.yml @@ -3,7 +3,3 @@ sculpin_content_types: permalink: blog/:slug_title/ taxonomies: - tags - talks: - permalink: talks/:year/:month/:day/:slug_title/ - taxonomies: - - tags From 3dff85e33e26e19ae384bb5d621f517feda4839f Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Aug 2015 12:23:40 +0100 Subject: [PATCH 4/6] Started re-adding talks --- source/_partials/talk_listing_item.twig | 6 ++++-- source/talks.twig | 10 +++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/source/_partials/talk_listing_item.twig b/source/_partials/talk_listing_item.twig index 3bfa5992..7efebb74 100644 --- a/source/_partials/talk_listing_item.twig +++ b/source/_partials/talk_listing_item.twig @@ -6,7 +6,9 @@ {{ talk.date|date('F') }} {% endif %} - {{ talk.location }} - - + {% if talk.title_link %}{% endif %} {{ talk.title }} - + {% if talk.title_link %}{% endif %} + + {{ talk.title_suffix }} {% endspaceless %} diff --git a/source/talks.twig b/source/talks.twig index ab892341..65a15782 100644 --- a/source/talks.twig +++ b/source/talks.twig @@ -3,8 +3,12 @@ layout: default title: Talks meta: description: 'Information about previous and upcoming talks that Oliver has presented at conferences and user groups' -use: - - talks +talks: + - { date: 2015-04-08, location: PHPSW, title: Drupal 8, title_suffix: (lightning talk), title_link: https://joind.in/talk/view/14380 } + - { date: 2015-07-25, location: DrupalCamp North, title: Test Drive Twig with Sculpin, title_link: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin } + - { date: 2015-08-25, location: Umbraco Bristol, title: Drupal } + - { date: 2015-11-01, location: Accessible Bristol, title: Accessible Drupal, fuzzy_date: true } + - { date: 2015-11-01, location: Unified Diff, title: Building Static Websites with Sculpin, fuzzy_date: true } --- {% block body_classes 'page--talks page--talks__list' %} @@ -18,7 +22,7 @@ use: Lanyrd and Joind.in profiles.

{% set now = 'now'|date('U') %} - {% set talks = data.talks|reverse %} + {% set talks = page.talks %} {% set found = false %} {% set year = '0' %} From d282f525a6abe7eaec301a6357316f65108fdfc9 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Aug 2015 12:58:00 +0100 Subject: [PATCH 5/6] Re-added all talks --- source/talks.twig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source/talks.twig b/source/talks.twig index 65a15782..4a8ab8f7 100644 --- a/source/talks.twig +++ b/source/talks.twig @@ -4,6 +4,13 @@ title: Talks meta: description: 'Information about previous and upcoming talks that Oliver has presented at conferences and user groups' talks: + - { date: 2012-09-05, location: Unified Diff, title: "So, What's This Drupal Thing?", title_link: https://vimeo.com/49827006 } + - { date: 2013-07-10, location: SWDUG, title: Drupal and the LDAP Module } + - { date: 2014-03-01, location: DrupalCamp London, title: "Never Commit to Master: An Introduction to Git Flow", title_link: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow } + - { date: 2014-07-02, location: Drupal Bristol, title: drush make drupalbristol, title_link: https://speakerdeck.com/opdavies/drush-make-drupalbristol } + - { date: 2014-08-19, location: SWDUG, title: About the Drupal Association } + - { date: 2015-01-18, location: DrupalCamp Brighton, title: "Drupal.org in 2015: What's Coming Next" } + - { date: 2015-02-28, location: DrupalCamp London, title: "Drupal.org in 2015: What's Coming Next" } - { date: 2015-04-08, location: PHPSW, title: Drupal 8, title_suffix: (lightning talk), title_link: https://joind.in/talk/view/14380 } - { date: 2015-07-25, location: DrupalCamp North, title: Test Drive Twig with Sculpin, title_link: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin } - { date: 2015-08-25, location: Umbraco Bristol, title: Drupal } From c75d53d88f9421a9e10428640239662ea72268e1 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Aug 2015 12:58:34 +0100 Subject: [PATCH 6/6] Fixed talk placement --- source/talks.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/talks.twig b/source/talks.twig index 4a8ab8f7..6593b937 100644 --- a/source/talks.twig +++ b/source/talks.twig @@ -28,7 +28,7 @@ talks:

There is also information about events that I’ve attended and spoken at on my Lanyrd and Joind.in profiles.

- {% set now = 'now'|date('U') %} + {% set now = 'today'|date('U') %} {% set talks = page.talks %} {% set found = false %}