From 8dc17841cedce075708663e38e088213a8961fa8 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 14 Mar 2017 08:11:30 +0000 Subject: [PATCH] Add event locations --- app/config/sculpin_site.yml | 28 +++++++++---------- .../sass/components/content-types/_talk.sass | 3 ++ source/_partials/talks-table.twig | 6 ++++ 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index 36d8efe9..df96eb07 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -145,17 +145,17 @@ youtube: channel_url: https://www.youtube.com/channel/UCkeK0qF9HHUPQH_fvn4ghqQ talks_events: - drupal-bristol: { title: Drupal Bristol, website: https://www.drupalbristol.org.uk } - drupalcamp-brighton-2015: { title: DrupalCamp Brighton 2015 } - drupalcamp-bristol-2016: { title: DrupalCamp Bristol 2016, website: https://www.drupalcampbristol.org.uk } - drupalcamp-london-2014: { title: DrupalCamp London 2014 } - drupalcamp-london-2015: { title: DrupalCamp London 2015 } - drupalcamp-london-2016: { title: DrupalCamp London 2016 } - drupalcamp-london-2017: { title: DrupalCamp London 2017, website: https://drupalcamp.london } - drupalcamp-north-2015: { title: DrupalCamp North 2015, website: http://drupalcampnorth.org } - nwdug: { title: NWDUG, website: http://nwdrupal.org.uk } - phpsc-16: { title: PHP South Coast 2016, website: http://2016.phpsouthcoast.co.uk } - phpsw: { title: PHPSW, website: https://phpsw.uk } - swdug: { title: 'SWDUG (South Wales Drupal user group)' } - umbristol: { title: 'umBristol (Bristol Umbraco user group)', website: http://umbristol.co.uk } - udiff: { title: Unified Diff, website: http://unifieddiff.co.uk } + drupal-bristol: { title: Drupal Bristol, website: https://www.drupalbristol.org.uk, location: 'Bristol, UK' } + drupalcamp-brighton-2015: { title: DrupalCamp Brighton 2015, location: 'Brighton, UK' } + drupalcamp-bristol-2016: { title: DrupalCamp Bristol 2016, website: https://www.drupalcampbristol.org.uk, location: 'Bristol, UK' } + drupalcamp-london-2014: { title: DrupalCamp London 2014, location: 'London, UK' } + drupalcamp-london-2015: { title: DrupalCamp London 2015, location: 'London, UK' } + drupalcamp-london-2016: { title: DrupalCamp London 2016, location: 'London, UK' } + drupalcamp-london-2017: { title: DrupalCamp London 2017, website: https://drupalcamp.london, location: 'London, UK' } + drupalcamp-north-2015: { title: DrupalCamp North 2015, website: http://drupalcampnorth.org, location: 'Sunderland, UK' } + nwdug: { title: NWDUG, website: http://nwdrupal.org.uk, location: 'Manchester, UK' } + phpsc-16: { title: PHP South Coast 2016, website: http://2016.phpsouthcoast.co.uk, location: 'Portsmouth, UK' } + phpsw: { title: PHPSW, website: https://phpsw.uk, location: 'Bristol, UK' } + swdug: { title: 'SWDUG (South Wales Drupal user group)', location: 'Cardiff, UK' } + umbristol: { title: 'umBristol (Bristol Umbraco user group)', website: http://umbristol.co.uk, location: 'Bristol, UK' } + udiff: { title: Unified Diff, website: http://unifieddiff.co.uk, location: 'Cardiff, UK' } diff --git a/assets/sass/components/content-types/_talk.sass b/assets/sass/components/content-types/_talk.sass index f21e16f5..54adc1bc 100644 --- a/assets/sass/components/content-types/_talk.sass +++ b/assets/sass/components/content-types/_talk.sass @@ -16,3 +16,6 @@ .feedback width: 15% + +.event-location + display: block diff --git a/source/_partials/talks-table.twig b/source/_partials/talks-table.twig index 2b30a0c4..0bf5d3a2 100644 --- a/source/_partials/talks-table.twig +++ b/source/_partials/talks-table.twig @@ -28,6 +28,12 @@ {% if event.website %}{% endif %} {{ event.title }} {% if event.website %}{% endif %} + + {% if event.location %} + + {{- event.location -}} + + {% endif %}