Updated talks

source/_includes/talk-listing-item.html.twig

@@ -1,11 +1,4 @@
-<strong>{% spaceless %}
+{{ talk.event.name }} -
-    {% if talk.fuzzy_date %}
-        {{ talk.date|date('F') }}
-    {% else %}
-        {{ talk.date|date('jS F') }}
-    {% endif %}
-{% endspaceless %}</strong> - {{ talk.event.name }}
--
 {% if talk.fuzzy_date %}
     {{ talk.title }}
 {% else %}

source/_layouts/talk.html.twig

@@ -4,16 +4,25 @@
     <main class="col-md-9">
         <h1>{{ page.title }}</h1>
 
-        <p>
+        {% if page.blocks.abstract %}
-            At {{ page.event.name }} -
+            <h2>Abstract</h2>
-            {% spaceless %}{% if page.fuzzy_date %}
-                {{ page.date|date(site.fuzzy_date_format) }}
-            {% else %}
-                {{ page.date|date(site.default_date_format) }}
-            {% endif %}{% endspaceless %}.
-        </p>
 
-        {{ page.blocks.content|raw }}
+            {{ page.blocks.abstract|raw }}
+        {% endif %}
+
+        <h2>Details</h2>
+
+        <ul>
+            <li>Event:
+                {% if page.event.website %}
+                    <a href="{{ page.event.website }}">{{ page.event.name }}</a>
+                {% else %}
+                    {{ page.event.name }}
+                {% endif %}
+            </li>
+            <li>Date: {{ page.date|date(site.default_date_format) }}</li>
+            <li>Location: {{ page.event.location }}</li>
+        </ul>
 
         {% if page.blocks.slides %}
             <h2>Slides</h2>
@@ -26,5 +35,11 @@
 
             {{ page.blocks.video|raw }}
         {% endif %}
+
+        {% if page.blocks.feedback %}
+            <h2>Feedback</h2>
+
+            {{ page.blocks.feedback|raw }}
+        {% endif %}
     </main>
 {% endblock %}

source/_talks/2012-09-05-what-is-this-drupal-thing.md

@@ -1,6 +1,7 @@
 ---
 nav: talks
 title: So, What is This Drupal Thing?
+type: meetup
 event:
     name: Unified Diff
     website: http://unifieddiff.co.uk

source/_talks/2013-07-10-drupal-ldap.md

@@ -1,6 +1,7 @@
 ---
 nav: talks
 title: Drupal and the LDAP Module
+type: meetup
 event:
     name: SWDUG (South Wales Drupal user group)
     location: Cardiff, UK

source/_talks/2014-03-01-git-flow.md

@@ -1,6 +1,7 @@
 ---
 nav: talks
 title: Never Commit to Master - An Introduction to Git Flow
+type: conference
 event:
     name: DrupalCamp London 2014
     website: http://2014.drupalcamplondon.co.uk
@@ -14,6 +15,7 @@ tags:
     - git
     - git-flow
 slug: git-flow
+tweets: yes
 ---
 {% block slides %}
 <script async class="speakerdeck-embed" data-id="201559e0f103013198dd5a5f6f23ab67" data-ratio="1.29456384323641" src="//speakerdeck.com/assets/embed.js"></script>
@@ -22,3 +24,13 @@ slug: git-flow
 {% block video %}
 <iframe width="560" height="315" src="https://www.youtube.com/embed/T-miCpHxfds" frameborder="0" allowfullscreen></iframe>
 {% endblock %}
+
+{% block feedback %}
+<blockquote class="twitter-tweet" lang="en"><p lang="en" dir="ltr">Great talk on git flow <a href="https://twitter.com/opdavies">@opdavies</a> <a href="https://twitter.com/hashtag/dclondon?src=hash">#dclondon</a></p>&mdash; CURVE (@CurveAgency) <a href="https://twitter.com/CurveAgency/status/440095250775035904">March 2, 2014</a></blockquote>
+
+<blockquote class="twitter-tweet" lang="en"><p lang="en" dir="ltr">Great presentation by <a href="https://twitter.com/opdavies">@opdavies</a> on git flow at <a href="https://twitter.com/hashtag/dclondon?src=hash">#dclondon</a> very well prepared and presented. <a href="http://t.co/tDINp2Nsbn">pic.twitter.com/tDINp2Nsbn</a></p>&mdash; Greg Franklin (@gfranklin) <a href="https://twitter.com/gfranklin/status/440104311276969984">March 2, 2014</a></blockquote>
+
+<blockquote class="twitter-tweet" lang="en"><p lang="en" dir="ltr"><a href="https://twitter.com/opdavies">@opdavies</a> Thanks for the talk today on git flow. Looking forward to use it. <a href="https://twitter.com/hashtag/drupalcampldn?src=hash">#drupalcampldn</a> <a href="https://twitter.com/hashtag/dclondon?src=hash">#dclondon</a> <a href="https://twitter.com/hashtag/git?src=hash">#git</a></p>&mdash; Drupal Cafe UK (@drupal_cafe) <a href="https://twitter.com/drupal_cafe/status/440119608939278338">March 2, 2014</a></blockquote>
+
+<blockquote class="twitter-tweet" lang="en"><p lang="en" dir="ltr"><a href="https://twitter.com/opdavies">@opdavies</a> <a href="https://twitter.com/DrupalCampLDN">@DrupalCampLDN</a> always had trouble with git. Your talk + Git flow has made it all very easy.</p>&mdash; James Tombs (@jtombs) <a href="https://twitter.com/jtombs/status/440108072078696449">March 2, 2014</a></blockquote>
+{% endblock %}

