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
diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml
index 00ef5746..44883620 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: Experience, href: /experience/ }
+ - { 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
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/source/_partials/talk_listing_item.twig b/source/_partials/talk_listing_item.twig
index 3bfa5992..ee691bf6 100644
--- a/source/_partials/talk_listing_item.twig
+++ b/source/_partials/talk_listing_item.twig
@@ -1,12 +1,9 @@
-{% spaceless %}
-
- {% if not talk.fuzzy_date %}
- {{ talk.date|date('jS F') }}
- {% else %}
+
+ {% spaceless %}
+ {% if talk.fuzzy_date %}
{{ talk.date|date('F') }}
+ {% else %}
+ {{ talk.date|date('jS F') }}
{% endif %}
- - {{ talk.location }} -
-
- {{ talk.title }}
-
-{% endspaceless %}
+ {% endspaceless %} - {{ talk.location|raw }} - {{ talk.title|raw }}
+
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
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.
diff --git a/source/talks.html.twig b/source/talks.twig
similarity index 51%
rename from source/talks.html.twig
rename to source/talks.twig
index ab892341..b2b774f3 100644
--- a/source/talks.html.twig
+++ b/source/talks.twig
@@ -3,8 +3,19 @@ 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: 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, 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, 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 (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' %}
@@ -17,8 +28,8 @@ use:
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 talks = data.talks|reverse %}
+ {% set now = 'today'|date('U') %}
+ {% set talks = page.talks %}
{% set found = false %}
{% set year = '0' %}
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
----