From 02843c59dc66cf7118edb818ef2d9f1ad99e9882 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 20 Apr 2015 08:40:36 +0100 Subject: [PATCH 01/32] Added toolkit items --- app/config/sculpin_site.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index 04cf8a294..c8409954d 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -12,3 +12,21 @@ drupalorg: https://www.drupal.org/user/381388 drupalorg_nice: https://www.drupal.org/u/opdavies github: http://github.com/opdavies irc: opdavies + +toolkit: + - title: Drupal + url: https://www.drupal.org + - title: Sculpin + url: http://sculpin.io + - title: Git + url: http://git-scm.com + - title: SASS + url: http://sass-lang.com + - title: Compass + url: http://compass-style.org + - title: Vagrant + url: http://vagrantup.com + - title: Puppet + url: http://en.wikipedia.org/wiki/Puppet_%28software%29 + - title: Jenkins + url: http://jenkins-ci.org \ No newline at end of file From c5aeb02f296c873e395a3e8deddfd56e71fffefb Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 20 Apr 2015 22:26:34 +0100 Subject: [PATCH 02/32] Added Susy and Grunt --- app/config/sculpin_site.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index c8409954d..3933b6f9c 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -24,9 +24,13 @@ toolkit: url: http://sass-lang.com - title: Compass url: http://compass-style.org + - title: Susy + url: http://susy.oddbird.net + - title: Grunt + url: http://gruntjs.com - title: Vagrant url: http://vagrantup.com - title: Puppet url: http://en.wikipedia.org/wiki/Puppet_%28software%29 - title: Jenkins - url: http://jenkins-ci.org \ No newline at end of file + url: http://jenkins-ci.org From 4f6d1a36b22ea60114a5967d7c6bef753d0fc68a Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 10 Apr 2015 21:53:21 +0100 Subject: [PATCH 03/32] Add tags to taxonomies --- app/config/sculpin_kernel.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/config/sculpin_kernel.yml b/app/config/sculpin_kernel.yml index 879757654..f64b02022 100644 --- a/app/config/sculpin_kernel.yml +++ b/app/config/sculpin_kernel.yml @@ -15,6 +15,11 @@ sculpin_content_types: taxonomies: - tags enabled: false + talks: + permalink: talks/:slug_title/ + enabled: false + taxonomies: + - tags testimonials: permalink: testimonials/:slug_title/ layout: default From 9d6923b5cd8482fcd07a738742ca3c1df8ffb206 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 10 Apr 2015 21:53:37 +0100 Subject: [PATCH 04/32] Enabled talks --- app/config/sculpin_kernel.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/config/sculpin_kernel.yml b/app/config/sculpin_kernel.yml index f64b02022..c9e2cc00d 100644 --- a/app/config/sculpin_kernel.yml +++ b/app/config/sculpin_kernel.yml @@ -17,7 +17,6 @@ sculpin_content_types: enabled: false talks: permalink: talks/:slug_title/ - enabled: false taxonomies: - tags testimonials: From 7aca77774c36f0616fd18c5e3af5bcd113a89a65 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 10 Apr 2015 21:57:57 +0100 Subject: [PATCH 05/32] Added PHPSW Drupal 8 --- source/_talks/2015-04-08-drupal-8.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 source/_talks/2015-04-08-drupal-8.md diff --git a/source/_talks/2015-04-08-drupal-8.md b/source/_talks/2015-04-08-drupal-8.md new file mode 100644 index 000000000..05c764a6d --- /dev/null +++ b/source/_talks/2015-04-08-drupal-8.md @@ -0,0 +1,13 @@ +--- +title: Drupal 8 (Lightning Talk) +location: PHPSW +date: 2015-04-08 +slides: https://speakerdeck.com/opdavies/drupal-8 +tags: + - meetup + - phpsw + - drupal + - drupal-8 +meta: + description: 'Everything that you wanted to know about Drupal 8 in ten minutes, but were afraid to ask!' +--- From 7a81c19e9c70cd245ffe43baf7276c64c9ab28cd Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 10 Apr 2015 23:20:40 +0100 Subject: [PATCH 06/32] Added more talks --- .../_talks/2012-09-05-what-is-this-drupal-thing.md | 5 +++++ source/_talks/2013-07-10-ldap.md | 11 +++++++++++ source/_talks/2014-03-01-git-flow.md | 13 +++++++++++++ .../_talks/2014-07-02-drush-make-drupalbristol.md | 13 +++++++++++++ source/_talks/2014-08-19-drupal-association.md | 12 ++++++++++++ .../2015-01-18-drupalorg-2015-whats-coming-next.md | 13 +++++++++++++ .../2015-02-28-drupalorg-2015-whats-coming-next.md | 13 +++++++++++++ source/_talks/2015-04-08-drupal-8.md | 3 ++- 8 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 source/_talks/2012-09-05-what-is-this-drupal-thing.md create mode 100644 source/_talks/2013-07-10-ldap.md create mode 100644 source/_talks/2014-03-01-git-flow.md create mode 100644 source/_talks/2014-07-02-drush-make-drupalbristol.md create mode 100644 source/_talks/2014-08-19-drupal-association.md create mode 100644 source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md create mode 100644 source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.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 new file mode 100644 index 000000000..ad230fbf8 --- /dev/null +++ b/source/_talks/2012-09-05-what-is-this-drupal-thing.md @@ -0,0 +1,5 @@ +--- +title: So, what is this Drupal thing? +location: unified.diff +--- +An introduction to [Drupal](https://www.drupal.org). \ No newline at end of file diff --git a/source/_talks/2013-07-10-ldap.md b/source/_talks/2013-07-10-ldap.md new file mode 100644 index 000000000..53b7df165 --- /dev/null +++ b/source/_talks/2013-07-10-ldap.md @@ -0,0 +1,11 @@ +--- +title: LDAP Integration with Drupal +location: South Wales Drupal User Group +tags: + - user-group + - drupal + - ldap +meta: + description: 'Integrating Drupal with LDAP.' +--- +An overview of the [Drupal LDAP module](https://www.drupal.org/project/ldap) and how I integrated and customised it for a client project. \ No newline at end of file diff --git a/source/_talks/2014-03-01-git-flow.md b/source/_talks/2014-03-01-git-flow.md new file mode 100644 index 000000000..072c4c69e --- /dev/null +++ b/source/_talks/2014-03-01-git-flow.md @@ -0,0 +1,13 @@ +--- +title: Introduction to Git Flow +location: DrupalCamp London 2014 +tags: + - conference + - drupalcamp + - drupalcamp-london + - git + - git-flow +meta: + description: +slug: git-flow +--- diff --git a/source/_talks/2014-07-02-drush-make-drupalbristol.md b/source/_talks/2014-07-02-drush-make-drupalbristol.md new file mode 100644 index 000000000..a697aabfc --- /dev/null +++ b/source/_talks/2014-07-02-drush-make-drupalbristol.md @@ -0,0 +1,13 @@ +--- +title: drush make drupalbristol +location: Drupal Bristol User Group +speakerdeck: https://speakerdeck.com/opdavies/drush-make-drupalbristol +tags: + - user-group + - drupal + - drush + - drush-make +meta: + description: 'An introduction to Drush and Drush Make.' +--- +An introduction to Drush and Drush Make. \ No newline at end of file diff --git a/source/_talks/2014-08-19-drupal-association.md b/source/_talks/2014-08-19-drupal-association.md new file mode 100644 index 000000000..dfe0aefee --- /dev/null +++ b/source/_talks/2014-08-19-drupal-association.md @@ -0,0 +1,12 @@ +--- +title: About the Drupal Association +location: South Wales Drupal User Group +date: 2014-08-19 +tags: + - user-group + - drupal-association +meta: + description: "An impromptu talk about the Drupal Association and I've done there since joining the team." +slug: drupal-association +--- +An impromptu talk about the [Drupal Association](https://assoc.drupal.org) and I've done there since joining the team. \ No newline at end of file diff --git a/source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md b/source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md new file mode 100644 index 000000000..03fb11c95 --- /dev/null +++ b/source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md @@ -0,0 +1,13 @@ +--- +title: Drupal.org in 2015: What's Coming Next +location: DrupalCamp Brighton 2015 +date: 2015-01-18 +tags: + - conference + - drupalcamp + - drupalcamp-brighton + - drupalorg +meta: + description: 'Everything that you wanted to know about Drupal 8 in ten minutes, but were afraid to ask!' +slug: drupalorg-2015 +--- diff --git a/source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.md b/source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.md new file mode 100644 index 000000000..da9f2c0b1 --- /dev/null +++ b/source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.md @@ -0,0 +1,13 @@ +--- +title: Drupal.org in 2015: What's Coming Next +location: DrupalCamp London 2015 +date: 2015-02-28 +tags: + - conference + - drupalcamp + - drupalcamp-london + - drupalorg +meta: + description: 'Everything that you wanted to know about Drupal 8 in ten minutes, but were afraid to ask!' +slug: drupalorg-2015 +--- diff --git a/source/_talks/2015-04-08-drupal-8.md b/source/_talks/2015-04-08-drupal-8.md index 05c764a6d..64d56fa6e 100644 --- a/source/_talks/2015-04-08-drupal-8.md +++ b/source/_talks/2015-04-08-drupal-8.md @@ -1,6 +1,6 @@ --- title: Drupal 8 (Lightning Talk) -location: PHPSW +location: PHPSW date: 2015-04-08 slides: https://speakerdeck.com/opdavies/drupal-8 tags: @@ -10,4 +10,5 @@ tags: - drupal-8 meta: description: 'Everything that you wanted to know about Drupal 8 in ten minutes, but were afraid to ask!' +slug: drupal-8 --- From 4d337d83a5f8c08d7a0b4112e7d6721bb709a901 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 10 Apr 2015 23:20:59 +0100 Subject: [PATCH 07/32] Updated permalink --- app/config/sculpin_kernel.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/config/sculpin_kernel.yml b/app/config/sculpin_kernel.yml index c9e2cc00d..c209271c5 100644 --- a/app/config/sculpin_kernel.yml +++ b/app/config/sculpin_kernel.yml @@ -16,7 +16,8 @@ sculpin_content_types: - tags enabled: false talks: - permalink: talks/:slug_title/ + layout: default + permalink: talks/:year/:month/:day/:slug_title/ taxonomies: - tags testimonials: From fa36a2f61c0fd4ef5e813847ed77475a0ee71a67 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 10 Apr 2015 23:21:29 +0100 Subject: [PATCH 08/32] Replaced talks.md with talks.html.twig --- source/talks.html.twig | 76 +++++++++--------------------------------- 1 file changed, 16 insertions(+), 60 deletions(-) diff --git a/source/talks.html.twig b/source/talks.html.twig index f144f2ce7..782f85a67 100644 --- a/source/talks.html.twig +++ b/source/talks.html.twig @@ -1,68 +1,10 @@ --- layout: default title: Talks -nav: 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 - description: So, what is this Drupal thing? - an introduction to Drupal. - tags: - - user-group - - drupal - - date: 2013-07-10 - location: South Wales Drupal User Group - description: An overview of the Drupal LDAP module and how I customised it for a client project. - tags: - - user-group - - drupal - - ldap - - date: 2014-03-01 - location: DrupalCamp London - description: Never Commit to Master: An Introduction to Git Flow. - tags: - - conference - - drupalcamp - - git - - git-flow - - date: 2014-07-02 - location: Drupal Bristol User Group - description: drush make drupalbristol: An introduction to Drush and Drush Make. - tags: - - user-group - - drush - - drush-make - - date: 2014-08-09 - location: South Wales Drupal User Group - description: An impromptu talk about the Drupal Association and I've done there since joining the team. - tags: - - user-group - - drupal-association - - date: 2015-01-18 - location: DrupalCamp Brighton - description: Drupal.org in 2015: What's coming next? - tags: - - conference - - drupalcamp - - drupalorg - - drupal-association - - date: 2015-02-28 - location: DrupalCamp London - description: Drupal.org in 2015: What's coming next? - tags: - - conference - - drupalcamp - - drupalorg - - drupal-association - - date: 2015-04-08 - location: PHPSW - description: Drupal 8 (lightning talk) - tags: - - user-group - - drupal - - drupal-8 - - phpsw +use: + - talks ---

