Update talk page layout

2017-02-19 21:14:22 +00:00 · 2017-02-19 21:14:22 +00:00 · c873cf2321
parent 710d22254c
commit c873cf2321
34 changed files with 82 additions and 121 deletions
--- a/assets/sass/base/_all.sass
+++ b/assets/sass/base/_all.sass
@ -1 +1,3 @@
@import 'code'
+@import 'layout'
+@import 'typography'
--- a/assets/sass/base/_layout.sass
+++ b/assets/sass/base/_layout.sass
@ -0,0 +1,5 @@
+.is-flex
+    display: flex
+
+.is-half
+    width: 50%
--- a/assets/sass/base/_typography.sass
+++ b/assets/sass/base/_typography.sass
@ -0,0 +1,3 @@
+@each $value in 'left' 'center' 'right'
+    .is-#{$value}
+        text-align: #{$value}
--- a/assets/sass/pages/_all.sass
+++ b/assets/sass/pages/_all.sass
@ -3,3 +3,4 @@
@import 'blog-post'
@import 'experience'
@import 'projects'
+@import 'talk'
--- a/assets/sass/pages/_talk.sass
+++ b/assets/sass/pages/_talk.sass
@ -0,0 +1,7 @@
+.talk-location,
+.talk-slides,
+.talk-video
+    margin-bottom: 1.5em
+
+.talk-pager
+    margin-top: 2em
--- a/source/_partials/talk/event.twig
+++ b/source/_partials/talk/event.twig
@ -1,14 +0,0 @@
-{% 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 %}
--- a/source/_partials/talk/location.twig
+++ b/source/_partials/talk/location.twig
@ -0,0 +1,3 @@
+<p class="talk-location">
+    At {{ page.location }} on {{ page.date|date('jS F Y') }}.
+</p>
--- a/source/_partials/talk/slides.twig
+++ b/source/_partials/talk/slides.twig
@ -1,9 +1,5 @@
 {% if page.slides.embed %}
-    <div class="slides">
-        <h2 class="slides__title">Slides</h2>
-
-        <div class="slides__content">
-            {{ page.slides.embed|raw }}
-        </div>
+    <div class="talk-slides">
+        {{ page.slides.embed|raw }}
    </div>
 {% endif %}
--- a/source/_partials/talk/video.twig
+++ b/source/_partials/talk/video.twig
@ -1,7 +1,7 @@
 {% if page.video.embed %}
-    <h2>Video</h2>
-
-    <div class="embed-container">
-        {{ page.video.embed|raw }}
+    <div class="talk-video">
+        <div class="embed-container">
+            {{ page.video.embed|raw }}
+        </div>
    </div>
 {% endif %}
--- a/source/_partials/talks-table.twig
+++ b/source/_partials/talks-table.twig
@ -19,7 +19,7 @@
                    </a>
                </td>

-                <td>{{ talk.event.name }}</td>
+                <td>{{ talk.location }}</td>
            </tr>
        {% endfor %}
    </tbody>
--- a/source/_talks/2012-09-05-what-is-this-drupal-thing-unified-diff.md
+++ b/source/_talks/2012-09-05-what-is-this-drupal-thing-unified-diff.md
@ -1,13 +1,10 @@
 ---
 title: So, what is this Drupal thing?
-event:
-    name: Unified Diff
-    website: http://unifieddiff.co.uk
-    location: Cardiff, UK
+location: Unified Diff
+logo_link: http://unifieddiff.co.uk
 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
--- a/source/_talks/2013-07-10-drupal-ldap-swdug.md
+++ b/source/_talks/2013-07-10-drupal-ldap-swdug.md
@ -1,8 +1,6 @@
 ---
 title: Drupal and the LDAP Module
-event:
-    name: SWDUG (South Wales Drupal user group)
-    location: Cardiff, UK
+location: SWDUG
 tags:
    - meetup
    - swdug
--- a/source/_talks/2014-03-01-git-flow-drupalcamp-london-2014.md
+++ b/source/_talks/2014-03-01-git-flow-drupalcamp-london-2014.md
@ -1,9 +1,7 @@
 ---
 title: Never Commit to Master - An Introduction to Git Flow
