From a46909ed3c4154bce1be0282229434e7296ac821 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 5 Sep 2018 23:13:50 +0100
Subject: [PATCH] Re-add book form

---
 data/events.yml                                   |  5 +++++
 package.json                                      |  1 +
 source/_partials/pages/book/signup-form.html.twig |  3 ---
 source/talks.html.twig                            |  4 ++++
 source/test-driven-drupal.md                      | 15 +++++++++++----
 webpack.mix.js                                    |  1 +
 yarn.lock                                         |  4 ++++
 7 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/data/events.yml b/data/events.yml
index af4b1cf1..275c80cb 100644
--- a/data/events.yml
+++ b/data/events.yml
@@ -93,6 +93,11 @@ events:
         name: SWDUG
         location: Cardiff, UK
 
+    talking_drupal:
+        name: Talking Drupal
+        location: Online
+        url: https://www.talkingdrupal.com
+
     umbristol:
         name: umBristol
         location: Bristol, UK
diff --git a/package.json b/package.json
index f4ff2522..374d6455 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "cross-env": "^5.1.5",
     "font-awesome": "^4.7.0",
     "highlightjs": "^9.10.0",
+    "jquery": "^3.3.1",
     "laravel-mix": "^2.1.11",
     "laravel-mix-purgecss": "^2.1.2",
     "laravel-mix-tailwind": "^0.1.0",
diff --git a/source/_partials/pages/book/signup-form.html.twig b/source/_partials/pages/book/signup-form.html.twig
index 31fef018..6c759447 100644
--- a/source/_partials/pages/book/signup-form.html.twig
+++ b/source/_partials/pages/book/signup-form.html.twig
@@ -16,6 +16,3 @@
         </div>
     </form>
 </div>
-
-<link href="//cdn-images.mailchimp.com/embedcode/classic-10_7.css" rel="stylesheet" type="text/css">
-<script type='text/javascript' src='//s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js'></script><script type='text/javascript'>(function($) {window.fnames = new Array(); window.ftypes = new Array();fnames[0]='EMAIL';ftypes[0]='email';fnames[1]='FNAME';ftypes[1]='text';}(jQuery));var $mcj = jQuery.noConflict(true);</script>
diff --git a/source/talks.html.twig b/source/talks.html.twig
index 21df37ff..512709d3 100644
--- a/source/talks.html.twig
+++ b/source/talks.html.twig
@@ -15,6 +15,10 @@ talks:
       type: Workshop
       events:
           - { event: drupal_bristol, date: '2018-06-27' }
+    - title: 'Episode #175 - Automated Testing'
+      type: Podcast
+      events:
+          - { event: talking_drupal, date: '2018-09-05' }
 ---
 {% block content %}
     <p>
diff --git a/source/test-driven-drupal.md b/source/test-driven-drupal.md
index f7ec24bf..f046820b 100644
--- a/source/test-driven-drupal.md
+++ b/source/test-driven-drupal.md
@@ -4,6 +4,7 @@ title: 'Test Driven Drupal: The Book'
 mailchimp_url: 'https://oliverdavi.us18.list-manage.com/subscribe/post?u=b4ac8dd177796d37b93f9c285&amp;id=033c84e0d5'
 contact_email: 'oliver@testdrivendrupal.com'
 ---
+{% block content %}
 <div class="markdown" markdown="1">
 Having [given talks][1] and [written blog posts][0] about automated testing in Drupal, I’m currently in the planning phase of a book and potentially some accompanying screencasts about it, focussing on Drupal 8.
 
@@ -42,8 +43,14 @@ If you have questions or would like to suggest something for me to include in th
 Enter your email address to subscribe to the Test Driven Drupal mailing list.
 </div>
 
-<!-- {% include 'pages/book/signup-form' %} -->
+{% include 'pages/book/signup-form' %}
+{% endblock %}
 
-[0]: {{site.url}}/blog/tags/testing
-[1]: {{site.url}}/talks/tdd-test-driven-drupal
-[2]: {{site.url}}/contact
+{% block scripts %}
+<script type='text/javascript' src='//s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js'></script>
+<script type='text/javascript'>(function($) {window.fnames = new Array(); window.ftypes = new Array();fnames[0]='EMAIL';ftypes[0]='email';fnames[1]='FNAME';ftypes[1]='text';}(jQuery));var $mcj = jQuery.noConflict(true);</script>
+{% endblock %}
+
+[0]: /blog/tags/testing
+[1]: /talks/tdd-test-driven-drupal
+[2]: /contact
diff --git a/webpack.mix.js b/webpack.mix.js
index 5a73330b..c8e4173f 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -7,6 +7,7 @@ mix.disableNotifications()
     .sass('assets/sass/app.sass', 'source/dist/css')
     .js([
         // 'node_modules/highlightjs/highlight.pack.js',
+        'node_modules/jquery/dist/jquery.js',
         'assets/js/app.js',
     ], 'source/dist/js/all.js')
     .copyDirectory('node_modules/font-awesome/fonts', 'source/dist/fonts')
diff --git a/yarn.lock b/yarn.lock
index c57ef628..c74ad864 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3208,6 +3208,10 @@ isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
+jquery@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
+
 js-base64@^2.1.8, js-base64@^2.1.9:
   version "2.4.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"