From 54f5ff58140b5d4098b2a18cc48f13a57f606fe9 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 5 Sep 2017 20:05:10 +0100 Subject: [PATCH 1/5] WIP --- app/data/events.yml | 13 +++++++++ source/_talks/deploying-drupal-fabric.md | 29 +++++++++++++++++++ source/_talks/deploying-php-with-fabric.md | 2 +- .../test-driven-drupal-simpletest-phpunit.md | 2 +- source/talks.md | 2 +- 5 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 source/_talks/deploying-drupal-fabric.md diff --git a/app/data/events.yml b/app/data/events.yml index ec3b62203..2bd0bb682 100644 --- a/app/data/events.yml +++ b/app/data/events.yml @@ -15,6 +15,11 @@ events: location: Bristol, UK website: https://2016.drupalcampbristol.org.uk + drupalcamp-dublin-17: + name: DrupalCamp Dublin 2017 + location: Dublin, Ireland + website: http://2017.drupal.ie + drupalcamp-london-14: name: DrupalCamp London 2014 location: London, UK @@ -195,3 +200,11 @@ events: date: '2017-10-01' time: '09:00 - 09:45' talk: deploying-php-with-fabric + + - event: drupalcamp-dublin-17 + date: '2017-10-20' + talk: deploying-drupal-fabric + + - event: drupalcamp-dublin-17 + date: '2017-10-20' + talk: test-driven-drupal-simpletest-phpunit diff --git a/source/_talks/deploying-drupal-fabric.md b/source/_talks/deploying-drupal-fabric.md new file mode 100644 index 000000000..e3cef26b3 --- /dev/null +++ b/source/_talks/deploying-drupal-fabric.md @@ -0,0 +1,29 @@ +--- +id: deploying-drupal-fabric +title: 'Deploying Drupal (and anything else) with Fabric' +type: Talk +slides: + url: ~ + embed: ~ +video: + embed: ~ + url: ~ +tags: [meetup, conference, php, fabric, drupal] +meta: + og: + title: Deploying PHP Applcations with Fabric + description: "You've built your PHP application, now learn how to deploy it with Fabric." + type: website + image: + url: /assets/images/talks/deploying-php-fabric.png + width: 1280 + height: 800 + type: image/png +--- +You’ve built your website, 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][1] - 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, to then covering some examples and demos of different use case deployments for your Drupal project. + +[1]: http://www.fabfile.org diff --git a/source/_talks/deploying-php-with-fabric.md b/source/_talks/deploying-php-with-fabric.md index 7a9242826..54ff4d040 100644 --- a/source/_talks/deploying-php-with-fabric.md +++ b/source/_talks/deploying-php-with-fabric.md @@ -1,6 +1,6 @@ --- id: deploying-php-with-fabric -title: Deploying PHP Applications with Fabric +title: Deploying PHP Applications (and anything else) with Fabric type: Talk slides: url: https://speakerdeck.com/opdavies/deploying-php-applications-with-fabric diff --git a/source/_talks/test-driven-drupal-simpletest-phpunit.md b/source/_talks/test-driven-drupal-simpletest-phpunit.md index 8daabc008..294bc1a67 100644 --- a/source/_talks/test-driven-drupal-simpletest-phpunit.md +++ b/source/_talks/test-driven-drupal-simpletest-phpunit.md @@ -1,5 +1,5 @@ --- -title: Test Driven Drupal Development with SimpleTest and PHPUnit +title: TDD - Test Driven Drupal type: Talk slides: url: https://speakerdeck.com/opdavies/test-driven-drupal-development-with-simpletest-and-phpunit-drupalcamp-london-17 diff --git a/source/talks.md b/source/talks.md index 6cc77b903..076c89c87 100644 --- a/source/talks.md +++ b/source/talks.md @@ -19,7 +19,7 @@ There is also information about events that I’ve attended and spoken at on my {% for date in site.events.dates %} {% if date.date >= 'today'|date('Y-m-d') %} - {% set upcoming_events = upcoming_events|reverse|merge([{ + {% set upcoming_events = upcoming_events|merge([{ date: date, event: site.events.events[date.event], talks: data.talks, From fde603a76708c82af5a87127fb653f0d11049a87 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 6 Sep 2017 08:54:26 +0100 Subject: [PATCH 2/5] Update talk IDs, use fuzzy dates --- app/data/events.yml | 2 ++ source/_talks/deploying-drupal-fabric.md | 11 +++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/data/events.yml b/app/data/events.yml index fd6c805ac..82f9786d1 100644 --- a/app/data/events.yml +++ b/app/data/events.yml @@ -201,8 +201,10 @@ events: - event: drupalcamp-dublin-17 date: '2017-10-20' + fuzzy_date: yes talk_id: 19 - event: drupalcamp-dublin-17 date: '2017-10-20' + fuzzy_date: yes talk_id: 17 diff --git a/source/_talks/deploying-drupal-fabric.md b/source/_talks/deploying-drupal-fabric.md index e3cef26b3..e34589b03 100644 --- a/source/_talks/deploying-drupal-fabric.md +++ b/source/_talks/deploying-drupal-fabric.md @@ -1,5 +1,5 @@ --- -id: deploying-drupal-fabric +talk_id: 19 title: 'Deploying Drupal (and anything else) with Fabric' type: Talk slides: @@ -11,14 +11,9 @@ video: tags: [meetup, conference, php, fabric, drupal] meta: og: - title: Deploying PHP Applcations with Fabric - description: "You've built your PHP application, now learn how to deploy it with Fabric." + title: Deploying Drupal with Fabric + description: "You've built your Drupal site, now learn how to deploy it with Fabric." type: website - image: - url: /assets/images/talks/deploying-php-fabric.png - width: 1280 - height: 800 - type: image/png --- You’ve built your website, 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). From 05efae551cdf70ef55f2e0fbcd70740e5ac1730a Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 7 Sep 2017 11:54:32 +0100 Subject: [PATCH 3/5] Set td background colour for headings --- source/_includes/talks-table.html.twig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/_includes/talks-table.html.twig b/source/_includes/talks-table.html.twig index 9a863d43d..9ba493471 100644 --- a/source/_includes/talks-table.html.twig +++ b/source/_includes/talks-table.html.twig @@ -1,17 +1,17 @@ -
+
- + {% if not talk_page %} - + {% endif %} - + {% if not upcoming %} - + {% endif %} From 56955f605695f8094091facf9fa16fe5b91e6708 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 7 Sep 2017 12:00:34 +0100 Subject: [PATCH 4/5] Shorten titles --- source/_talks/deploying-drupal-fabric.md | 2 +- source/_talks/deploying-php-fabric.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/_talks/deploying-drupal-fabric.md b/source/_talks/deploying-drupal-fabric.md index e34589b03..83c033e71 100644 --- a/source/_talks/deploying-drupal-fabric.md +++ b/source/_talks/deploying-drupal-fabric.md @@ -1,6 +1,6 @@ --- talk_id: 19 -title: 'Deploying Drupal (and anything else) with Fabric' +title: 'Deploying Drupal with Fabric' type: Talk slides: url: ~ diff --git a/source/_talks/deploying-php-fabric.md b/source/_talks/deploying-php-fabric.md index 9ba71e37a..85f72fbb2 100644 --- a/source/_talks/deploying-php-fabric.md +++ b/source/_talks/deploying-php-fabric.md @@ -1,6 +1,6 @@ --- talk_id: 18 -title: Deploying PHP Applications (and anything else) with Fabric +title: Deploying PHP Applications with Fabric slides: url: https://speakerdeck.com/opdavies/deploying-php-applications-with-fabric embed: '' From c627a9889080ef24e00755f502ecd519a34630bc Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 7 Sep 2017 19:51:49 +0100 Subject: [PATCH 5/5] Fix column widths --- source/_includes/nav.html.twig | 2 +- source/_layouts/default.html.twig | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/_includes/nav.html.twig b/source/_includes/nav.html.twig index 5f74f0a5f..3c1bc91ec 100644 --- a/source/_includes/nav.html.twig +++ b/source/_includes/nav.html.twig @@ -1,4 +1,4 @@ -
+
diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig index 7fcc20d84..fe094e85a 100644 --- a/source/_layouts/default.html.twig +++ b/source/_layouts/default.html.twig @@ -27,17 +27,17 @@ {% include 'nav' %} -
-
+
+
-
+
{% block content_top %}{% endblock %} {% block content_wrapper %}{% block content %}{% endblock %}{% endblock %} {% block content_bottom %}{% endblock %}
{% block sidebar_wrapper %} -
+
{% block sidebar %} {% include 'badges' %} {% include 'availability' %}
DateDateTalkTalkEventEventFeedbackFeedback