-event:
-    name: DrupalCamp London 2014
-    website: http://2014.drupalcamplondon.co.uk
-    location: London, UK
+location: DrupalCamp London 2014
+logo_link: http://2014.drupalcamplondon.co.uk
 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
--- a/source/_talks/2014-07-02-drush-make-drupalbristol-drupal-bristol.md
+++ b/source/_talks/2014-07-02-drush-make-drupalbristol-drupal-bristol.md
@ -1,9 +1,7 @@
 ---
 title: drush make drupalbristol
-event:
-    name: Bristol Drupal
-    website: http://www.drupalbristol.org.uk
-    location: Bristol, UK
+location: Bristol Drupal
+logo_link: http://www.drupalbristol.org.uk
 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
--- a/source/_talks/2014-08-19-drupal-association-swdug.md
+++ b/source/_talks/2014-08-19-drupal-association-swdug.md
@ -1,8 +1,6 @@
 ---
 title: About the Drupal Association
-event:
-    name: SWDUG
-    location: Cardiff, UK
+location: SWDUG
 tags:
    - meetup
    - swdug
--- a/source/_talks/2015-01-18-drupalorg-2015-drupalcamp-brighton-2015.md
+++ b/source/_talks/2015-01-18-drupalorg-2015-drupalcamp-brighton-2015.md
@ -1,9 +1,7 @@
 ---
 title: Drupal.org in 2015: What's Coming Next
-event:
-    name: DrupalCamp Brighton 2015
-    website: http://www.drupalcampbrighton.co.uk/drupalcamp-brighton-2015
-    location: Brighton, UK
+location: DrupalCamp Brighton 2015
+logo_link: http://www.drupalcampbrighton.co.uk/drupalcamp-brighton-2015
 tags:
    - conference
    - drupalcamp
--- a/source/_talks/2015-02-28-drupalorg-2015-drupalcamp-london-2015.md
+++ b/source/_talks/2015-02-28-drupalorg-2015-drupalcamp-london-2015.md
@ -1,9 +1,7 @@
 ---
 title: Drupal.org in 2015: What's Coming Next
-event:
-    name: DrupalCamp London 2015
-    website: http://2015.drupalcamplondon.co.uk
-    location: London, UK
+location: DrupalCamp London 2015
+logo_link: http://2015.drupalcamplondon.co.uk
 tags:
    - conference
    - drupalcamp
--- a/source/_talks/2015-04-08-drupal-8-phpsw.md
+++ b/source/_talks/2015-04-08-drupal-8-phpsw.md
@ -1,9 +1,6 @@
 ---
 title: Drupal 8
-event:
-    name: PHPSW
-    website: http://phpsw.uk
-    location: Bristol, UK
+location: PHPSW
 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
--- a/source/_talks/2015-07-25-test-drive-twig-with-sculpin-drupalcamp-north-2015.md
+++ b/source/_talks/2015-07-25-test-drive-twig-with-sculpin-drupalcamp-north-2015.md
@ -1,9 +1,6 @@
 ---
 title: Test Drive Twig with Sculpin
-event:
-    name: DrupalCamp North 2015
-    website: http://drupalcampnorth.org
-    location: Sunderland, UK
+location: DrupalCamp North 2015
 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
--- a/source/_talks/2015-08-25-dancing-for-drupal-umbristol.md
+++ b/source/_talks/2015-08-25-dancing-for-drupal-umbristol.md
@ -1,9 +1,6 @@
 ---
 title: Dancing for Drupal
-event:
-    name: umBristol (Bristol Umbraco user group)
-    website: http://umbristol.co.uk
-    location: Bristol, UK
+location: umBristol (Bristol Umbraco user group)
 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
--- a/source/_talks/2015-10-14-sculpin-phpsw.md
+++ b/source/_talks/2015-10-14-sculpin-phpsw.md
@ -1,9 +1,6 @@
 ---
 title: Building Static Websites with Sculpin
