diff --git a/assets/sass/pages/_talk.sass b/assets/sass/pages/_talk.sass index bbf57ca5..e5dfbfdd 100644 --- a/assets/sass/pages/_talk.sass +++ b/assets/sass/pages/_talk.sass @@ -1,7 +1,20 @@ .talk-location, .talk-slides, -.talk-video - margin-bottom: 1.5em +.talk-video, +.talk-description + margin-bottom: 2em .talk-pager + clear: both margin-top: 2em + +.talk-pager div + flex: 1 + +.talk-logo + float: right + margin: 0 0 2em 2em + +.talk-logo img + max-height: 100px + max-width: 200px diff --git a/source/_partials/talk/logo.twig b/source/_partials/talk/logo.twig new file mode 100644 index 00000000..9fa6d4db --- /dev/null +++ b/source/_partials/talk/logo.twig @@ -0,0 +1,7 @@ +{% if page.logo %} + +{% endif %} diff --git a/source/_talks/2012-09-05-what-is-this-drupal-thing-unified-diff.md b/source/_talks/2012-09-05-what-is-this-drupal-thing-unified-diff.md index e3eddae5..851e896c 100644 --- a/source/_talks/2012-09-05-what-is-this-drupal-thing-unified-diff.md +++ b/source/_talks/2012-09-05-what-is-this-drupal-thing-unified-diff.md @@ -1,6 +1,7 @@ --- title: So, what is this Drupal thing? location: Unified Diff +logo: assets/images/talks/logos/unified-diff.png logo_link: http://unifieddiff.co.uk video: embed: diff --git a/source/_talks/2013-07-10-drupal-ldap-swdug.md b/source/_talks/2013-07-10-drupal-ldap-swdug.md index f89361ac..71584202 100644 --- a/source/_talks/2013-07-10-drupal-ldap-swdug.md +++ b/source/_talks/2013-07-10-drupal-ldap-swdug.md @@ -7,4 +7,5 @@ tags: - drupal - ldap slug: drupal-ldap +logo: assets/images/talks/logos/swdug.png --- diff --git a/source/_talks/2014-03-01-git-flow-drupalcamp-london-2014.md b/source/_talks/2014-03-01-git-flow-drupalcamp-london-2014.md index 38f9e277..ce1a10aa 100644 --- a/source/_talks/2014-03-01-git-flow-drupalcamp-london-2014.md +++ b/source/_talks/2014-03-01-git-flow-drupalcamp-london-2014.md @@ -1,6 +1,7 @@ --- title: Never Commit to Master - An Introduction to Git Flow location: DrupalCamp London 2014 +logo: assets/images/talks/logos/drupalcamp-london-2014.png logo_link: http://2014.drupalcamplondon.co.uk slides: embed: diff --git a/source/_talks/2014-08-19-drupal-association-swdug.md b/source/_talks/2014-08-19-drupal-association-swdug.md index e7c31e7b..cdf413fc 100644 --- a/source/_talks/2014-08-19-drupal-association-swdug.md +++ b/source/_talks/2014-08-19-drupal-association-swdug.md @@ -7,5 +7,6 @@ tags: - drupal - drupal-association slug: drupal-association +logo: assets/images/talks/logos/swdug.png --- An impromptu talk about the [Drupal Association](https://association.drupal.org), and what I’ve been working on since joining the Engineering team earlier in the year. diff --git a/source/_talks/2015-01-18-drupalorg-2015-drupalcamp-brighton-2015.md b/source/_talks/2015-01-18-drupalorg-2015-drupalcamp-brighton-2015.md index fb1ea39e..abb22f2e 100644 --- a/source/_talks/2015-01-18-drupalorg-2015-drupalcamp-brighton-2015.md +++ b/source/_talks/2015-01-18-drupalorg-2015-drupalcamp-brighton-2015.md @@ -8,4 +8,5 @@ tags: - drupalcamp-brighton - drupal-association slug: drupalorg-2015 +logo: assets/images/talks/logos/drupalcamp-brighton-2015.png --- diff --git a/source/_talks/2015-02-28-drupalorg-2015-drupalcamp-london-2015.md b/source/_talks/2015-02-28-drupalorg-2015-drupalcamp-london-2015.md index f4fd996e..2c39aa3e 100644 --- a/source/_talks/2015-02-28-drupalorg-2015-drupalcamp-london-2015.md +++ b/source/_talks/2015-02-28-drupalorg-2015-drupalcamp-london-2015.md @@ -7,4 +7,5 @@ tags: - drupalcamp - drupalcamp-london - drupal-association +logo: assets/images/talks/logos/drupalcamp-london-2015.png --- diff --git a/source/_talks/2015-04-08-drupal-8-phpsw.md b/source/_talks/2015-04-08-drupal-8-phpsw.md index e7446845..8bd49b64 100644 --- a/source/_talks/2015-04-08-drupal-8-phpsw.md +++ b/source/_talks/2015-04-08-drupal-8-phpsw.md @@ -14,6 +14,8 @@ tags: - drupal - drupal-8 tweets: yes +logo: assets/images/talks/logos/phpsw.png +logo_link: http://phpsw.uk/talks/drupal-8 --- This was a ten minute lightning talk, designed to highlight the major changes coming in Drupal 8. diff --git a/source/_talks/2015-07-25-test-drive-twig-with-sculpin-drupalcamp-north-2015.md b/source/_talks/2015-07-25-test-drive-twig-with-sculpin-drupalcamp-north-2015.md index bd463e97..c9722d20 100644 --- a/source/_talks/2015-07-25-test-drive-twig-with-sculpin-drupalcamp-north-2015.md +++ b/source/_talks/2015-07-25-test-drive-twig-with-sculpin-drupalcamp-north-2015.md @@ -12,6 +12,8 @@ tags: - sculpin - twig tweets: yes +logo: assets/images/talks/logos/drupalcamp-north-2015.png +logo_link: http://drupalcampnorth.org/session/test-drive-twig-sculpin --- [Sculpin][1] is a static site generator written in PHP, and based on [Symfony components][2]. It uses [YAML][3] and [Twig][4], which makes it very appealing to Drupal people wanting to learn these in preparation for Drupal 8. diff --git a/source/_talks/2015-08-25-dancing-for-drupal-umbristol.md b/source/_talks/2015-08-25-dancing-for-drupal-umbristol.md index ee7ad896..07c27087 100644 --- a/source/_talks/2015-08-25-dancing-for-drupal-umbristol.md +++ b/source/_talks/2015-08-25-dancing-for-drupal-umbristol.md @@ -9,6 +9,8 @@ tags: - umbristol - drupal tweets: yes +logo: assets/images/talks/logos/umbristol.jpeg +logo_link: https://www.meetup.com/umBristol/events/223807592 --- As part of their [CMS Dance-Off][1], I was selected to speak about Drupal alongside other speakers representing Umbraco, Sitecore and Episerver. diff --git a/source/_talks/2015-10-14-sculpin-phpsw.md b/source/_talks/2015-10-14-sculpin-phpsw.md index 98c64f88..76990f63 100644 --- a/source/_talks/2015-10-14-sculpin-phpsw.md +++ b/source/_talks/2015-10-14-sculpin-phpsw.md @@ -14,6 +14,8 @@ tweets: yes video: embed: url: https://www.youtube.com/watch?v=aN53arCKZAU +logo: assets/images/talks/logos/phpsw.png +logo_link: http://phpsw.uk/talks/building-static-sites-with-sculpin --- [Sculpin][0] is a static site generator written in PHP. It converts Markdown files, Twig templates and standard HTML into a static HTML site that can be easily deployed. diff --git a/source/_talks/2016-03-05-drupal-8-module-development-drupalcamp-london-2016.md b/source/_talks/2016-03-05-drupal-8-module-development-drupalcamp-london-2016.md index 62482ed3..732df4f1 100644 --- a/source/_talks/2016-03-05-drupal-8-module-development-drupalcamp-london-2016.md +++ b/source/_talks/2016-03-05-drupal-8-module-development-drupalcamp-london-2016.md @@ -24,6 +24,8 @@ meta: type: 'image/png' height: 540 width: 960 +logo: +logo_link: --- New to object-orientated PHP, Symfony or YAML, and want to get started building modules in Drupal 8? This is the session for you! diff --git a/source/_talks/2016-03-09-drupal-vm-generator-nwdug.md b/source/_talks/2016-03-08-drupal-vm-generator-nwdug.md similarity index 74% rename from source/_talks/2016-03-09-drupal-vm-generator-nwdug.md rename to source/_talks/2016-03-08-drupal-vm-generator-nwdug.md index 2ec5ada4..d31dcda3 100644 --- a/source/_talks/2016-03-09-drupal-vm-generator-nwdug.md +++ b/source/_talks/2016-03-08-drupal-vm-generator-nwdug.md @@ -7,6 +7,8 @@ tags: - drupal-vm-generator - meetup - symfony +logo: assets/images/talks/logos/nwdug.jpeg +logo_link: https://www.meetup.com/nwdrupal/events/227586977 --- An impromptu lightning talk about the [Drupal VM Generator][0] project. diff --git a/source/_talks/2016-04-02-drupal-vm-generator-drupal-bristol.md b/source/_talks/2016-04-02-drupal-vm-generator-drupal-bristol.md index cdb8cdd8..9b32c32c 100644 --- a/source/_talks/2016-04-02-drupal-vm-generator-drupal-bristol.md +++ b/source/_talks/2016-04-02-drupal-vm-generator-drupal-bristol.md @@ -10,6 +10,8 @@ tags: slides: embed: url: https://speakerdeck.com/opdavies/bristol-dug-drupal-vm-generator +logo: assets/images/talks/logos/drupal-bristol.jpg +logo_link: https://groups.drupal.org/node/510443 --- An short talk about the [Drupal VM Generator][1] project. diff --git a/source/_talks/2016-06-11-drupal-8-rejoining-the-herd-php-south-coast-2016.md b/source/_talks/2016-06-11-drupal-8-rejoining-the-herd-php-south-coast-2016.md index 43af2940..97f89886 100644 --- a/source/_talks/2016-06-11-drupal-8-rejoining-the-herd-php-south-coast-2016.md +++ b/source/_talks/2016-06-11-drupal-8-rejoining-the-herd-php-south-coast-2016.md @@ -9,6 +9,8 @@ tags: slides: embed: url: https://speakerdeck.com/opdavies/drupal-rejoining-the-herd +logo: assets/images/talks/logos/php-south-coast-2016.png +logo_link: http://2016.phpsouthcoast.co.uk/schedule --- [Drupal 8][0] was (finally) released on November 19th 2015, after almost 4 years of work and code commits by over 3,200 different contributors. Whilst it’s pretty much the same as the Drupal that we know and, hopefully, love, a lot has changed behind the scenes and under the hood! diff --git a/source/_talks/2016-07-23-drupal-vm-meet-symfony-console-drupalcamp-bristol-2016.md b/source/_talks/2016-07-23-drupal-vm-meet-symfony-console-drupalcamp-bristol-2016.md index 8a0394bf..24571fb1 100644 --- a/source/_talks/2016-07-23-drupal-vm-meet-symfony-console-drupalcamp-bristol-2016.md +++ b/source/_talks/2016-07-23-drupal-vm-meet-symfony-console-drupalcamp-bristol-2016.md @@ -1,7 +1,8 @@ --- title: Drupal VM, Meet Symfony Console location: DrupalCamp Bristol 2016 -logo: assets/images/talks/drupalcamp-bristol.png +logo: assets/images/talks/logos/drupalcamp-bristol-2016.png +logo_link: https://www.drupalcampbristol.co.uk tags: - conference - php diff --git a/source/_talks/2016-11-09-drupal-development-with-composer-phpsw.md b/source/_talks/2016-11-09-drupal-development-with-composer-phpsw.md index ddc048ad..37688f48 100644 --- a/source/_talks/2016-11-09-drupal-development-with-composer-phpsw.md +++ b/source/_talks/2016-11-09-drupal-development-with-composer-phpsw.md @@ -10,6 +10,8 @@ slides: video: embed: '' url: https://www.youtube.com/watch?v=Yi_FPI3xHwc +logo: assets/images/talks/logos/phpsw.png +logo_link: http://phpsw.uk/talks/modern-drupal-development-with-composer --- Building a Drupal application? You no longer need to download archives to add new modules or update core, or deal with Drupal specific tools to manage your codebase. diff --git a/source/_talks/2016-11-17-goodbye-drush-make-hello-composer-drupal-bristol.md b/source/_talks/2016-11-17-goodbye-drush-make-hello-composer-drupal-bristol.md index 7cf045b1..15e1e116 100644 --- a/source/_talks/2016-11-17-goodbye-drush-make-hello-composer-drupal-bristol.md +++ b/source/_talks/2016-11-17-goodbye-drush-make-hello-composer-drupal-bristol.md @@ -1,10 +1,18 @@ --- title: Goodbye Drush Make. Hello Composer! location: Drupal Bristol -logo: assets/images/talks/drupalcamp-bristol.png +logo: assets/images/talks/logos/drupal-bristol.jpg +logo_link: https://groups.drupal.org/node/514559 tags: ['meetup', 'drupal', 'composer'] # image: drush-make-is-dead-long-live-composer.png slides: url: http://bit.ly/slides-goodbye-drush-make-hello-composer2 embed: '' --- +One of the main outcomes of Drupal 8 was “getting off the island” with third-party code included in core and adopting modern best practices from the wider PHP ecosystem - including [Composer][1], PHP’s dependency manager. + +Included to manage core’s dependencies, it has also gained traction in the contrib space with the creation of the Drupal Composer project, and the Drupal Packagist and now native endpoints on Drupal.org exposing contrib project metadata. + +In this session, I'll show how to fully manage a Drupal 7 or Drupal 8 website including contributed modules and themes and external libraries with Composer. + +[1]: https://getcomposer.org diff --git a/source/_talks/2017-01-18-getting-your-data-into-drupal-8-drupal-bristol.md b/source/_talks/2017-01-18-getting-your-data-into-drupal-8-drupal-bristol.md index 03da36ec..a4a96d79 100644 --- a/source/_talks/2017-01-18-getting-your-data-into-drupal-8-drupal-bristol.md +++ b/source/_talks/2017-01-18-getting-your-data-into-drupal-8-drupal-bristol.md @@ -1,6 +1,8 @@ --- title: Getting (Your Data) Into Drupal 8 location: Drupal Bristol +logo: assets/images/talks/logos/drupal-bristol.jpg +logo_link: https://groups.drupal.org/node/515718 tags: ['meetup', 'drupal', 'drupal-8'] slides: url: https://speakerdeck.com/opdavies/getting-your-data-into-drupal-8-drupal-bristol diff --git a/source/_talks/2017-02-08-it-all-started-with-a-patch-phpsw.md b/source/_talks/2017-02-08-it-all-started-with-a-patch-phpsw.md index 8cac7d91..9d29ef9f 100644 --- a/source/_talks/2017-02-08-it-all-started-with-a-patch-phpsw.md +++ b/source/_talks/2017-02-08-it-all-started-with-a-patch-phpsw.md @@ -5,5 +5,7 @@ tags: [meetup, phpsw, open-source] slides: url: https://speakerdeck.com/opdavies/it-all-started-with-a-patch-phpsw embed: +logo: assets/images/talks/logos/phpsw.png +logo_link: http://phpsw.uk/talks/it-started-with-a-patch --- A crash course of why and how to get involved with open source. diff --git a/source/_talks/2017-02-16-deploying-php-with-fabric-nomad-php.md b/source/_talks/2017-02-16-deploying-php-with-fabric-nomad-php.md index 7249e149..282da72a 100644 --- a/source/_talks/2017-02-16-deploying-php-with-fabric-nomad-php.md +++ b/source/_talks/2017-02-16-deploying-php-with-fabric-nomad-php.md @@ -6,4 +6,10 @@ slides: url: ~ embed: ~ draft: true +logo: assets/images/talks/logos/nomad-php.png --- +You’ve built your application, and now you just need to deploy it. There are various ways that this could be done – from (S)FTP, to SCP and rsync, to running commands like “git pull” and “composer install” directly on the server (not recommended). + +My favourite deployment tool of late is Fabric – a Python based command line tool for running commands locally as well as on remote servers. It’s language and framework agnostic, and unopinionated so you define the steps and workflow that you need – from a basic few-step deployment to a full Capistrano style zero-downtime deployment. + +This talk will cover some introduction to Fabric and how to write your own fabfiles, and then look at some examples of different use case deployments for your PHP project. diff --git a/source/_talks/2017-03-04-getting-your-data-into-drupal-8-drupalcamp-london-2017.md b/source/_talks/2017-03-04-getting-your-data-into-drupal-8-drupalcamp-london-2017.md index 913bc9d4..6b67e2ff 100644 --- a/source/_talks/2017-03-04-getting-your-data-into-drupal-8-drupalcamp-london-2017.md +++ b/source/_talks/2017-03-04-getting-your-data-into-drupal-8-drupalcamp-london-2017.md @@ -5,6 +5,8 @@ tags: [] slides: url: ~ embed: ~ +logo: assets/images/talks/logos/drupalcamp-london-2017.png +logo_link: http://drupalcamp.london/session/getting-your-data-drupal-8 --- If you’ve moved a site from Drupal 6 to 7, the chances are that you’ve either used the upgrade path to update your old site in-place, or you built a new site from scratch and used the Migrate module from contrib to migrate your data from the old database. diff --git a/source/_talks/2017-03-04-test-driven-drupal-simpletest-phpunit-drupalcamp-london-2017.md b/source/_talks/2017-03-04-test-driven-drupal-simpletest-phpunit-drupalcamp-london-2017.md index 5c83d6c8..56cf95e3 100644 --- a/source/_talks/2017-03-04-test-driven-drupal-simpletest-phpunit-drupalcamp-london-2017.md +++ b/source/_talks/2017-03-04-test-driven-drupal-simpletest-phpunit-drupalcamp-london-2017.md @@ -6,6 +6,8 @@ tags: [] slides: url: ~ embed: ~ +logo: assets/images/talks/logos/drupalcamp-london-2017.png +logo_link: http://drupalcamp.london/session/test-driven-drupal-development-simpletest-and-phpunit --- Testing is important. Why? It allows developers to add new features and edit and refactor existing code without the worry of adding regressions, reduces the reliance on manual testing to discover bugs, and by taking a test driven approach, your implementation code is leaner as you only write what is needed for your tests to pass. diff --git a/source/_talks/_template b/source/_talks/_template deleted file mode 100644 index 26280371..00000000 --- a/source/_talks/_template +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: -event: - name: - website: - location: -tags: [] -slides: - url: ~ - embed: ~ ---- diff --git a/source/_views/talk.twig b/source/_views/talk.twig index 883bedff..82a5a53d 100644 --- a/source/_views/talk.twig +++ b/source/_views/talk.twig @@ -9,7 +9,9 @@ {% include 'talk/slides' %} {% include 'talk/video' %} -
+
+ {% include 'talk/logo' %} + {% block content %}{% endblock %}
diff --git a/source/assets/images/talks/logos/drupal-bristol.jpg b/source/assets/images/talks/logos/drupal-bristol.jpg new file mode 100644 index 00000000..26f9ebe3 Binary files /dev/null and b/source/assets/images/talks/logos/drupal-bristol.jpg differ diff --git a/source/assets/images/talks/logos/drupalcamp-brighton-2015.png b/source/assets/images/talks/logos/drupalcamp-brighton-2015.png new file mode 100644 index 00000000..aeef43dd Binary files /dev/null and b/source/assets/images/talks/logos/drupalcamp-brighton-2015.png differ diff --git a/source/assets/images/talks/drupalcamp-bristol.png b/source/assets/images/talks/logos/drupalcamp-bristol-2016.png similarity index 100% rename from source/assets/images/talks/drupalcamp-bristol.png rename to source/assets/images/talks/logos/drupalcamp-bristol-2016.png diff --git a/source/assets/images/talks/logos/drupalcamp-london-2014.png b/source/assets/images/talks/logos/drupalcamp-london-2014.png new file mode 100644 index 00000000..18ef8fbb Binary files /dev/null and b/source/assets/images/talks/logos/drupalcamp-london-2014.png differ diff --git a/source/assets/images/talks/logos/drupalcamp-london-2015.png b/source/assets/images/talks/logos/drupalcamp-london-2015.png new file mode 100644 index 00000000..4d079b45 Binary files /dev/null and b/source/assets/images/talks/logos/drupalcamp-london-2015.png differ diff --git a/source/assets/images/talks/logos/drupalcamp-london-2017.png b/source/assets/images/talks/logos/drupalcamp-london-2017.png new file mode 100644 index 00000000..24d36f81 Binary files /dev/null and b/source/assets/images/talks/logos/drupalcamp-london-2017.png differ diff --git a/source/assets/images/talks/logos/drupalcamp-north-2015.png b/source/assets/images/talks/logos/drupalcamp-north-2015.png new file mode 100644 index 00000000..83161181 Binary files /dev/null and b/source/assets/images/talks/logos/drupalcamp-north-2015.png differ diff --git a/source/assets/images/talks/logos/nomad-php.png b/source/assets/images/talks/logos/nomad-php.png new file mode 100644 index 00000000..ccb4fd81 Binary files /dev/null and b/source/assets/images/talks/logos/nomad-php.png differ diff --git a/source/assets/images/talks/logos/nwdug.jpeg b/source/assets/images/talks/logos/nwdug.jpeg new file mode 100644 index 00000000..af06a2ec Binary files /dev/null and b/source/assets/images/talks/logos/nwdug.jpeg differ diff --git a/source/assets/images/talks/logos/php-south-coast-2016.png b/source/assets/images/talks/logos/php-south-coast-2016.png new file mode 100644 index 00000000..5f024905 Binary files /dev/null and b/source/assets/images/talks/logos/php-south-coast-2016.png differ diff --git a/source/assets/images/talks/logos/phpsw.png b/source/assets/images/talks/logos/phpsw.png new file mode 100644 index 00000000..b9b92f88 Binary files /dev/null and b/source/assets/images/talks/logos/phpsw.png differ diff --git a/source/assets/images/talks/logos/swdug.png b/source/assets/images/talks/logos/swdug.png new file mode 100644 index 00000000..73a5593f Binary files /dev/null and b/source/assets/images/talks/logos/swdug.png differ diff --git a/source/assets/images/talks/logos/umbristol.jpeg b/source/assets/images/talks/logos/umbristol.jpeg new file mode 100644 index 00000000..b1e0b4f0 Binary files /dev/null and b/source/assets/images/talks/logos/umbristol.jpeg differ diff --git a/source/assets/images/talks/logos/unified-diff.png b/source/assets/images/talks/logos/unified-diff.png new file mode 100644 index 00000000..46808b28 Binary files /dev/null and b/source/assets/images/talks/logos/unified-diff.png differ