Merge branch 'master' into develop

assets/sass/base/_layout.sass

@@ -1,3 +1,6 @@
+.is-centered
+    margin: 0 auto
+
 .is-flex
     display: flex
 

source/_partials/og.twig

@@ -40,3 +40,7 @@
     <meta name="twitter:text:description" content="{{ og.description|raw }}"/>
     <meta name="twitter:site" content="@{{ site.twitter.name }}"/>
 {% endif %}
+
+{% if page.hide_page %}
+    <meta name="robots" content="no-index, no-follow">
+{% endif %}

source/_partials/talks-table.twig

@@ -23,9 +23,13 @@
 
                     {% if not hide_talk %}
                         <td>
-                            <a href="{{ event.talk.url }}">
+                            {% if not event.talk.hide_page %}
+                                <a href="{{ event.talk.url }}">
+                                    {{ event.talk.title }}
+                                </a>
+                            {% else %}
                                 {{ event.talk.title }}
-                            </a>
+                            {% endif %}
 
                             {% if event.talk.type %}
                                 <small class="talk-type">

source/_posts/2017-05-05-fixing-drupal-simpletest-issues-with-docker.md

@@ -73,6 +73,8 @@ Running the tests again with the`--verbose` option, I saw this message appear in
 
 > simplexml_import_dom(): Invalid Nodetype to import
 
+**Update:** I later found that <https://www.drupal.org/docs/7/testing/running-tests-through-command-line#troubleshooting> references this error message, but I didn’t see this page within my original search.
+
 After checking that I had all of the required PHP extensions installed, I ran `docker-compose exec php bash` to connect to the `php` container and ran `curl http://localhost` to check the output. Rather than seeing the HTML for the site, I got this error message:
 
 > curl: (7) Failed to connect to localhost port 80: Connection refused

source/_posts/2017-05-15-drupalcamp-bristol-tickets-sessions-sponsors.md

@@ -0,0 +1,62 @@
+---
+title: DrupalCamp Bristol 2017 - Early Bird Tickets, Call for Sessions, Sponsors
+tags:
+    - drupal
+    - drupal-planet
+    - drupalcamp
+    - drupalcamp-bristol
+meta:
+    og:
+        image:
+            url: /assets/image/blog/drupalcamp-bristol-17-logo.jpg
+            height: 228
+            width: 448
+            type: image/jpg
+        type: website
+slug: drupalcamp-bristol-early-bird-tickets-sessions-sponsors
+---
+{% block excerpt %}
+<img src="/assets/images/blog/drupalcamp-bristol-17-logo.jpg" alt="DrupalCamp Bristol 2017 logo" class="is-centered">
+
+In less than two months time, [DrupalCamp Bristol][0] will be back for our third year! (July seems to come around quicker each year). This is this year’s schedule and venues:
+
++ 30th June - CXO (Business) day - [Watershed][1]
++ 1st July - Developer conference - [University of Bristol, School of Chemistry][2]
++ 2nd July - Contribution sprints - Venue TBC
+{% endblock %}
+
+{% block content %}
+<img src="/assets/images/blog/drupalcamp-bristol-17-logo.jpg" alt="DrupalCamp Bristol 2017 logo" class="is-centered">
+
+In less than two months time, [DrupalCamp Bristol][0] will be back for our third year! (July seems to come around quicker each year). This is this year’s schedule and venues:
+
++ 30th June - CXO (Business) day - [Watershed][1]
++ 1st July - Developer conference - [University of Bristol, School of Chemistry][2]
++ 2nd July - Contribution sprints - Venue TBC
+
+Today we announced [Emma Karayiannis][3] as our Saturday keynote speaker, and we’ll be announcing some of the other speakers later this week.
+
+Not submitted your session yet? The [session submissions][12] are open until May 31st. We’re looking for talks not only on Drupal, but other related topics such as PHP, Symfony, server administration/DevOps, project management, case studies, being human etc. If you want to submit but want to ask something beforehand, please [send us an email][4] or ping us on [Twitter][5].
+
+Not spoken at a DrupalCamp before? No problem. We’re looking for both new and experienced speakers, and have both long (45 minutes) and short (20 minutes) talk slots available.
+
+Not bought your tickets yet? [Early bird tickets][10] for the CXO and conference days are still available! The sprint day tickets are free but limited, so do register for a ticket to claim your place.
+
+We still have [sponsorships opportunities][6] available (big thanks to [Microserve][7], [Deeson][8] and [Proctors][9]) who have already signed up), but be quick if you want to be included in our brochure so that we can get you added before our print deadline! Without our sponsors, putting on this event each year would not be possible.
+
+Any other questions? Take a look at [our website][0] or get in touch via [Twitter][5] or [email][11].
+{% endblock %}
+
+[0]: https://2017.drupalcampbristol.co.uk
+[1]: http://www.watershed.co.uk
+[2]: http://www.bris.ac.uk/chemistry
+[3]: http://emmakarayiannis.com
+[4]: mailto:speakers@drupalcampbristol.co.uk
+[5]: https://twitter.com/DrupalCampBris
+[6]: https://2017.drupalcampbristol.co.uk/sponsorship
+[7]: https://microserve.io
+[8]: https://www.deeson.co.uk
+[9]: http://www.proctors.co.uk
+[10]: https://www.eventbrite.co.uk/e/drupalcamp-bristol-2017-tickets-33574193316#ticket
+[11]: mailto:info@drupalcampbristol.co.uk
+[12]: https://2017.drupalcampbristol.co.uk/#block-dcb2017-page-title

source/_talks/drupal-association.md

@@ -5,5 +5,6 @@ tags: [meetup, swdug, drupal, drupal-association]
 slug: drupal-association
 events:
     - { id: swdug, date: '2014-08-19' }
+hide_page: true
 ---
 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.

source/_talks/drupal-ldap.md

@@ -6,4 +6,5 @@ slug: drupal-ldap
 logo: assets/images/talks/logos/swdug.png
 events:
     - { id: swdug, date: '2013-07-10' }
+hide_page: true
 ---

source/sitemap.xml

@@ -1,6 +1,6 @@
 ---
 permalink: sitemap.xml
-use: [posts]
+use: [posts, talks]
 ---
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
@@ -36,4 +36,14 @@ use: [posts]
     <priority>1.0</priority>
   </url>
   {% endfor %}
+
+  {% for talk in data.talks if not talk.hide_page %}
+  <url>
+    <loc>{{ site.url }}{{ talk.url }}/</loc>
+    <lastmod>{{ talk.date|date('c') }}</lastmod>
+    <changefreq>weekly</changefreq>
+    <priority>1.0</priority>
+  </url>
+  {% endfor %}
+
 </urlset>