-event:
-    name: PHPSW
-    website: http://phpsw.uk
-    location: Bristol, UK
+location: PHPSW
 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
--- a/source/_talks/2016-03-05-drupal-8-module-development-drupalcamp-london-2016.md
+++ b/source/_talks/2016-03-05-drupal-8-module-development-drupalcamp-london-2016.md
@ -1,9 +1,6 @@
 ---
 title: Getting Started with Drupal 8 Module Development
-event:
-    name: DrupalCamp London 2016
-    website: http://drupalcamp.london
-    location: London, UK
+location: DrupalCamp London 2016
 tags:
    - conference
    - php
--- a/source/_talks/2016-03-09-drupal-vm-generator-nwdug.md
+++ b/source/_talks/2016-03-09-drupal-vm-generator-nwdug.md
@ -1,9 +1,6 @@
 ---
 title: Drupal VM Generator
-event:
-    name: NWDUG
-    website: http://nwdrupal.org.uk
-    location: Manchester, UK
+location: NWDUG
 code: https://github.com/opdavies/drupal-vm-generator
 tags:
    - drupal-vm
--- a/source/_talks/2016-04-02-drupal-vm-generator-drupal-bristol.md
+++ b/source/_talks/2016-04-02-drupal-vm-generator-drupal-bristol.md
@ -1,9 +1,6 @@
 ---
 title: Drupal VM Generator
-event:
-    name: Drupal Bristol
-    website: https://www.drupalbristol.org.uk
-    location: Bristol, UK
+location: Drupal Bristol
 code: https://github.com/opdavies/drupal-vm-generator
 tags:
    - drupal-vm
--- a/source/_talks/2016-06-11-drupal-8-rejoining-the-herd-php-south-coast-2016.md
+++ b/source/_talks/2016-06-11-drupal-8-rejoining-the-herd-php-south-coast-2016.md
@ -1,9 +1,6 @@
 ---
 title: Drupal 8: Rejoining the Herd
-event:
-    name: PHP South Coast 2016
-    website: http://2016.phpsouthcoast.co.uk
-    location: Portsmouth, UK
+location: PHP South Coast 2016
 tags:
    - conference
    - php
--- a/source/_talks/2016-07-23-drupal-vm-meet-symfony-console-drupalcamp-bristol-2016.md
+++ b/source/_talks/2016-07-23-drupal-vm-meet-symfony-console-drupalcamp-bristol-2016.md
@ -1,10 +1,7 @@
 ---
 title: Drupal VM, Meet Symfony Console
-event:
-    name: DrupalCamp Bristol 2016
-    website: https://www.drupalcampbristol.co.uk
-    location: Bristol, UK
-    logo: assets/images/talks/drupalcamp-bristol.png
+location: DrupalCamp Bristol 2016
+logo: assets/images/talks/drupalcamp-bristol.png
 tags:
    - conference
    - php
--- a/source/_talks/2016-11-09-drupal-development-with-composer-phpsw.md
+++ b/source/_talks/2016-11-09-drupal-development-with-composer-phpsw.md
@ -1,10 +1,7 @@
 ---
 title: Modern Drupal Development with Composer
 type: Lightning talk
-event:
-    name: PHPSW
-    website: http://phpsw.uk
-    location: Bristol, UK
+location: PHPSW
 tags: ['meetups', 'phpsw', 'drupal', 'composer']
 slides:
    embed: '<script async class="speakerdeck-embed" data-id="7a1358502526425a9cfd288f85fb32f3" data-ratio="1.37081659973226" src="//speakerdeck.com/assets/embed.js"></script>'
--- a/source/_talks/2016-11-17-goodbye-drush-make-hello-composer-drupal-bristol.md
+++ b/source/_talks/2016-11-17-goodbye-drush-make-hello-composer-drupal-bristol.md
@ -1,10 +1,7 @@
 ---
 title: Goodbye Drush Make. Hello Composer!
