From 1ee38f473ba2984ffb4130c9f9eab08cc0119b66 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Jul 2017 19:30:18 +0100 Subject: [PATCH] Revert "Simplify company references" This reverts commit 7fa8b90175743a5a9b3143c1c1d15a43d2b893f9. --- app/data/companies.yml | 36 ++++++++++++------- app/data/experience.yml | 20 +++++------ source/_projects/2010-horse-and-country.md | 2 +- source/_projects/2011-avon-motorsport.md | 2 +- source/_projects/2011-source-for-searches.md | 2 +- source/_projects/2012-aspira.md | 2 +- source/_projects/2012-digital-theatre-plus.md | 2 +- source/_projects/2012-door-decor-and-more.md | 2 +- source/_projects/2013-hutch-paving.md | 2 +- source/_projects/2013-ifoa.md | 2 +- source/_projects/2013-watts-tvc.md | 2 +- source/_projects/2014-drupalorg.md | 2 +- source/_projects/2015-roadcc.md | 2 +- source/experience.html.twig | 4 +-- 14 files changed, 47 insertions(+), 35 deletions(-) diff --git a/app/data/companies.yml b/app/data/companies.yml index e223d323..0c1a7254 100644 --- a/app/data/companies.yml +++ b/app/data/companies.yml @@ -1,48 +1,60 @@ companies: - Appnovation: + appnovation: + name: Appnovation logo: appnovation.png url: 'https://www.appnovation.com' - 'CTI Digital': + cti: + name: CTI Digital logo: cti-digital.png url: 'https://www.ctidigital.com' - 'Drupal Association': + drupal_association: + name: Drupal Association logo: drupal-association.png url: 'https://assoc.drupal.org' - Freelance: + freelance: + name: Freelance logo: ~ url: ~ - 'Horse & Country TV': + horse_country: + name: 'Horse & Country TV' logo: horse-and-country.jpg url: 'http://www.horseandcountry.tv' - 'Lab Class': + lab_class: + name: Lab Class logo: lab-class.png url: 'http://labclass.co.uk' - Microserve: + microserve: + name: Microserve logo: microserve.png url: 'https://microserve.io' - Nomensa: + nomensa: + name: Nomensa logo: nomensa.png url: 'http://www.nomensa.com' - Precedent: + precedent: + name: Precedent logo: precedent.jpg url: 'http://precedent.com' - 'Proctor & Stevenson': + proctors: + name: 'Proctor & Stevenson' logo: proctors.jpg url: 'http://www.proctors.co.uk' - 'Trent Design': + trent: + name: Trent Design logo: ~ url: 'http://www.trentdesign.net' - 'Zooba Ltd': + zooba: + name: Zooba Ltd logo: ~ url: ~ diff --git a/app/data/experience.yml b/app/data/experience.yml index 7ed66b8a..1cd59350 100644 --- a/app/data/experience.yml +++ b/app/data/experience.yml @@ -1,5 +1,5 @@ experiences: - - company: 'Horse & Country TV' + - company: horse_country location: Cwmbran, Wales role: Web Developer start: 2010 @@ -7,7 +7,7 @@ experiences: description: | Maintaining and adding new features to the Horse & Country TV website (Drupal 6). - - company: 'Proctor & Stevenson' + - company: proctors location: Bristol, England role: 'PHP Developer' start: 2011 @@ -15,7 +15,7 @@ experiences: description: | Website development, mainly with Drupal and PHP, including the agency’s first Drupal 7 project. - - company: Nomensa + - company: nomensa location: Bristol, England role: 'Contract Drupal Developer / Application Developer & System Administrator' start: 2012 @@ -25,7 +25,7 @@ experiences: I originally started as a contractor, and later took a staff role. - - company: Precedent + - company: precedent location: Cardiff, Wales role: Senior Drupal Developer start: 2013 @@ -33,7 +33,7 @@ experiences: description: | Drupal 7 website development, including site building, theming, module development, data migration and server configuration. - - company: Drupal Association + - company: drupal_association role: Drupal.org Developer location: Remote start: 2014 @@ -43,7 +43,7 @@ experiences: Speaking at user groups and DrupalCamps to promote the Drupal Association. - - company: Microserve + - company: microserve location: Bristol, England role: Senior Drupal Developer start: July 2015 @@ -55,7 +55,7 @@ experiences: Community and contribution advocate. - - company: CTI Digital + - company: cti role: Lead Drupal Developer location: Remote start: November 2015 @@ -67,7 +67,7 @@ experiences: Initial development of a CLI application for generating new and auditing existing codebases to ensure consistency across projects. This uses various Symfony components - mainly the Console and Filesystem components. - - company: Appnovation + - company: appnovation location: Cardiff, Wales role: Senior Drupal Developer start: May 2016 @@ -77,7 +77,7 @@ experiences: Part of various pre-sales teams, including the company’s first UK Drupal 8 project and first FTSE 100 client. - - company: Freelance + - company: freelance location: Remote role: 'Web Developer & System Administrator' start: 2007 @@ -88,7 +88,7 @@ experiences: Administration of Debian, Ubuntu and CentOS servers, and configuration using Puppet, or more recently, Ansible. - - company: Microserve + - company: microserve location: Bristol, England role: Senior Drupal Developer start: March 2017 diff --git a/source/_projects/2010-horse-and-country.md b/source/_projects/2010-horse-and-country.md index 62a4c919..a729c7f0 100644 --- a/source/_projects/2010-horse-and-country.md +++ b/source/_projects/2010-horse-and-country.md @@ -5,7 +5,7 @@ tags: - drupal - drupal-6 image: horse-and-country.png -company: 'Horse & Country TV' +company: horse_country role: Developer skills: - Drupal diff --git a/source/_projects/2011-avon-motorsport.md b/source/_projects/2011-avon-motorsport.md index 734e51a1..dd700b61 100644 --- a/source/_projects/2011-avon-motorsport.md +++ b/source/_projects/2011-avon-motorsport.md @@ -5,7 +5,7 @@ tags: - drupal - drupal-6 image: avon-motorsport.png -company: 'Proctor & Stevenson' +company: proctors role: Developer skills: - Drupal 6 diff --git a/source/_projects/2011-source-for-searches.md b/source/_projects/2011-source-for-searches.md index 1b2e35a1..137b5cf5 100644 --- a/source/_projects/2011-source-for-searches.md +++ b/source/_projects/2011-source-for-searches.md @@ -6,7 +6,7 @@ tags: - drupal-6 - ubercart image: source-for-searches.png -company: 'Proctor & Stevenson' +company: proctors role: Developer skills: - Drupal 6 diff --git a/source/_projects/2012-aspira.md b/source/_projects/2012-aspira.md index 7cde202f..228be63b 100644 --- a/source/_projects/2012-aspira.md +++ b/source/_projects/2012-aspira.md @@ -5,7 +5,7 @@ tags: - drupal - drupal-7 image: aspira.png -company: 'Proctor & Stevenson' +company: proctors role: Developer skills: - Drupal 7 diff --git a/source/_projects/2012-digital-theatre-plus.md b/source/_projects/2012-digital-theatre-plus.md index d36c27a2..b4b39841 100644 --- a/source/_projects/2012-digital-theatre-plus.md +++ b/source/_projects/2012-digital-theatre-plus.md @@ -6,7 +6,7 @@ tags: - drupal-7 - drupal-commerce image: digital-theatre-plus.png -company: Nomensa +company: nomensa role: Developer skills: - Drupal 7 diff --git a/source/_projects/2012-door-decor-and-more.md b/source/_projects/2012-door-decor-and-more.md index 1c2892fe..0558c793 100644 --- a/source/_projects/2012-door-decor-and-more.md +++ b/source/_projects/2012-door-decor-and-more.md @@ -6,7 +6,7 @@ tags: - drupal-7 - drupal-commerce image: door-decor-more.png -company: Zooba Ltd +company: zooba role: Freelance Developer freelance: true skills: diff --git a/source/_projects/2013-hutch-paving.md b/source/_projects/2013-hutch-paving.md index cd44e2ee..13c76c80 100644 --- a/source/_projects/2013-hutch-paving.md +++ b/source/_projects/2013-hutch-paving.md @@ -5,7 +5,7 @@ tags: - drupal-7 image: hutch-paving.png role: Freelance Developer -company: Trent Design +company: trent freelance: true skills: - Drupal 7 diff --git a/source/_projects/2013-ifoa.md b/source/_projects/2013-ifoa.md index b98b1f12..1ba084cc 100644 --- a/source/_projects/2013-ifoa.md +++ b/source/_projects/2013-ifoa.md @@ -5,7 +5,7 @@ tags: - drupal - drupal-7 image: ifoa.png -company: Precedent +company: precedent role: Lead Developer slug: ifoa skills: diff --git a/source/_projects/2013-watts-tvc.md b/source/_projects/2013-watts-tvc.md index e93a2ee8..c288d575 100644 --- a/source/_projects/2013-watts-tvc.md +++ b/source/_projects/2013-watts-tvc.md @@ -5,7 +5,7 @@ tags: - drupal - drupal-7 image: watts-tvc.png -company: Lab Class +company: lab_class role: Freelance Developer freelance: true skills: diff --git a/source/_projects/2014-drupalorg.md b/source/_projects/2014-drupalorg.md index de82c415..984cc960 100644 --- a/source/_projects/2014-drupalorg.md +++ b/source/_projects/2014-drupalorg.md @@ -5,7 +5,7 @@ tags: - drupal - drupal-7 image: drupal-org.png -company: Drupal Association +company: drupal_association role: Drupal.org Developer skills: - Drupal 7 diff --git a/source/_projects/2015-roadcc.md b/source/_projects/2015-roadcc.md index 889d35e5..e80cd843 100644 --- a/source/_projects/2015-roadcc.md +++ b/source/_projects/2015-roadcc.md @@ -7,7 +7,7 @@ tags: image: name: road-cc.png alt: The new road.cc website -company: Microserve +company: microserve role: Lead Developer skills: - Drupal 7 diff --git a/source/experience.html.twig b/source/experience.html.twig index c18e2f9d..f4d2cf67 100644 --- a/source/experience.html.twig +++ b/source/experience.html.twig @@ -15,12 +15,12 @@ redirect: