From b4a3965c24206ebbbc691bbb03004b4401a86ef5 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Aug 2015 12:07:55 +0100 Subject: [PATCH 01/19] 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 02/19] 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 03/19] 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 04/19] 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 05/19] 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 06/19] 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 %} From e07d534c4045ca3838b3f46e51f1acd45eb2bcc3 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Aug 2015 12:07:55 +0100 Subject: [PATCH 07/19] 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 36f176a041e519b463fd3277e5c7b0eb242c5f5d Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Aug 2015 12:08:14 +0100 Subject: [PATCH 08/19] 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 ba76edfdf85f1cf44f952994cf4ede1b550e0fe7 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Aug 2015 12:08:38 +0100 Subject: [PATCH 09/19] 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 98e948125fd4f294bea478e0c5ed2af06e0b3af4 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Aug 2015 12:59:23 +0100 Subject: [PATCH 10/19] Removed other talk files --- source/_layouts/talk.twig | 25 ------------------------- templates/talk.md | 11 ----------- 2 files changed, 36 deletions(-) delete mode 100644 source/_layouts/talk.twig delete mode 100644 templates/talk.md diff --git a/source/_layouts/talk.twig b/source/_layouts/talk.twig deleted file mode 100644 index bac5d931..00000000 --- a/source/_layouts/talk.twig +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "default.twig" %} - -{% block body_classes 'page--talks page--talks__talk' %} - -{% block content_wrapper %} -
-

{{ page.title }}

- -

At {{ page.location }} on {{ page.date|date(site.default_date_format) }}.

- - {{ page.blocks.content|raw }} - - {% if page.joindin %} -

- Rate this talk -