-event:
-    name: Drupal Bristol
-    website: https://www.drupalbristol.org.uk
-    location: Bristol, UK
-    logo: assets/images/talks/drupalcamp-bristol.png
+location: Drupal Bristol
+logo: assets/images/talks/drupalcamp-bristol.png
 tags: ['meetup', 'drupal', 'composer']
 # image: drush-make-is-dead-long-live-composer.png
 slides:
--- a/source/_talks/2017-01-18-getting-your-data-into-drupal-8-drupal-bristol.md
+++ b/source/_talks/2017-01-18-getting-your-data-into-drupal-8-drupal-bristol.md
@ -1,9 +1,6 @@
 ---
 title: Getting (Your Data) Into Drupal 8
-event:
-    name: Drupal Bristol
-    website: https://www.drupalbristol.org.uk
-    location: Bristol, UK
+location: Drupal Bristol
 tags: ['meetup', 'drupal', 'drupal-8']
 slides:
   url: ~
--- a/source/_talks/2017-02-08-it-all-started-with-a-patch-phpsw.md
+++ b/source/_talks/2017-02-08-it-all-started-with-a-patch-phpsw.md
@ -1,9 +1,6 @@
 ---
 title: It All Started With A Patch
-event:
-    name: PHPSW
-    website: https://phpsw.uk
-    location: Bristol, UK
+location: PHPSW
 tags: [meetup, phpsw, open-source]
 slides:
     url: https://speakerdeck.com/opdavies/it-all-started-with-a-patch-phpsw
--- a/source/_talks/2017-02-16-deploying-php-with-fabric-nomad-php.md
+++ b/source/_talks/2017-02-16-deploying-php-with-fabric-nomad-php.md
@ -1,9 +1,6 @@
 ---
 title: Deploying PHP Applications with Fabric
-event:
-    name: Nomad PHP Lightning Talks
-    website: https://nomadphp.com
-    location: Online
+location: Nomad PHP
 tags: ['meetup', 'php', 'fabric']
 slides:
   url: ~
--- a/source/_talks/2017-03-04-getting-your-data-into-drupal-8-drupalcamp-london-2017.md
+++ b/source/_talks/2017-03-04-getting-your-data-into-drupal-8-drupalcamp-london-2017.md
@ -1,9 +1,6 @@
 ---
 title: Getting (Your Data) Into Drupal 8
-event:
-    name: DrupalCamp London 2017
-    website: http://drupalcamp.london
-    location: London, UK
+location: DrupalCamp London 2017
 tags: []
 slides:
   url: ~
--- a/source/_talks/2017-03-04-test-driven-drupal-simpletest-phpunit-drupalcamp-london-2017.md
+++ b/source/_talks/2017-03-04-test-driven-drupal-simpletest-phpunit-drupalcamp-london-2017.md
@ -1,10 +1,7 @@

 ---
 title: Test driven Drupal development with SimpleTest and PHPUnit
-event:
-    name: DrupalCamp London 2017
-    website: http://drupalcamp.london
-    location: London, UK
+location: DrupalCamp London 2017
 tags: []
 slides:
   url: ~
--- a/source/_views/talk.twig
+++ b/source/_views/talk.twig
@ -5,9 +5,30 @@
 {% endblock %}

 {% block content_wrapper %}
-    {% block content %}{% endblock %}
-
-    {% include 'talk/event' %}
+    {% include 'talk/location' %}
    {% include 'talk/slides' %}
    {% include 'talk/video' %}
+
+    <div class="content">
+        {% block content %}{% endblock %}
+    </div>
+
+    <div class="talk-pager is-flex">
+        {% if page.next_talk %}
+            <div class="is-half">
+                <a href="{{ page.next_talk.url }}">
+                    &laquo; {{ page.next_talk.title }}
+                </a>
+            </div>
+        {% endif %}
+
+        {% if page.previous_talk %}
+            <div class="is-half text-right">
+                <a href="{{ page.previous_talk.url }}" class="is-half text-right">
+                    {{ page.previous_talk.title }} &raquo;
+                </a>
+            </div>
+        {% endif %}
+    </div>
+
 {% endblock %}