source/_talks/2014-07-02-drush-make-drupalbristol.md

@@ -1,6 +1,7 @@
 ---
 nav: talks
 title: drush make drupalbristol
+type: meetup
 event:
     name: Bristol Drupal user group
     website: http://drupalbristol.org.uk

source/_talks/2014-08-19-drupal-association.md

@@ -1,6 +1,7 @@
 ---
 nav: talks
 title: About the Drupal Association
+type: meetup
 event:
     name: SWDUG
     location: Cardiff, UK

source/_talks/2015-01-18-drupalorg-2015.md

@@ -1,6 +1,7 @@
 ---
 nav: talks
 title: Drupal.org in 2015: What's Coming Next
+type: conference
 event:
     name: DrupalCamp Brighton 2015
     website: http://www.drupalcampbrighton.co.uk/drupalcamp-brighton-2015

source/_talks/2015-02-28-drupalorg-2015-2.md

@@ -1,6 +1,7 @@
 ---
 nav: talks
 title: Drupal.org in 2015: What's Coming Next
+type: conference
 event:
     name: DrupalCamp London 2015
     website: http://2015.drupalcamplondon.co.uk

source/_talks/2015-04-08-drupal-8.md

@@ -1,6 +1,7 @@
 ---
 nav: talks
 title: Drupal 8
+type: meetup
 event:
     name: PHPSW
     website: http://phpsw.uk
@@ -13,8 +14,9 @@ tags:
     - phpsw
     - drupal
     - drupal-8
+tweets: yes
 ---
-{% block content %}
+{% block abstract %}
 This was a ten minute lightning talk, designed to highlight the major changes coming in Drupal 8.
 
 I categorised the technical changes into groups for site builders, developers and themers, and also highlighted the cultural shift from "not invented here" to "proudly found elsewhere" and the benefits that brings.
@@ -27,3 +29,7 @@ I categorised the technical changes into groups for site builders, developers an
 {% block video %}
 <iframe width="560" height="315" src="https://www.youtube.com/embed/36zCxPrOOzM" frameborder="0" allowfullscreen></iframe>
 {% endblock %}
+
+{% block feedback %}
+<blockquote class="twitter-tweet" lang="en"><p lang="en" dir="ltr">Cool to hear how much new stuff is in <a href="https://twitter.com/drupal">@drupal</a> 8. Integrating with more third party code rather than rolling their own. <a href="https://twitter.com/hashtag/phpsw?src=hash">#phpsw</a></p>&mdash; Tom Robertshaw (@bobbyshaw) <a href="https://twitter.com/bobbyshaw/status/585882859631706114">April 8, 2015</a></blockquote>
+{% endblock %}

source/_talks/2015-07-25-test-drive-twig-with-sculpin.md

@@ -1,6 +1,7 @@
 ---
 nav: talks
 title: Test Drive Twig with Sculpin
+type: conference
 event:
     name: DrupalCamp North 2015
     website: http://drupalcampnorth.org
@@ -13,8 +14,9 @@ tags:
     - drupalcamp-north
     - sculpin
     - twig
+tweets: yes
 ---