- {% endif %} - - {% if page.slides_embed %} -
- {{ page.slides_embed|raw }} -
- {% endif %} -
-{% endblock content_wrapper %} diff --git a/templates/talk.md b/templates/talk.md deleted file mode 100644 index 3d340ad6..00000000 --- a/templates/talk.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: -location: -slug: -tags: - - - - -slides: -slides_embed: -draft: true ---- From 637895143b6860551c51cc4c81159c6c23c5dbb7 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Aug 2015 13:09:41 +0100 Subject: [PATCH 11/19] Updated talks --- source/talks.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/talks.twig b/source/talks.twig index 6593b937..b2b28fc4 100644 --- a/source/talks.twig +++ b/source/talks.twig @@ -5,15 +5,15 @@ 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: 2013-07-10, location: SWDUG (South Wales Drupal user group), 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-07-02, location: Drupal Bristol user group, 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 } + - { date: 2015-08-25, location: umBristol (Umbraco Bristol user group), 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 } --- From a973beb87473f71ce7bfa38be13a2a3238c3f346 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Aug 2015 15:13:05 +0100 Subject: [PATCH 12/19] Added location link --- source/_partials/talk_listing_item.twig | 7 +++++-- source/talks.twig | 14 +++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/source/_partials/talk_listing_item.twig b/source/_partials/talk_listing_item.twig index 7efebb74..3607391f 100644 --- a/source/_partials/talk_listing_item.twig +++ b/source/_partials/talk_listing_item.twig @@ -5,8 +5,11 @@ {% else %} {{ talk.date|date('F') }} {% endif %} - - {{ talk.location }} - - {% if talk.title_link %}{% endif %} + - + {% if talk.location_link %}{% endif %} + {{ talk.location }} + {% if talk.location_link %}{% endif %} + - {% if talk.title_link %}{% endif %} {{ talk.title }} {% if talk.title_link %}{% endif %} diff --git a/source/talks.twig b/source/talks.twig index b2b28fc4..3b74b5f5 100644 --- a/source/talks.twig +++ b/source/talks.twig @@ -4,17 +4,17 @@ 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: 2012-09-05, location: Unified Diff, location_link: http://unifieddiff.co.uk, title: "So, What's This Drupal Thing?", title_link: https://vimeo.com/49827006 } - { date: 2013-07-10, location: SWDUG (South Wales Drupal user group), 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-03-01, location: DrupalCamp London, location_link: http://drupalcamplondon.co.uk, 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 user group, 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-01-18, location: DrupalCamp Brighton, location_link: http://www.drupalcampbrighton.co.uk, 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: umBristol (Umbraco Bristol user group), title: Drupal } - - { date: 2015-11-01, location: Accessible Bristol, title: Accessible Drupal, fuzzy_date: true } + - { date: 2015-04-08, location: PHPSW, location_link: http://phpsw.uk, title: Drupal 8, title_suffix: (lightning talk), title_link: https://joind.in/talk/view/14380 } + - { date: 2015-07-25, location: DrupalCamp North, location_link: http://drupalcampnorth.org, title: Test Drive Twig with Sculpin, title_link: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin } + - { date: 2015-08-25, location: umBristol (Umbraco Bristol user group), location_link: http://umbristol.co.uk, title: Drupal } + - { date: 2015-11-01, location: Accessible Bristol, location_link: http://www.accessiblebristol.org.uk, 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' %} From 81ca00358901e5745932a94e1f1ca4f89be5cf0a Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Aug 2015 21:03:16 +0100 Subject: [PATCH 13/19] Updated umBristol talk --- source/talks.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/talks.twig b/source/talks.twig index 3b74b5f5..ab5ecb99 100644 --- a/source/talks.twig +++ b/source/talks.twig @@ -13,7 +13,7 @@ talks: - { date: 2015-02-28, location: DrupalCamp London, title: "Drupal.org in 2015: What's Coming Next" } - { date: 2015-04-08, location: PHPSW, location_link: http://phpsw.uk, title: Drupal 8, title_suffix: (lightning talk), title_link: https://joind.in/talk/view/14380 } - { date: 2015-07-25, location: DrupalCamp North, location_link: http://drupalcampnorth.org, title: Test Drive Twig with Sculpin, title_link: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin } - - { date: 2015-08-25, location: umBristol (Umbraco Bristol user group), location_link: http://umbristol.co.uk, title: Drupal } + - { date: 2015-08-25, location: umBristol (Umbraco Bristol user group), location_link: http://umbristol.co.uk, title: Dancing for Drupal (CMS Dance-Off) } - { date: 2015-11-01, location: Accessible Bristol, location_link: http://www.accessiblebristol.org.uk, title: Accessible Drupal, fuzzy_date: true } - { date: 2015-11-01, location: Unified Diff, title: Building Static Websites with Sculpin, fuzzy_date: true } --- From 6b4b215f486bd635a473779c9e2e3c974e04cf18 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Aug 2015 22:35:39 +0100 Subject: [PATCH 14/19] Updated talk listing item --- source/_partials/talk_listing_item.twig | 33 +++++++++++++++---------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/source/_partials/talk_listing_item.twig b/source/_partials/talk_listing_item.twig index 3607391f..5139f625 100644 --- a/source/_partials/talk_listing_item.twig +++ b/source/_partials/talk_listing_item.twig @@ -1,17 +1,24 @@ -
  • {% spaceless %} +
  • - {% if not talk.fuzzy_date %} - {{ talk.date|date('jS F') }} - {% else %} + {% if talk.fuzzy_date %} {{ talk.date|date('F') }} + {% else %} + {{ talk.date|date('jS F') }} {% endif %} - - {% if talk.location_link %}{% endif %} - {{ talk.location }} - {% if talk.location_link %}{% endif %} - - {% if talk.title_link %}{% endif %} - {{ talk.title }} - {% if talk.title_link %}{% endif %} - - {{ talk.title_suffix }} -{% endspaceless %}
    • + {% if talk.location_link %} + + {% endif %} + {{ talk.location }} + {% if talk.location_link %} + + {% endif %} + - + {% if talk.title_link %} + + {% endif %} + {{ talk.title }} + {% if talk.title_link %} + + {% endif %} + From 673a9d598f6bdf1daa82835791d1e50c8cb8f525 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Aug 2015 22:56:49 +0100 Subject: [PATCH 15/19] Added suffixes --- source/_partials/talk_listing_item.twig | 2 ++ source/talks.twig | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/source/_partials/talk_listing_item.twig b/source/_partials/talk_listing_item.twig index 5139f625..f3eb4ade 100644 --- a/source/_partials/talk_listing_item.twig +++ b/source/_partials/talk_listing_item.twig @@ -13,6 +13,7 @@ {% if talk.location_link %} {% endif %} + {{ talk.location_suffix }} - {% if talk.title_link %} @@ -21,4 +22,5 @@ {% if talk.title_link %} {% endif %} + {{ talk.title_suffix }} diff --git a/source/talks.twig b/source/talks.twig index ab5ecb99..de58f40c 100644 --- a/source/talks.twig +++ b/source/talks.twig @@ -13,7 +13,7 @@ talks: - { date: 2015-02-28, location: DrupalCamp London, title: "Drupal.org in 2015: What's Coming Next" } - { date: 2015-04-08, location: PHPSW, location_link: http://phpsw.uk, title: Drupal 8, title_suffix: (lightning talk), title_link: https://joind.in/talk/view/14380 } - { date: 2015-07-25, location: DrupalCamp North, location_link: http://drupalcampnorth.org, title: Test Drive Twig with Sculpin, title_link: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin } - - { date: 2015-08-25, location: umBristol (Umbraco Bristol user group), location_link: http://umbristol.co.uk, title: Dancing for Drupal (CMS Dance-Off) } + - { date: 2015-08-25, location: umBristol, location_suffix: (Umbraco Bristol user group), location_link: http://umbristol.co.uk, title: Dancing for Drupal, title_suffix: (CMS Dance-Off), title_link: https://speakerdeck.com/opdavies/umbristol-dancing-for-drupal } - { date: 2015-11-01, location: Accessible Bristol, location_link: http://www.accessiblebristol.org.uk, title: Accessible Drupal, fuzzy_date: true } - { date: 2015-11-01, location: Unified Diff, title: Building Static Websites with Sculpin, fuzzy_date: true } --- From 3e7875f3081d78660b801cf9aeed9df11c9cb8c0 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Aug 2015 23:40:50 +0100 Subject: [PATCH 16/19] Refactored talks --- source/_partials/talk_listing_item.twig | 21 ++------------------- source/talks.twig | 16 ++++++++-------- 2 files changed, 10 insertions(+), 27 deletions(-) diff --git a/source/_partials/talk_listing_item.twig b/source/_partials/talk_listing_item.twig index f3eb4ade..ee691bf6 100644 --- a/source/_partials/talk_listing_item.twig +++ b/source/_partials/talk_listing_item.twig @@ -1,26 +1,9 @@
  • - + {% spaceless %} {% if talk.fuzzy_date %} {{ talk.date|date('F') }} {% else %} {{ talk.date|date('jS F') }} {% endif %} - - - {% if talk.location_link %} - - {% endif %} - {{ talk.location }} - {% if talk.location_link %} - - {% endif %} - {{ talk.location_suffix }} - - - {% if talk.title_link %} - - {% endif %} - {{ talk.title }} - {% if talk.title_link %} - - {% endif %} - {{ talk.title_suffix }} + {% endspaceless %} - {{ talk.location|raw }} - {{ talk.title|raw }}
    • diff --git a/source/talks.twig b/source/talks.twig index de58f40c..6a266b01 100644 --- a/source/talks.twig +++ b/source/talks.twig @@ -4,17 +4,17 @@ 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, location_link: http://unifieddiff.co.uk, title: "So, What's This Drupal Thing?", title_link: https://vimeo.com/49827006 } + - { date: 2012-09-05, location: Unified Diff, title: 'So, What’s This Drupal Thing?' } - { date: 2013-07-10, location: SWDUG (South Wales Drupal user group), title: Drupal and the LDAP Module } - - { date: 2014-03-01, location: DrupalCamp London, location_link: http://drupalcamplondon.co.uk, 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 user group, title: drush make drupalbristol, title_link: https://speakerdeck.com/opdavies/drush-make-drupalbristol } + - { date: 2014-03-01, location: DrupalCamp London, title: 'Never Commit to Master: An Introduction to Git Flow' } + - { date: 2014-07-02, location: Drupal Bristol user group, title: drush make drupalbristol } - { date: 2014-08-19, location: SWDUG, title: About the Drupal Association } - - { date: 2015-01-18, location: DrupalCamp Brighton, location_link: http://www.drupalcampbrighton.co.uk, title: "Drupal.org in 2015: What's Coming Next" } + - { 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, location_link: http://phpsw.uk, title: Drupal 8, title_suffix: (lightning talk), title_link: https://joind.in/talk/view/14380 } - - { date: 2015-07-25, location: DrupalCamp North, location_link: http://drupalcampnorth.org, title: Test Drive Twig with Sculpin, title_link: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin } - - { date: 2015-08-25, location: umBristol, location_suffix: (Umbraco Bristol user group), location_link: http://umbristol.co.uk, title: Dancing for Drupal, title_suffix: (CMS Dance-Off), title_link: https://speakerdeck.com/opdavies/umbristol-dancing-for-drupal } - - { date: 2015-11-01, location: Accessible Bristol, location_link: http://www.accessiblebristol.org.uk, title: Accessible Drupal, fuzzy_date: true } + - { date: 2015-04-08, location: PHPSW, title: Drupal 8 (lightning talk) } + - { date: 2015-07-25, location: DrupalCamp North, title: Test Drive Twig with Sculpin } + - { date: 2015-08-25, location: 'umBristol (Bristol Umbraco user group)', title: 'Dancing for Drupal (CMS Dance-Off)' } + - { 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' %} From 6b66d298cec7422f921bc5aa55255d35ccb8afb2 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Aug 2015 23:43:06 +0100 Subject: [PATCH 17/19] Added links --- source/talks.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/talks.twig b/source/talks.twig index 6a266b01..b2b774f3 100644 --- a/source/talks.twig +++ b/source/talks.twig @@ -5,9 +5,9 @@ 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?' } - - { date: 2013-07-10, location: SWDUG (South Wales Drupal user group), title: Drupal and the LDAP Module } + - { date: 2013-07-10, location: SWDUG (South Wales Drupal user group), title: Drupal and the LDAP Module } - { date: 2014-03-01, location: DrupalCamp London, title: 'Never Commit to Master: An Introduction to Git Flow' } - - { date: 2014-07-02, location: Drupal Bristol user group, title: drush make drupalbristol } + - { date: 2014-07-02, location: Drupal Bristol user group, title: 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" } From ef0bb9b08d24092e2d6e33aa5c614bfd2a54ccbe Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Aug 2015 23:50:30 +0100 Subject: [PATCH 18/19] Different syntax --- app/config/sculpin_site.yml | 50 ++++++++----------------------------- 1 file changed, 11 insertions(+), 39 deletions(-) diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index 00ef5746..8ed735e4 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -36,47 +36,19 @@ apple_touch_icon_sizes: [ 57, 114, 72, 144, 60, 120, 76, 152 ] favicon_sizes: [ 160, 96, 32, 16 ] main_menu: - - title: Services - href: /services/ - - title: Testimonials - href: /testimonials/ - - title: Talks - href: /talks/ - - title: Blog - href: /blog/ - - title: Contact - href: /contact/ + - { title: Services, href: /services/ } + - { title: Testimonials, href: /testimonials/ } + - { title: Talks, href: /talks/ } + - { title: Blog, href: /blog/ } + - { title: Contact, href: /contact/ } meetups: - swdug: - name: SWDUG - logo: swdug.png - url: http://swdug.org.uk - - drupalbristol: - name: Drupal Bristol - logo: drupal-bristol.jpeg - url: https://groups.drupal.org/bristol-west-uk - - phpsw: - name: PHPSW - logo: phpsw.jpeg - url: http://phpsw.uk - - swlug: - name: SWLUG - logo: swlug.png - url: http://swlug.org.uk - - accbristol: - name: Accessible Bristol - logo: accessible-bristol.png - url: http://www.accessiblebristol.org.uk - - udiff: - name: Unified Diff - logo: unified-diff.png - url: http://unifieddiff.co.uk + swdug: { name: SWDUG, logo: swdug.png, url: http://swdug.org.uk } + drupalbristol: { name: Drupal Bristol, logo: drupal-bristol.jpeg, url: https://groups.drupal.org/bristol-west-uk } + phpsw: { name: PHPSW, logo: phpsw.jpeg, url: http://phpsw.uk } + swlug: { name: SWLUG, logo: swlug.png, url: http://swlug.org.uk } + accbristol: { name: Accessible Bristol, logo: accessible-bristol.png, url: http://www.accessiblebristol.org.uk } + udiff: { name: Unified Diff, logo: unified-diff.png, url: http://unifieddiff.co.uk } hightlightjs_style: default digitalocean_referral: a913b4b00d4a From 8c5feef6512cf7750dee1b7b0a7a6ef6d0e1e9e4 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 30 Aug 2015 20:01:45 +0100 Subject: [PATCH 19/19] Renamed and updated Experience --- app/config/sculpin_site.yml | 2 +- source/{services.md => experience.md} | 23 +++++++++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) rename source/{services.md => experience.md} (62%) diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index 8ed735e4..44883620 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -36,7 +36,7 @@ apple_touch_icon_sizes: [ 57, 114, 72, 144, 60, 120, 76, 152 ] favicon_sizes: [ 160, 96, 32, 16 ] main_menu: - - { title: Services, href: /services/ } + - { title: Experience, href: /experience/ } - { title: Testimonials, href: /testimonials/ } - { title: Talks, href: /talks/ } - { title: Blog, href: /blog/ } diff --git a/source/services.md b/source/experience.md similarity index 62% rename from source/services.md rename to source/experience.md index aa7f3dd9..b320de7c 100644 --- a/source/services.md +++ b/source/experience.md @@ -1,13 +1,13 @@ --- layout: default -title: Services +title: Experience meta: description: 'Information about freelance services that Oliver offers.' --- -{% block body_classes 'page--services' %} +{% block body_classes 'page--experience' %} {% block content %} -# Services +# Experience ## Drupal @@ -17,19 +17,30 @@ meta: [COD](http://usecod.io) (the conference organising distribution). * Custom module development including integration with third party APIs. * Front-end and theme development using [SASS](http://sass-lang.com) and [Compass](http://compass-style.org). -* eCommerce using [Drupal Commerce](http://drupalcommerce.org) (I've also used [Ubercart](http://ubercart.org) with -Drupal 6). +* eCommerce using [Ubercart](http://ubercart.org) in Drupal 6, and [Drupal Commerce](http://drupalcommerce.org) in Drupal 7. * CRM integration including [CiviCRM](http://civicrm.org) and [SugarCRM](www.sugarcrm.com). * Content and data migration using the [Migrate framework](http://www.drupal.org/migrate). * Ad-hoc and ongoing support and maintenance of Drupal sites, including security updates. * [Git](http://git-scm.com) setup and training. +## Symfony + +* An intermediate knowledge of object-oriented PHP. +* An introductory knowledge of [Symfony](https://symfony.com/) full-stack framework and [Silex](http://silex.sensiolabs.org/). +* Use of [Composer](https://getcomposer.org/doc/00-intro.md#introduction) and Symfony components such as [Guzzle](https://packagist.org/packages/guzzlehttp/guzzle) in non-Drupal projects. +* Use of [Twig](http://twig.sensiolabs.org/) in Symfony, Drupal 8 and Sculpin projects. + +## Static sites + +* Development of sites using [Jekyll](http://jekyllrb.com/), hosted on [GitHub Pages](https://pages.github.com/). +* Development of sites using [Sculpin](https://sculpin.io). These have mainly been self-hosted and served via Nginx. + ## System Administration * [CentOS](http://www.centos.org), [RHEL](http://www.redhat.com/en/technologies/linux-platforms/enterprise-linux) and [Ubuntu](http://www.ubuntu.com/server) server configuration, including [Apache](http://apache.org), [Nginx](http://nginx.org), [PHP](http://php.net), [MySQL](http://mysql.com) and [MariaDB](https://mariadb.org). -* Server configuration and management using [Puppet](http://puppetlabs.com) and/or [Ansible](http://www.ansible.com). +* Server configuration and management using [Puppet](http://puppetlabs.com) or [Ansible](http://www.ansible.com) (preferred). * Continuous integration using [Jenkins](http://jenkins-ci.org). * Virtual machine setup using [Vagrant](http://vagrantup.com) for development or server testing. * Domain name and DNS management.