Talks

@@ -98,3 +40,17 @@ talks: {% if found %} {% endif %} +======= +use: + - talks +--- + +

Talks

+ +
+ {% for talk in data.talks %} +
{{ talk.date|date('F Y') }} - {{ talk.location|raw }}
+
{{ talk.title }}
+ {% endfor %} +
+>>>>>>> Replaced talks.md with talks.html.twig From 9ab6f688773174e166e42724dfa63307c986d8c9 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 10 Apr 2015 23:25:52 +0100 Subject: [PATCH 09/32] Added talk.html.twig --- app/config/sculpin_kernel.yml | 1 - publish.sh | 10 ++++++++++ .../2012-09-05-what-is-this-drupal-thing.md | 1 + source/_talks/2013-07-10-ldap.md | 1 + source/_talks/2014-03-01-git-flow.md | 1 + .../2014-07-02-drush-make-drupalbristol.md | 1 + source/_talks/2014-08-19-drupal-association.md | 1 + ...015-01-18-drupalorg-2015-whats-coming-next.md | 1 + ...015-02-28-drupalorg-2015-whats-coming-next.md | 1 + source/_talks/2015-04-08-drupal-8.md | 1 + source/talks.html.twig | 16 +--------------- .../opdavies/opdavies/_layouts/talk.html.twig | 8 ++++++++ 12 files changed, 27 insertions(+), 16 deletions(-) create mode 100755 publish.sh create mode 100644 source/themes/opdavies/opdavies/_layouts/talk.html.twig diff --git a/app/config/sculpin_kernel.yml b/app/config/sculpin_kernel.yml index c209271c5..48422e29f 100644 --- a/app/config/sculpin_kernel.yml +++ b/app/config/sculpin_kernel.yml @@ -16,7 +16,6 @@ sculpin_content_types: - tags enabled: false talks: - layout: default permalink: talks/:year/:month/:day/:slug_title/ taxonomies: - tags diff --git a/publish.sh b/publish.sh new file mode 100755 index 000000000..acb4551bb --- /dev/null +++ b/publish.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +SERVER_NAME="root@212.111.40.238" +DOCROOT="/var/www/html/oliverdavies.co.uk/htdocs" + +sculpin generate --env=prod +if [ $? -ne 0 ]; then echo "Could not generate the site"; exit 1; fi + +rsync -avze 'ssh' --delete output_prod/ ${SERVER_NAME}:${DOCROOT} +if [ $? -ne 0 ]; then echo "Could not publish the site"; exit 1; fi 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 index ad230fbf8..1c6002361 100644 --- a/source/_talks/2012-09-05-what-is-this-drupal-thing.md +++ b/source/_talks/2012-09-05-what-is-this-drupal-thing.md @@ -1,5 +1,6 @@ --- title: So, what is this Drupal thing? location: unified.diff +nav: talks --- An introduction to [Drupal](https://www.drupal.org). \ No newline at end of file diff --git a/source/_talks/2013-07-10-ldap.md b/source/_talks/2013-07-10-ldap.md index 53b7df165..28ad81d5a 100644 --- a/source/_talks/2013-07-10-ldap.md +++ b/source/_talks/2013-07-10-ldap.md @@ -7,5 +7,6 @@ tags: - ldap meta: description: 'Integrating Drupal with LDAP.' +nav: talks --- An overview of the [Drupal LDAP module](https://www.drupal.org/project/ldap) and how I integrated and customised it for a client project. \ No newline at end of file diff --git a/source/_talks/2014-03-01-git-flow.md b/source/_talks/2014-03-01-git-flow.md index 072c4c69e..2b62f12a8 100644 --- a/source/_talks/2014-03-01-git-flow.md +++ b/source/_talks/2014-03-01-git-flow.md @@ -10,4 +10,5 @@ tags: meta: description: slug: git-flow +nav: talks --- diff --git a/source/_talks/2014-07-02-drush-make-drupalbristol.md b/source/_talks/2014-07-02-drush-make-drupalbristol.md index a697aabfc..c34b48263 100644 --- a/source/_talks/2014-07-02-drush-make-drupalbristol.md +++ b/source/_talks/2014-07-02-drush-make-drupalbristol.md @@ -9,5 +9,6 @@ tags: - drush-make meta: description: 'An introduction to Drush and Drush Make.' +nav: talks --- An introduction to Drush and Drush Make. \ No newline at end of file diff --git a/source/_talks/2014-08-19-drupal-association.md b/source/_talks/2014-08-19-drupal-association.md index dfe0aefee..f47db5ab6 100644 --- a/source/_talks/2014-08-19-drupal-association.md +++ b/source/_talks/2014-08-19-drupal-association.md @@ -8,5 +8,6 @@ tags: meta: description: "An impromptu talk about the Drupal Association and I've done there since joining the team." slug: drupal-association +nav: talks --- An impromptu talk about the [Drupal Association](https://assoc.drupal.org) and I've done there since joining the team. \ No newline at end of file diff --git a/source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md b/source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md index 03fb11c95..31c0450a4 100644 --- a/source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md +++ b/source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md @@ -10,4 +10,5 @@ tags: meta: description: 'Everything that you wanted to know about Drupal 8 in ten minutes, but were afraid to ask!' slug: drupalorg-2015 +nav: talks --- diff --git a/source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.md b/source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.md index da9f2c0b1..fdd100704 100644 --- a/source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.md +++ b/source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.md @@ -10,4 +10,5 @@ tags: meta: description: 'Everything that you wanted to know about Drupal 8 in ten minutes, but were afraid to ask!' slug: drupalorg-2015 +nav: talks --- diff --git a/source/_talks/2015-04-08-drupal-8.md b/source/_talks/2015-04-08-drupal-8.md index 64d56fa6e..b88570ede 100644 --- a/source/_talks/2015-04-08-drupal-8.md +++ b/source/_talks/2015-04-08-drupal-8.md @@ -11,4 +11,5 @@ tags: meta: description: 'Everything that you wanted to know about Drupal 8 in ten minutes, but were afraid to ask!' slug: drupal-8 +nav: talks --- diff --git a/source/talks.html.twig b/source/talks.html.twig index 782f85a67..0d9596c37 100644 --- a/source/talks.html.twig +++ b/source/talks.html.twig @@ -39,18 +39,4 @@ use: {% endfor %} {% if found %} -{% endif %} -======= -use: - - talks ---- - -

Talks

- -
- {% for talk in data.talks %} -
{{ talk.date|date('F Y') }} - {{ talk.location|raw }}
-
{{ talk.title }}
- {% endfor %} -
->>>>>>> Replaced talks.md with talks.html.twig +{% endif %} \ No newline at end of file diff --git a/source/themes/opdavies/opdavies/_layouts/talk.html.twig b/source/themes/opdavies/opdavies/_layouts/talk.html.twig new file mode 100644 index 000000000..00938bc17 --- /dev/null +++ b/source/themes/opdavies/opdavies/_layouts/talk.html.twig @@ -0,0 +1,8 @@ +{% extends 'default' %} + +{% block content_wrapper %} +
+

{{ page.title }}

+ {% block content %}{% endblock %} +
{# .col-md-9 #} +{% endblock %} \ No newline at end of file From eeb2799e8bc32b7d5a08d430f110ca76615fb54c Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 10 Apr 2015 23:27:55 +0100 Subject: [PATCH 10/32] Added slides --- source/_talks/2014-03-01-git-flow.md | 1 + source/_talks/2014-07-02-drush-make-drupalbristol.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/source/_talks/2014-03-01-git-flow.md b/source/_talks/2014-03-01-git-flow.md index 2b62f12a8..0d4beca60 100644 --- a/source/_talks/2014-03-01-git-flow.md +++ b/source/_talks/2014-03-01-git-flow.md @@ -1,6 +1,7 @@ --- title: Introduction to Git Flow location: DrupalCamp London 2014 +slides: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow tags: - conference - drupalcamp diff --git a/source/_talks/2014-07-02-drush-make-drupalbristol.md b/source/_talks/2014-07-02-drush-make-drupalbristol.md index c34b48263..801880925 100644 --- a/source/_talks/2014-07-02-drush-make-drupalbristol.md +++ b/source/_talks/2014-07-02-drush-make-drupalbristol.md @@ -1,7 +1,7 @@ --- title: drush make drupalbristol location: Drupal Bristol User Group -speakerdeck: https://speakerdeck.com/opdavies/drush-make-drupalbristol +slides: https://speakerdeck.com/opdavies/drush-make-drupalbristol tags: - user-group - drupal From 6d21eaf17475070b9979603b0535f06e7fe60367 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 21 Apr 2015 20:20:38 +0100 Subject: [PATCH 11/32] Changed h2 --- source/services.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/services.md b/source/services.md index 7c39531d3..bb339db3f 100644 --- a/source/services.md +++ b/source/services.md @@ -19,7 +19,7 @@ meta: * Ad-hoc and ongoing support and maintenance of Drupal sites, including security updates. * [Git](http://git-scm.com) setup and training. -## Servers +## 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). * Configuration management using [Puppet](http://puppetlabs.com) (preferred) or [Ansible](http://www.ansible.com). From dda4bbbfefc7e086eb412edf3883d73c8df6a5be Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 21 Apr 2015 20:22:45 +0100 Subject: [PATCH 12/32] Removed a letter --- source/index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/index.md b/source/index.md index 3c8a9bbe7..fc8d2ef7e 100644 --- a/source/index.md +++ b/source/index.md @@ -2,10 +2,10 @@ layout: default nav: about meta: - description: 'The personal website and blog of Oliver Davies, a Drupal Developer and Systems Administrator from Wales, UK.' + description: 'The personal website and blog of Oliver Davies, a Drupal Developer and System Administrator from Wales, UK.' og: title: 'Oliver Davies - Drupal Developer' - description: 'The personal website and blog of Oliver Davies, a Drupal Developer and Systems Administrator from Wales, UK.' + description: 'The personal website and blog of Oliver Davies, a Drupal Developer and System Administrator from Wales, UK.' type: website image: url: http://www.oliverdavies.co.uk/assets/images/oliver.jpg @@ -17,7 +17,7 @@ meta: -Oliver Davies is a senior level Web Developer and Systems Administrator based in the UK, who was been working online since 2007. Specialising in PHP and open source technologies, Oliver architects and develops websites using [Drupal](https://www.drupal.org) - a powerful content management framework - and [Sculpin](http://sculpin.io) - a static site generator written in PHP. +Oliver Davies is a senior level Web Developer and System Administrator based in the UK, who was been working online since 2007. Specialising in PHP and open source technologies, Oliver architects and develops websites using [Drupal](https://www.drupal.org) - a powerful content management framework - and [Sculpin](http://sculpin.io) - a static site generator written in PHP. Oliver currently works for the [Drupal Association](https://assoc.drupal.org) and also provides freelance consultancy services for Drupal websites and Linux servers. From e5b4fc797259f60a23a07deb8c7e1a16a6e5ff52 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 22 Apr 2015 01:07:26 +0100 Subject: [PATCH 13/32] Updated subtitle --- app/config/sculpin_site.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index 3933b6f9c..83c66d546 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -1,5 +1,5 @@ title: Oliver Davies -subtitle: Drupal & Linux Specialist +subtitle: Drupal Drupaloper & System Administrator description: Oliver Davies, Drupal Developer url: http://localhost:8000 author: Oliver Davies From 29d12627b14d33e8da749b1b587214e72f9dbe6a Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 22 Apr 2015 01:07:46 +0100 Subject: [PATCH 14/32] Typo --- app/config/sculpin_site.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index 83c66d546..1951d51b6 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -1,5 +1,5 @@ title: Oliver Davies -subtitle: Drupal Drupaloper & System Administrator +subtitle: Drupal Developer & System Administrator description: Oliver Davies, Drupal Developer url: http://localhost:8000 author: Oliver Davies From e90fd643b6e7a58deed980720dd240f9069374c7 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 22 Apr 2015 21:39:13 +0100 Subject: [PATCH 15/32] Added Ansible link --- source/services.md | 1 + 1 file changed, 1 insertion(+) diff --git a/source/services.md b/source/services.md index bb339db3f..51a702671 100644 --- a/source/services.md +++ b/source/services.md @@ -24,5 +24,6 @@ meta: * [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). * Configuration management using [Puppet](http://puppetlabs.com) (preferred) or [Ansible](http://www.ansible.com). * Continuous integration using [Jenkins](http://jenkins-ci.org). +* Server deployment using [Ansible](http://www.ansible.com). * Virtual machine setup using [Vagrant](http://vagrantup.com) for development or server testing. * Domain name and DNS management. \ No newline at end of file From 2b5b210794e89bc7249a527d4ac48886c2eeec18 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 22 Apr 2015 21:40:51 +0100 Subject: [PATCH 16/32] Added favicon --- source/favicon.ico | Bin 0 -> 5430 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 source/favicon.ico diff --git a/source/favicon.ico b/source/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..bfa1c996f26cb47776b27da40f151c71e637b715 GIT binary patch literal 5430 zcmZQzU}Ruo5D);-3Je)63=C=v3=9ei5dI1Q28KQs1_liV1_l9;I0HnSfk;s6#~|Jv z&QR4G!LX@2oZ;!r9L4vGD$UOI$MMZ*31U#fXH0iEgL`Kf!-Kv^hW{YEZA$e2BP*-_ zZ|n{De{gB(|0OkMUphh=s<4^S6~^G)7s2qSFN*2^!ZO|e%WBO3gUpzkEbxC-v*Z8y z#Tx%-W=a2_oXGcoa;hYX8Pnq!v=^r`eBEBi@c;JCrvEVT=JD14`xfN=U)SOFf7h&( z{|ifX{=a>CRrVQ|3Uc6t6MPbaQge_cmFT%oAdwo&u?(C z-E(uc!t}4oVt5473&MAHHp10_82|qL`~T?FlK(5JjsBn6()0iK&+j1N|Hsz0+=uC3 zm&5QEq!)zuRB-*jwkG5M+uQs8-`Uyl|4@qp*j?KS8UD|VXZSxeQ|kZ0B_;nSB?*0k z>0g`8@CT%q5Z+P5@PAq?ByPIH86Ls(ugqY0Nk}hDep4R9|NcmZ|J~sX+hO__Bs1)R z$rD4*PGI=o9>UNL(?2DKLG;G9y1$POPyBzdNgC{5eCEuGXL#Efz#s(E52E)@_M7zc z%j^F?K0Nts`fUB!%8&Dog8@PB$7Ljgz+I^N#vnf&4L`G0?Ye*S-dcMFDoP(00w zXUIj@hs>WE!ytENb?MX3FRuMR(xDDEV@p26|HY{c=cmUq=p(De$6iyVGvU_O%Kxh~ z8NSbmW3a`i7MI+ra^)A(Vi`6wp{6mAL6}%G38^dfWMHiKXQ*!vVYt;34#^{+@&|_J6{`K;Jv;6H zo;ex+ch5=xzogpye@7VO=awLb1x+2QG_2d}KT!hV}opDKX%3xjUTUe{&GS>c&6@CR}!*i#G=`M0JHR z{6sbrFFT3}i#r(MVjw>>2QjQfw+9=)Erh|eD~#cNe-xxloD#$Ee_DzVxV|{Ied7O1 zduM~|jJX9WaPwEUIRC$KY{mb%`O5z%#&P`LH7oW1-g((@`K8sS|F=&|{NEAD(~Zqe zm{?OF1N)>Xh6kXsbY~Hy-Z@Y&{{Q>CN8q{vow$Et`~M}CMqqnZH#_}*eErb>_s?(t zzjbo$|H%nFVDX(ZlmGwz^#iQ+`mt5N8v+GVF@jR=%}HdqhHNj4eSd!sPP5P@UfenPf5-HM|LZ!v{^Roh-#@?qw+1ur zL-sp}y)=#C9n4N-dS8v;|L^ayr$3nee|~-Ye`90e|DDB5{}-en%8Rw_?*HGvxC2uL zre8h02&&_6g6u@bE7CFJ9_Ef?-MarjJ-rClk50U}xE9_Pf~jAX#qb}Le?e)nKbqw~ zC=YQf7$1~} zL1hQX4In%rhVB2fG!bwfX%Aue4YCs%FHK|k2h&R}dTRm0|4Gq^_yD;Bgj<6dJ|No- zV$V&)9sZQKXJalRE~+;#5c&fZ7sGfee<&cEi}S;u+rWuMzxz zuu&4+KE-DqsdDRbAoe!}GMt3jhfYt9W(d5pCj0->6Epwc-BJDj^i;e5yGod-;+FL} z4F5aB7=APaFj%46i_G8A?RXDVPW=4x>i@f2yZ_(WQTzWWw7pKMpOMwC$zu558q6>U z*)DACDKQK}_m0l~3vvUfto!}_!~d5TmjA!JB;xj#UTk)vi%pJZ zFuT61>krHg|Nj2||L*pl|F?vD-LS2I;s2aOhL;ngDC+}&+%Y|oGxzlB%3q**7UYOePtX0oFh2mR{h&6?!eoY@ zQ(_oE4L6iF2FNT*@RDMcZO^Z6|NrIXwg1;vrJ&fqqmbeMq7;T-Q(_oaOo?G&row(5?mJq9ln(C${a7~{c&$6CkGe7YE|9^n-|9=LC|Nj^m?Ef$@ z$p2tq;QzqD!2f`OfgOYoFfcF^!XR}Z4AKX}KNuL~|1dDv|6^dN2bm4F;{p5s|3Bpa S|NmqE|No!*|NsB|{|^8#t#A|o literal 0 HcmV?d00001 From dc10bf3aba72a3173e5bf3200ef3765f93b3ce8f Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 22 Apr 2015 21:51:07 +0100 Subject: [PATCH 17/32] Use gravatar URL --- app/config/sculpin_site.yml | 1 + source/index.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index 1951d51b6..05c8c6f0d 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -4,6 +4,7 @@ description: Oliver Davies, Drupal Developer url: http://localhost:8000 author: Oliver Davies email: oliver@oliverdavies.co.uk +gravatar_url: http://www.gravatar.com/avatar/e0f6adcd63d8393e689b327e978d0887.png twitter: http://twitter.com/opdavies twitter_name: opdavies diff --git a/source/index.md b/source/index.md index fc8d2ef7e..ce139197b 100644 --- a/source/index.md +++ b/source/index.md @@ -15,7 +15,7 @@ meta: --- # About - + Oliver Davies is a senior level Web Developer and System Administrator based in the UK, who was been working online since 2007. Specialising in PHP and open source technologies, Oliver architects and develops websites using [Drupal](https://www.drupal.org) - a powerful content management framework - and [Sculpin](http://sculpin.io) - a static site generator written in PHP. From 5b1c122b84d4e712e89b9ff381583adac9fd0d67 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 22 Apr 2015 22:00:56 +0100 Subject: [PATCH 18/32] Added other Ansible link --- source/work.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/work.md b/source/work.md index 880d685e6..e2353a864 100644 --- a/source/work.md +++ b/source/work.md @@ -29,4 +29,4 @@ Some of the tasks that I've worked on so far: In my spare time, I provide remote freelance consultancy services for Drupal websites and Linux servers. -Services include Drupal site architecture, builds, upgrades and maintenance, custom module development and theming, Linux server administration and configuration management using [Puppet](http://puppetlabs.com), and [Jenkins](http://jenkins-ci.org) continuous integration setup and configuration. \ No newline at end of file +Services include Drupal site architecture, builds, upgrades and maintenance, custom module development and theming, Linux server administration and configuration management using [Puppet](http://puppetlabs.com) and [Ansible](http://www.ansible.com), and [Jenkins](http://jenkins-ci.org) continuous integration setup and configuration. \ No newline at end of file From 2ef3828e1c4a4db59aa33b69697bc465746af3f7 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 23 Apr 2015 09:23:42 +0100 Subject: [PATCH 19/32] Added alt text --- source/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/index.md b/source/index.md index ce139197b..57fb205fa 100644 --- a/source/index.md +++ b/source/index.md @@ -15,7 +15,7 @@ meta: --- # About - +Picture of Oliver Oliver Davies is a senior level Web Developer and System Administrator based in the UK, who was been working online since 2007. Specialising in PHP and open source technologies, Oliver architects and develops websites using [Drupal](https://www.drupal.org) - a powerful content management framework - and [Sculpin](http://sculpin.io) - a static site generator written in PHP. @@ -24,4 +24,4 @@ Oliver currently works for the [Drupal Association](https://assoc.drupal.org) an In his spare time, Oliver contributes to Drupal core and maintains several contrib modules on Drupal.org, is the Git Documentation Maintainer for the Drupal project, and is a provisional member of the [Drupal Security team](https://www.drupal.org/security-team). He attends, organises and [talks](/talks) at user groups, and volunteers and mentors at conferences. He also is a 2nd Degree Black Belt in Tae Kwon-Do and a Brazilian Jiu-Jitsu practitioner. Oliver has active social media profiles on Twitter and LinkedIn, and you can view his code on -Drupal.org and GitHub. \ No newline at end of file +Drupal.org and GitHub. From caf8a3483489d080123f5c4fe26611fd938cd75a Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 25 Apr 2015 07:13:10 +0100 Subject: [PATCH 20/32] Don't use title --- source/themes/opdavies/opdavies/_partials/post-header.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/themes/opdavies/opdavies/_partials/post-header.html.twig b/source/themes/opdavies/opdavies/_partials/post-header.html.twig index cae6dc8ef..220ef9643 100644 --- a/source/themes/opdavies/opdavies/_partials/post-header.html.twig +++ b/source/themes/opdavies/opdavies/_partials/post-header.html.twig @@ -1,4 +1,4 @@ -

{{ page.title | title }}

+

{{ page.title }}

Posted: {{ page.date | date('jS F Y') }}

{# {% if page.tags %} From 225f3c676fc637b997ece6942cd2585a3e351bc4 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 23 Apr 2015 09:13:49 +0100 Subject: [PATCH 21/32] Added bio --- app/config/sculpin_site.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index 05c8c6f0d..f66b9e3d5 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -14,6 +14,9 @@ drupalorg_nice: https://www.drupal.org/u/opdavies github: http://github.com/opdavies irc: opdavies +bio: > +

Oliver Davies is a Drupal Developer and System Administrator based in the UK. He works for the Drupal Association and also provides freelance consultancy services for Drupal websites and Linux servers.

+ toolkit: - title: Drupal url: https://www.drupal.org @@ -34,4 +37,4 @@ toolkit: - title: Puppet url: http://en.wikipedia.org/wiki/Puppet_%28software%29 - title: Jenkins - url: http://jenkins-ci.org + url: http://jenkins-ci.org \ No newline at end of file From 22176e6b70e552cfafbbbfbf875563f4ff3e6112 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 23 Apr 2015 09:15:16 +0100 Subject: [PATCH 22/32] Added about-author.html.twig --- source/themes/opdavies/opdavies/_layouts/post.html.twig | 2 ++ .../opdavies/opdavies/_partials/about-author.html.twig | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 source/themes/opdavies/opdavies/_partials/about-author.html.twig diff --git a/source/themes/opdavies/opdavies/_layouts/post.html.twig b/source/themes/opdavies/opdavies/_layouts/post.html.twig index d711e2338..f7e377dd8 100644 --- a/source/themes/opdavies/opdavies/_layouts/post.html.twig +++ b/source/themes/opdavies/opdavies/_layouts/post.html.twig @@ -13,6 +13,8 @@

{% endif %} + {% include 'about-author' %} + {% if page.next_post or page.previous_post %}
    {% if page.next_post %}
  • Next post: {{ page.next_post.title }}
    • {% endif %} diff --git a/source/themes/opdavies/opdavies/_partials/about-author.html.twig b/source/themes/opdavies/opdavies/_partials/about-author.html.twig new file mode 100644 index 000000000..8fd7a7a16 --- /dev/null +++ b/source/themes/opdavies/opdavies/_partials/about-author.html.twig @@ -0,0 +1,5 @@ +
    +

    About the Author

    + Picture of Oliver +

    {{ site.bio|raw }}

    +
    \ No newline at end of file From 3392828e61e5218a13c168866e53a0e48c561af3 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 25 Apr 2015 14:44:39 +0100 Subject: [PATCH 23/32] Fixed talks page --- source/talks.html.twig | 1 + 1 file changed, 1 insertion(+) diff --git a/source/talks.html.twig b/source/talks.html.twig index 0d9596c37..6f89c3a02 100644 --- a/source/talks.html.twig +++ b/source/talks.html.twig @@ -1,6 +1,7 @@ --- layout: default title: Talks +nav: talks meta: description: 'Information about previous and upcoming talks that Oliver has presented at conferences and user groups' use: From cee66cf2a539ac1e2a8963bc54dce1cc58bc5e3d Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 25 Apr 2015 14:49:33 +0100 Subject: [PATCH 24/32] Use the talks content type --- source/talks.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/talks.html.twig b/source/talks.html.twig index 6f89c3a02..07b7fa1c6 100644 --- a/source/talks.html.twig +++ b/source/talks.html.twig @@ -12,7 +12,7 @@ use:

    I regularly speak at conferences and user groups about a range of subjects relating to Drupal, PHP and web development. If you would like to me to speak at your group or conference, please get in touch.

    {% set now = 'now'|date('U') %} -{% set talks = page.talks|reverse %} +{% set talks = data.talks|reverse %} {% set found = false %} {% for talk in talks if talk.date >= now %} From 34b3e041145a6beeab7ae1d348849a02dad1e5b6 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 25 Apr 2015 15:03:15 +0100 Subject: [PATCH 25/32] Added descriptions --- source/_talks/2012-09-05-what-is-this-drupal-thing.md | 3 ++- source/_talks/2013-07-10-ldap.md | 1 + source/_talks/2014-03-01-git-flow.md | 3 ++- source/_talks/2014-07-02-drush-make-drupalbristol.md | 1 + source/_talks/2014-08-19-drupal-association.md | 2 +- source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md | 3 ++- source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.md | 3 ++- source/_talks/2015-04-08-drupal-8.md | 1 + source/talks.html.twig | 2 +- .../opdavies/opdavies/_partials/talk-listing-item.html.twig | 2 +- 10 files changed, 14 insertions(+), 7 deletions(-) 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 index 1c6002361..50ca232f1 100644 --- a/source/_talks/2012-09-05-what-is-this-drupal-thing.md +++ b/source/_talks/2012-09-05-what-is-this-drupal-thing.md @@ -1,6 +1,7 @@ --- title: So, what is this Drupal thing? -location: unified.diff +location: unified.diff +description: So, what is this Drupal thing? - an introduction to Drupal. nav: talks --- An introduction to [Drupal](https://www.drupal.org). \ No newline at end of file diff --git a/source/_talks/2013-07-10-ldap.md b/source/_talks/2013-07-10-ldap.md index 28ad81d5a..cd34fc957 100644 --- a/source/_talks/2013-07-10-ldap.md +++ b/source/_talks/2013-07-10-ldap.md @@ -1,6 +1,7 @@ --- title: LDAP Integration with Drupal location: South Wales Drupal User Group +description: An overview of the Drupal LDAP module and how I customised it for a client project. tags: - user-group - drupal diff --git a/source/_talks/2014-03-01-git-flow.md b/source/_talks/2014-03-01-git-flow.md index 0d4beca60..5dd518786 100644 --- a/source/_talks/2014-03-01-git-flow.md +++ b/source/_talks/2014-03-01-git-flow.md @@ -1,6 +1,7 @@ --- title: Introduction to Git Flow -location: DrupalCamp London 2014 +location: DrupalCamp London +description: Never Commit to Master: An Introduction to Git Flow. slides: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow tags: - conference diff --git a/source/_talks/2014-07-02-drush-make-drupalbristol.md b/source/_talks/2014-07-02-drush-make-drupalbristol.md index 801880925..381d1acaa 100644 --- a/source/_talks/2014-07-02-drush-make-drupalbristol.md +++ b/source/_talks/2014-07-02-drush-make-drupalbristol.md @@ -1,6 +1,7 @@ --- title: drush make drupalbristol location: Drupal Bristol User Group +description: drush make drupalbristol: An introduction to Drush and Drush Make. slides: https://speakerdeck.com/opdavies/drush-make-drupalbristol tags: - user-group diff --git a/source/_talks/2014-08-19-drupal-association.md b/source/_talks/2014-08-19-drupal-association.md index f47db5ab6..ace4a4130 100644 --- a/source/_talks/2014-08-19-drupal-association.md +++ b/source/_talks/2014-08-19-drupal-association.md @@ -1,7 +1,7 @@ --- title: About the Drupal Association location: South Wales Drupal User Group -date: 2014-08-19 +description: An impromptu talk about the Drupal Association and I've done there since joining the team. tags: - user-group - drupal-association diff --git a/source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md b/source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md index 31c0450a4..9ba461361 100644 --- a/source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md +++ b/source/_talks/2015-01-18-drupalorg-2015-whats-coming-next.md @@ -1,7 +1,8 @@ --- title: Drupal.org in 2015: What's Coming Next -location: DrupalCamp Brighton 2015 +location: DrupalCamp Brighton date: 2015-01-18 +description: Drupal.org in 2015: What's coming next? tags: - conference - drupalcamp diff --git a/source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.md b/source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.md index fdd100704..3a95db209 100644 --- a/source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.md +++ b/source/_talks/2015-02-28-drupalorg-2015-whats-coming-next.md @@ -1,7 +1,8 @@ --- title: Drupal.org in 2015: What's Coming Next -location: DrupalCamp London 2015 +location: DrupalCamp London date: 2015-02-28 +description: Drupal.org in 2015: What's coming next? tags: - conference - drupalcamp diff --git a/source/_talks/2015-04-08-drupal-8.md b/source/_talks/2015-04-08-drupal-8.md index b88570ede..bf6c5a2a1 100644 --- a/source/_talks/2015-04-08-drupal-8.md +++ b/source/_talks/2015-04-08-drupal-8.md @@ -2,6 +2,7 @@ title: Drupal 8 (Lightning Talk) location: PHPSW date: 2015-04-08 +description: Drupal 8 (lightning talk) slides: https://speakerdeck.com/opdavies/drupal-8 tags: - meetup diff --git a/source/talks.html.twig b/source/talks.html.twig index 07b7fa1c6..40cdc65f2 100644 --- a/source/talks.html.twig +++ b/source/talks.html.twig @@ -12,7 +12,7 @@ use:

    I regularly speak at conferences and user groups about a range of subjects relating to Drupal, PHP and web development. If you would like to me to speak at your group or conference, please get in touch.

    {% set now = 'now'|date('U') %} -{% set talks = data.talks|reverse %} +{% set talks = data.talks %} {% set found = false %} {% for talk in talks if talk.date >= now %} diff --git a/source/themes/opdavies/opdavies/_partials/talk-listing-item.html.twig b/source/themes/opdavies/opdavies/_partials/talk-listing-item.html.twig index 341051c44..75890dcf0 100644 --- a/source/themes/opdavies/opdavies/_partials/talk-listing-item.html.twig +++ b/source/themes/opdavies/opdavies/_partials/talk-listing-item.html.twig @@ -1,2 +1,2 @@ -
    {{ talk.date|date('F Y') }} - {{ talk.location }}
    +
    {{ talk.date|date('F Y') }} - {{ talk.location|raw }}
    {{ talk.description|raw }}
    \ No newline at end of file From 1df2dbf0c9d2e1be3c123203b7f18dbd8426db3a Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 25 Apr 2015 15:17:34 +0100 Subject: [PATCH 26/32] Added slides embed code --- source/_talks/2014-03-01-git-flow.md | 1 + source/_talks/2014-07-02-drush-make-drupalbristol.md | 1 + source/_talks/2015-04-08-drupal-8.md | 1 + 3 files changed, 3 insertions(+) diff --git a/source/_talks/2014-03-01-git-flow.md b/source/_talks/2014-03-01-git-flow.md index 5dd518786..25e3ec81e 100644 --- a/source/_talks/2014-03-01-git-flow.md +++ b/source/_talks/2014-03-01-git-flow.md @@ -3,6 +3,7 @@ title: Introduction to Git Flow location: DrupalCamp London description: Never Commit to Master: An Introduction to Git Flow. slides: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow +slides_embed: tags: - conference - drupalcamp diff --git a/source/_talks/2014-07-02-drush-make-drupalbristol.md b/source/_talks/2014-07-02-drush-make-drupalbristol.md index 381d1acaa..fc91beadc 100644 --- a/source/_talks/2014-07-02-drush-make-drupalbristol.md +++ b/source/_talks/2014-07-02-drush-make-drupalbristol.md @@ -3,6 +3,7 @@ title: drush make drupalbristol location: Drupal Bristol User Group description: drush make drupalbristol: An introduction to Drush and Drush Make. slides: https://speakerdeck.com/opdavies/drush-make-drupalbristol +slides_embed: tags: - user-group - drupal diff --git a/source/_talks/2015-04-08-drupal-8.md b/source/_talks/2015-04-08-drupal-8.md index bf6c5a2a1..9f51bc355 100644 --- a/source/_talks/2015-04-08-drupal-8.md +++ b/source/_talks/2015-04-08-drupal-8.md @@ -4,6 +4,7 @@ location: Drupal 8 (lightning talk) slides: https://speakerdeck.com/opdavies/drupal-8 +slides_embed: tags: - meetup - phpsw From 72b48022031df125ec6a1aa7969008f52993f13f Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 25 Apr 2015 15:23:41 +0100 Subject: [PATCH 27/32] Removed extra div --- .../themes/opdavies/opdavies/_layouts/talk.html.twig | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/source/themes/opdavies/opdavies/_layouts/talk.html.twig b/source/themes/opdavies/opdavies/_layouts/talk.html.twig index 00938bc17..7cf58526e 100644 --- a/source/themes/opdavies/opdavies/_layouts/talk.html.twig +++ b/source/themes/opdavies/opdavies/_layouts/talk.html.twig @@ -1,8 +1,12 @@ {% extends 'default' %} {% block content_wrapper %} -
    -

    {{ page.title }}

    - {% block content %}{% endblock %} -
    {# .col-md-9 #} +

    {{ page.title }}

    + {% block content %}{% endblock %} + + {% if page.slides_embed %} +
    + {{ page.slides_embed|raw }} +
    + {% endif %} {% endblock %} \ No newline at end of file From 875b27f14da19ad5b4109fc639aec93891653f7a Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 26 Apr 2015 19:08:19 +0100 Subject: [PATCH 28/32] Ignore publish.sh --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 08c289888..751f12722 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ -/gh-pages-deployment/ /output_*/ /source/components/ /.sculpin/ -.DS_Store +publish.sh From e69d345bea502190cdb421cf946693e848555db7 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 27 Apr 2015 23:27:32 +0100 Subject: [PATCH 29/32] Use body_class --- source/themes/opdavies/opdavies/_layouts/default.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/themes/opdavies/opdavies/_layouts/default.html.twig b/source/themes/opdavies/opdavies/_layouts/default.html.twig index 7d53f2c12..e56be5503 100644 --- a/source/themes/opdavies/opdavies/_layouts/default.html.twig +++ b/source/themes/opdavies/opdavies/_layouts/default.html.twig @@ -13,7 +13,7 @@ {% block styles %}{% endblock %} - + {% include 'navbar' %}
    From 2478d2ebca8606bb4a899abb138c16eb9047efc1 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 30 Apr 2015 22:58:36 +0100 Subject: [PATCH 30/32] Delete .nojekyll --- source/.nojekyll | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 source/.nojekyll diff --git a/source/.nojekyll b/source/.nojekyll deleted file mode 100644 index e69de29bb..000000000 From e52f756a56f616f6927b76081e45be6a1b586a1d Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 30 Apr 2015 22:59:30 +0100 Subject: [PATCH 31/32] Added lanyrd URL --- app/config/sculpin_site.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index f66b9e3d5..38593dab4 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -13,6 +13,7 @@ drupalorg: https://www.drupal.org/user/381388 drupalorg_nice: https://www.drupal.org/u/opdavies github: http://github.com/opdavies irc: opdavies +lanyrd: http://lanyrd.com/profile/opdavies bio: >

    Oliver Davies is a Drupal Developer and System Administrator based in the UK. He works for the Drupal Association and also provides freelance consultancy services for Drupal websites and Linux servers.

    From db3f100ca73bd95c419db16c2effabcd54726527 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 30 Apr 2015 23:01:49 +0100 Subject: [PATCH 32/32] Added joind.in URL --- app/config/sculpin_site.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index 38593dab4..bf1db6748 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -14,6 +14,7 @@ drupalorg_nice: https://www.drupal.org/u/opdavies github: http://github.com/opdavies irc: opdavies lanyrd: http://lanyrd.com/profile/opdavies +joindin: https://joind.in/user/view/27119 bio: >

    Oliver Davies is a Drupal Developer and System Administrator based in the UK. He works for the Drupal Association and also provides freelance consultancy services for Drupal websites and Linux servers.