Merge branch 'fix-templates'

This commit is contained in:
Oliver Davies 2016-05-14 00:56:43 +01:00
commit 3db87dc07e
13 changed files with 107 additions and 172 deletions

View file

@ -1,23 +1,23 @@
<!DOCTYPE html>
<html class="no-js" lang="{{ site.locale }}">
{{ include('head.html.twig') }}
{{ include('head') }}
<body class="{{ page.blocks.body_classes }}">
{{ include('nav.html.twig') }}
{{ include('nav') }}
<div class="container">
<div class="row">
{% block content_wrapper %}
<main class="col-md-9">
{% block content_top %}{% endblock %}
<main class="col-md-9">
{% block content_top %}{% endblock %}
{% block content_wrapper %}
{% block content %}{% endblock %}
{% block content_bottom %}{% endblock %}
</main>
{% endblock %}
{% endblock %}
{% block content_bottom %}{% endblock %}
</main>
{{ include('sidebar.html.twig') }}
{{ include('sidebar') }}
</div>{# .row #}
</div>{# .container #}
{{ include('footer.html.twig') }}
{{ include('footer') }}
</body>
</html>

View file

@ -1,65 +1,42 @@
{% extends 'default.html.twig' %}
{% extends "base" %}
{% block content_wrapper %}
<main class="col-md-9">
<h1 class="page-title">{{ page.title }}</h1>
{% if page.blocks.abstract %}
<div class="abstract">
<h2 class="abstract__title">Abstract</h2>
<div class="abstract__content">
{{ page.blocks.abstract|raw }}
</div>
</div>
{% endif %}
<div class="details">
<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>
</div>
{% if page.blocks.slides %}
<div class="slides">
<h2 class="slides__title">Slides</h2>
<div class="slides__content">
{{ page.blocks.slides|raw }}
</div>
</div>
{% endif %}
{% if page.blocks.video %}
<div class="video">
<h2 class="video__title">Video</h2>
<div class="video__content">
{{ page.blocks.video|raw }}
</div>
</div>
{% endif %}
{% if page.blocks.feedback %}
<div class="feedback">
<h2 class="feedback__title">Feedback</h2>
<div class="feedback__content">
{{ page.blocks.feedback|raw }}
</div>
</div>
{% endif %}
</main>
{% block content_top %}
<h1>{{ page.title }}</h1>
{% endblock %}
{% block body_classes %}page--talk{% endblock %}
{% block content_wrapper %}
{% block content %}{% endblock %}
{% if page.event %}
<h2>Details</h2>
<ul>
<li>
Event:
{% if page.event.website %}<a href="{{ page.event.website }}">{%- endif -%}
{{ page.event.name }}
{%- if page.event.website -%}</a>{%- endif %}
</li>
<li>Date: {{ page.date|date(site.default_date_format) }}</li>
<li>Location: {{ page.event.location }}</li>
</ul>
{% endif %}
{% if page.slides.embed %}
<div class="slides">
<h2 class="slides__title">Slides</h2>
<div class="slides__content">
{{ page.slides.embed|raw }}
</div>
</div>
{% endif %}
{% if page.video.embed %}
<h2>Video</h2>
<div class="embed-container">
{{ page.video.embed|raw }}
</div>
{% endif %}
{% endblock %}

View file

@ -1,18 +1,17 @@
---
nav: talks
title: So, What is This Drupal Thing?
title: So, what is this Drupal thing?
type: meetup
event:
name: Unified Diff
website: http://unifieddiff.co.uk
location: Cardiff, UK
video: https://vimeo.com/49827006
video:
embed: <iframe src="https://player.vimeo.com/video/49827006" width="640" height="360" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
url: https://vimeo.com/49827006
slug: what-is-this-drupal-thing
tags:
- meetup
- drupal
- unified-diff
---
{% block video %}
{{ vimeo('49827006') }}
{% endblock %}

View file

@ -6,8 +6,12 @@ event:
name: DrupalCamp London 2014
website: http://2014.drupalcamplondon.co.uk
location: London, UK
slides: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow
video: https://www.youtube.com/watch?v=T-miCpHxfds
slides:
embed: <script async class="speakerdeck-embed" data-id="201559e0f103013198dd5a5f6f23ab67" data-ratio="1.29456384323641" src="//speakerdeck.com/assets/embed.js"></script>
url: https://speakerdeck.com/opdavies/never-commit-to-master-an-introduction-to-git-flow
video:
embed: <iframe width="560" height="315" src="https://www.youtube.com/embed/T-miCpHxfds" frameborder="0" allowfullscreen></iframe>
url: https://www.youtube.com/watch?v=T-miCpHxfds
tags:
- conference
- drupalcamp

View file

@ -6,7 +6,9 @@ event:
name: Bristol Drupal
website: http://www.drupalbristol.org.uk
location: Bristol, UK
slides: https://speakerdeck.com/opdavies/drush-make-drupalbristol
slides:
embed: <script async class="speakerdeck-embed" data-id="42605700f102013198de5a5f6f23ab67" data-ratio="1.29456384323641" src="//speakerdeck.com/assets/embed.js"></script>
url: https://speakerdeck.com/opdavies/drush-make-drupalbristol
tags:
- meetup
- drupal
@ -14,6 +16,3 @@ tags:
- drush
- drush-make
---
{% block slides %}
{{ speakerdeck('42605700f102013198de5a5f6f23ab67', '1.29456384323641') }}
{% endblock %}

View file

@ -6,8 +6,12 @@ event:
name: PHPSW
website: http://phpsw.uk
location: Bristol, UK
slides: https://speakerdeck.com/opdavies/drupal-8
video: https://www.youtube.com/watch?v=36zCxPrOOzM
slides:
embed: <script async class="speakerdeck-embed" data-id="46ba4ba577d94a32b7abdade610ceb69" data-ratio="1.29456384323641" src="//speakerdeck.com/assets/embed.js"></script>
url: https://speakerdeck.com/opdavies/drupal-8
video:
embed: <iframe width="560" height="315" src="https://www.youtube.com/embed/36zCxPrOOzM" frameborder="0" allowfullscreen></iframe>
url: https://www.youtube.com/watch?v=36zCxPrOOzM
joindin: https://joind.in/talk/view/14380
tags:
- meetup
@ -16,20 +20,6 @@ tags:
- drupal-8
tweets: yes
---
{% 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.
{% endblock %}
{% block slides %}
{{ speakerdeck('46ba4ba577d94a32b7abdade610ceb69', '1.29456384323641') }}
{% endblock %}
{% block video %}
{{ youtube('36zCxPrOOzM') }}
{% endblock %}
{% block feedback %}
{{ tweet('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>') }}
{% endblock %}

View file

@ -6,7 +6,9 @@ event:
name: DrupalCamp North 2015
website: http://drupalcampnorth.org
location: Sunderland, UK
slides: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin
slides:
embed: <script async class="speakerdeck-embed" data-id="54589d2e50a3476a9a75aed809e9edf1" data-ratio="1.77777777777778" src="//speakerdeck.com/assets/embed.js"></script>
url: https://speakerdeck.com/opdavies/test-drive-twig-with-sculpin
code: https://github.com/opdavies/sculpin-demo
tags:
- conference
@ -16,16 +18,11 @@ tags:
- twig
tweets: yes
---
{% 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.
[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.
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.
{% endblock %}
{% block slides %}
{{ speakerdeck('54589d2e50a3476a9a75aed809e9edf1', '1.77777777777778') }}
{% endblock %}
{% block feedback %}
{{ tweet('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>') }}
{% endblock %}
[1]: https://sculpin.io
[2]: http://symfony.com/doc/current/components/index.html
[3]: http://yaml.org
[4]: http://twig.sensiolabs.org

View file

@ -6,15 +6,16 @@ event:
name: umBristol (Bristol Umbraco user group)
website: http://umbristol.co.uk
location: Bristol, UK
slides: https://speakerdeck.com/opdavies/umbristol-dancing-for-drupal
slides:
embed: <script async class="speakerdeck-embed" data-id="ffa9b6dea6dc4a8eb207b9982ed6e1bd" data-ratio="1.33333333333333" src="//speakerdeck.com/assets/embed.js"></script>
url: https://speakerdeck.com/opdavies/umbristol-dancing-for-drupal
tags:
- meetup
- umbristol
- drupal
tweets: yes
---
{% 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.
As part of their [CMS Dance-Off][1], I was selected to speak about Drupal alongside other speakers representing Umbraco, Sitecore and Episerver.
The points to cover were:
@ -27,12 +28,5 @@ The points to cover were:
* What does the future of your CMS look like?
In each point, tried to cover the differences between Drupal core and developing a project using Drupal, as well as between Drupal 7 and Drupal 8, as things like source control and versioning would be approached differently.
{% endblock %}
{% block slides %}
{{ speakerdeck('ffa9b6dea6dc4a8eb207b9982ed6e1bd', '1.33333333333333') }}
{% endblock %}
{% block feedback %}
{{ tweet('<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>') }}
{% endblock %}
[1]: http://www.meetup.com/umBristol/events/223807592

View file

@ -6,7 +6,9 @@ event:
name: PHPSW
website: http://phpsw.uk
location: Bristol, UK
slides: https://speakerdeck.com/opdavies/building-static-websites-with-sculpin
slides:
embed: <script async class="speakerdeck-embed" data-id="6c9c4be1a1344f1291ff13a391674a66" data-ratio="1.37081659973226" src="//speakerdeck.com/assets/embed.js"></script>
url: https://speakerdeck.com/opdavies/building-static-websites-with-sculpin
code: https://github.com/opdavies/sculpin-demo
joindin: https://joind.in/talk/view/15486
tags:
@ -14,23 +16,15 @@ tags:
- phpsw
- sculpin
tweets: yes
video:
embed: <iframe width="560" height="315" src="https://www.youtube.com/embed/aN53arCKZAU" frameborder="0" allowfullscreen></iframe>
url: https://www.youtube.com/watch?v=aN53arCKZAU
---
{% 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.
[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.
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!
You can [view the full slides](/slides/phpsw/building-static-websites-with-sculpin/), including the embedded videos.
{% endblock %}
You can [view the full slides][1], including the embedded videos.
{% block slides %}
{{ speakerdeck('6c9c4be1a1344f1291ff13a391674a66', '1.37081659973226') }}
{% endblock %}
{% block video %}
{{ youtube('aN53arCKZAU') }}
{% endblock %}
{% block feedback %}
{{ tweet('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>') }}
{% endblock %}
[0]: http://sculpin.io
[1]: {{site.url}}/slides/phpsw/building-static-websites-with-sculpin/

View file

@ -14,8 +14,13 @@ tags:
- drupal-8
tweets: yes
code: https://github.com/opdavies/dclondon16-d8-module
slides: https://speakerdeck.com/opdavies/getting-started-with-drupal-8-module-development
slides:
embed: <script async class="speakerdeck-embed" data-id="0041804e52664d12a8e31cd118264813" data-ratio="1.77777777777778" src="//speakerdeck.com/assets/embed.js"></script>
url: https://speakerdeck.com/opdavies/getting-started-with-drupal-8-module-development
date: 2016-03-05 14:00
video:
embed: <iframe width="560" height="315" src="https://www.youtube.com/embed/qO_Wh5WE3VA" frameborder="0" allowfullscreen></iframe>
url: https://www.youtube.com/watch?v=qO_Wh5WE3VA
meta:
og:
title: Getting Started with Drupal 8 Module Development
@ -25,7 +30,6 @@ meta:
height: 540
width: 960
---
{% block abstract %}
New to object-orientated PHP, Symfony or YAML, and want to get started building modules in Drupal 8? This is the session for you!
In this session, well cover:
@ -40,18 +44,3 @@ What we wont be covering:
* Automated testing in PHPUnit or Simpletest.
* Adding third party libraries and external dependencies via Composer.
{% endblock %}
{% block slides %}
{{ speakerdeck('0041804e52664d12a8e31cd118264813', '1.77777777777778') }}
{% endblock %}
{% block video %}
{{ youtube('qO_Wh5WE3VA') }}
{% endblock %}
{% block feedback %}
{{ tweet('<a href="https://twitter.com/opdavies">@opdavies</a> good talk on Getting started with Drupal 8 module development! 😀</p>&mdash; Michael trestianu (@Tresti88) <a href="https://twitter.com/Tresti88/status/706129843134570496">March 5, 2016</a>') }}
{{ tweet('<a href="https://twitter.com/opdavies">@opdavies</a> Great talk. Thanks.</p>&mdash; John Bloomfield (@jbloomfield) <a href="https://twitter.com/jbloomfield/status/706131469148811264">March 5, 2016</a>') }}
{{ tweet('<a href="https://twitter.com/opdavies">@opdavies</a> definitely went well , I learnt from it , as did a others .</p>&mdash; tim marsh (@timmarsh) <a href="https://twitter.com/timmarsh/status/706214342027567104">March 5, 2016</a>') }}
{% endblock %}

View file

@ -12,12 +12,6 @@ tags:
- drupal-vm-generator
- symfony
---
{% block abstract %}
An impromptu lightning talk about the [Drupal VM Generator][1] project.
{% endblock %}
An impromptu lightning talk about the [Drupal VM Generator][0] project.
{% block video %}
{{ youtube('U1pbKAAO2Wo?start=3690') }}
{% endblock %}
[1]: https://github.com/opdavies/drupal-vm-generator
[0]: https://github.com/opdavies/drupal-vm-generator

View file

@ -11,12 +11,10 @@ tags:
- drupal-vm
- drupal-vm-generator
- symfony
slides: https://speakerdeck.com/opdavies/bristol-dug-drupal-vm-generator
slides:
embed: <script async class="speakerdeck-embed" data-id="a27ee1d2bfed4a209dc395fa455acb41" data-ratio="1.37081659973226" src="//speakerdeck.com/assets/embed.js"></script>
url: https://speakerdeck.com/opdavies/bristol-dug-drupal-vm-generator
---
{% block abstract %}
An short talk about the [Drupal VM Generator](https://github.com/opdavies/drupal-vm-generator) project.
{% endblock %}
An short talk about the [Drupal VM Generator][1] project.
{% block slides %}
{{ speakerdeck('a27ee1d2bfed4a209dc395fa455acb41', '1.37081659973226') }}
{% endblock %}
[1]: https://github.com/opdavies/drupal-vm-generator

View file

@ -12,8 +12,8 @@ tags:
- drupal
- drupal-8
---
{% block abstract %}
[Drupal 8](https://www.drupal.org/8) was (finally) released on November 19th 2015, after almost 4 years of work and code commits by over 3,200 different contributors. Whilst its pretty much the same as the Drupal that we know and, hopefully, love, a lot has changed behind the scenes and under the hood!
[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 its pretty much the same as the Drupal that we know and, hopefully, love, a lot has changed behind the scenes and under the hood!
In this talk, I'll highlight some of the new features and improvements in Drupal 8, and discuss some of the benefits to Drupal site builders, themers, and module developers. I'll also talk about some of the non-technical changes and the cultural shift from "not invented here" to "proudly found elsewhere", and how we are rejoining the PHP herd.
{% endblock %}
[0]: https://www.drupal.org/8