-{% block content %}
+{% block abstract %}
 [Sculpin](https://sculpin.io) is a static site generator written in PHP, and based on [Symfony components](http://symfony.com/doc/current/components/index.html). It uses [YAML](http://yaml.org/) and [Twig](http://twig.sensiolabs.org/), which makes it very appealing to Drupal people wanting to learn these in preparation for Drupal 8.
 
 This session covered how to install Sculpin itself, as well as how to use it to build a static site from Markdown, HTML and Twig templates. We also covered Sculpin concepts such as content types, themes and partials, and Twig layouts, blocks and inheritance, as well as some tips and tricks that I've found whilst developing with Sculpin.
@@ -23,3 +25,7 @@ This session covered how to install Sculpin itself, as well as how to use it to
 {% block slides %}
 <script async class="speakerdeck-embed" data-id="54589d2e50a3476a9a75aed809e9edf1" data-ratio="1.77777777777778" src="//speakerdeck.com/assets/embed.js"></script>
 {% endblock %}
+
+{% block feedback %}
+<blockquote class="twitter-tweet" lang="en"><p lang="en" dir="ltr">Twig said &#39;foo&#39;, then Sculpin said &#39;bar&#39;. They agreed to go spaceless ;-)&#10;&#10;Interesting talk by <a href="https://twitter.com/opdavies">@opdavies</a> &#10;<a href="https://twitter.com/hashtag/dcnorth15?src=hash">#dcnorth15</a> <a href="http://t.co/26GmhiCdfJ">http://t.co/26GmhiCdfJ</a></p>&mdash; Stefan van Hooft (@hooftio) <a href="https://twitter.com/hooftio/status/624898550158200832">July 25, 2015</a></blockquote>
+{% endblock %}

source/_talks/2015-08-25-dancing-for-drupal.md

@@ -1,6 +1,7 @@
 ---
 nav: talks
 title: Dancing for Drupal
+type: meetup
 event:
     name: umBristol (Bristol Umbraco user group)
     website: http://umbristol.co.uk
@@ -10,8 +11,9 @@ tags:
     - meetup
     - umbristol
     - drupal
+tweets: yes
 ---
-{% block content %}
+{% block abstract %}
 As part of their [CMS Dance-Off](http://www.meetup.com/umBristol/events/223807592/), I was selected to speak about Drupal alongside other speakers representing Umbraco, Sitecore and Episerver.
 
 The points to cover were:
@@ -30,3 +32,7 @@ In each point, tried to cover the differences between Drupal core and developing
 {% block slides %}
 <script async class="speakerdeck-embed" data-id="ffa9b6dea6dc4a8eb207b9982ed6e1bd" data-ratio="1.33333333333333" src="//speakerdeck.com/assets/embed.js"></script>
 {% endblock %}
+
+{% block feedback %}
+<blockquote class="twitter-tweet" lang="en"><p lang="en" dir="ltr"><a href="https://twitter.com/opdavies">@opdavies</a> <a href="https://twitter.com/Horls">@Horls</a> <a href="https://twitter.com/mhwelander">@mhwelander</a> <a href="https://twitter.com/ThisisZone">@ThisisZone</a> <a href="https://twitter.com/mozzy16">@mozzy16</a> Thanks for a top night of knowledge sharing! <a href="https://twitter.com/hashtag/drupal?src=hash">#drupal</a> <a href="https://twitter.com/hashtag/episerver?src=hash">#episerver</a> <a href="https://twitter.com/hashtag/sitecore?src=hash">#sitecore</a> <a href="https://twitter.com/hashtag/umbraco?src=hash">#umbraco</a> <a href="https://twitter.com/hashtag/h5yr?src=hash">#h5yr</a></p>&mdash; umBristol (@umBristol) <a href="https://twitter.com/umBristol/status/636290498362216449">August 25, 2015</a></blockquote>
+{% endblock %}

source/_talks/2015-10-14-sculpin.md

@@ -1,6 +1,7 @@
 ---
 nav: talks
 title: Building Static Websites with Sculpin
+type: meetup
 event:
     name: PHPSW
     website: http://phpsw.uk
@@ -12,8 +13,9 @@ tags:
     - meetups
     - phpsw
     - sculpin
+tweets: yes
 ---
-{% block content %}
+{% block abstract %}
 [Sculpin](http://sculpin.io) 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.
 
 This talk will cover a little of the background to Sculpin and what it is, and then will move into some demonstrations of how to build a Sculpin site and what it can do!
@@ -24,3 +26,11 @@ The full version of the slides are available at <https://opdavies.github.io/slid
 {% block slides %}
 <script async class="speakerdeck-embed" data-id="6c9c4be1a1344f1291ff13a391674a66" data-ratio="1.37081659973226" src="//speakerdeck.com/assets/embed.js"></script>
 {% endblock %}
+
+{% block video %}
+This talk was recorded. Video coming soon.
+{% endblock %}
+
+{% block feedback %}
+<blockquote class="twitter-tweet" lang="en"><p lang="en" dir="ltr">Simple and very cool use of video in <a href="https://twitter.com/opdavies">@opdavies</a> lightning talk <a href="https://twitter.com/phpsw">@phpsw</a> to show how to do things</p>&mdash; Stuart Herbert (@stuherbert) <a href="https://twitter.com/stuherbert/status/654367259339661312">October 14, 2015</a></blockquote>
+{% endblock %}