From 7fa8b90175743a5a9b3143c1c1d15a43d2b893f9 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 25 Jul 2017 13:49:08 +0100 Subject: [PATCH] Simplify company references --- 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, 35 insertions(+), 47 deletions(-) diff --git a/app/data/companies.yml b/app/data/companies.yml index 0c1a7254..e223d323 100644 --- a/app/data/companies.yml +++ b/app/data/companies.yml @@ -1,60 +1,48 @@ companies: - appnovation: - name: Appnovation + Appnovation: logo: appnovation.png url: 'https://www.appnovation.com' - cti: - name: CTI Digital + 'CTI Digital': logo: cti-digital.png url: 'https://www.ctidigital.com' - drupal_association: - name: Drupal Association + 'Drupal Association': logo: drupal-association.png url: 'https://assoc.drupal.org' - freelance: - name: Freelance + Freelance: logo: ~ url: ~ - horse_country: - name: 'Horse & Country TV' + 'Horse & Country TV': logo: horse-and-country.jpg url: 'http://www.horseandcountry.tv' - lab_class: - name: Lab Class + 'Lab Class': logo: lab-class.png url: 'http://labclass.co.uk' - microserve: - name: Microserve + Microserve: logo: microserve.png url: 'https://microserve.io' - nomensa: - name: Nomensa + Nomensa: logo: nomensa.png url: 'http://www.nomensa.com' - precedent: - name: Precedent + Precedent: logo: precedent.jpg url: 'http://precedent.com' - proctors: - name: 'Proctor & Stevenson' + 'Proctor & Stevenson': logo: proctors.jpg url: 'http://www.proctors.co.uk' - trent: - name: Trent Design + 'Trent Design': logo: ~ url: 'http://www.trentdesign.net' - zooba: - name: Zooba Ltd + 'Zooba Ltd': logo: ~ url: ~ diff --git a/app/data/experience.yml b/app/data/experience.yml index 1cd59350..7ed66b8a 100644 --- a/app/data/experience.yml +++ b/app/data/experience.yml @@ -1,5 +1,5 @@ experiences: - - company: horse_country + - company: 'Horse & Country TV' 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: proctors + - company: 'Proctor & Stevenson' 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 + - company: CTI Digital 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 a729c7f0..62a4c919 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 +company: 'Horse & Country TV' role: Developer skills: - Drupal diff --git a/source/_projects/2011-avon-motorsport.md b/source/_projects/2011-avon-motorsport.md index dd700b61..734e51a1 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: proctors +company: 'Proctor & Stevenson' role: Developer skills: - Drupal 6 diff --git a/source/_projects/2011-source-for-searches.md b/source/_projects/2011-source-for-searches.md index 137b5cf5..1b2e35a1 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: proctors +company: 'Proctor & Stevenson' role: Developer skills: - Drupal 6 diff --git a/source/_projects/2012-aspira.md b/source/_projects/2012-aspira.md index 228be63b..7cde202f 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: proctors +company: 'Proctor & Stevenson' role: Developer skills: - Drupal 7 diff --git a/source/_projects/2012-digital-theatre-plus.md b/source/_projects/2012-digital-theatre-plus.md index b4b39841..d36c27a2 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 0558c793..1c2892fe 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 +company: Zooba Ltd role: Freelance Developer freelance: true skills: diff --git a/source/_projects/2013-hutch-paving.md b/source/_projects/2013-hutch-paving.md index 13c76c80..cd44e2ee 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 +company: Trent Design freelance: true skills: - Drupal 7 diff --git a/source/_projects/2013-ifoa.md b/source/_projects/2013-ifoa.md index 1ba084cc..b98b1f12 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 c288d575..e93a2ee8 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 984cc960..de82c415 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 e80cd843..889d35e5 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 f4d2cf67..c18e2f9d 100644 --- a/source/experience.html.twig +++ b/source/experience.html.twig @@ -15,12 +15,12 @@ redirect: