Change website to url. Shorter, and more consistent
This commit is contained in:
parent
d0d14c6970
commit
e5897649f3
|
|
@ -14,18 +14,18 @@ availability:
|
|||
full: no
|
||||
|
||||
companies:
|
||||
appnovation: { name: Appnovation, logo: appnovation.png, website: https://www.appnovation.com }
|
||||
cti: { name: CTI Digital, logo: cti-digital.png, website: https://www.ctidigital.com }
|
||||
drupal_association: { name: Drupal Association, logo: drupal-association.png, website: https://assoc.drupal.org }
|
||||
freelance: { name: Freelance, logo: ~, website: ~ }
|
||||
horse_country: { name: 'Horse & Country TV', logo: horse-and-country.jpg, website: http://www.horseandcountry.tv }
|
||||
lab_class: { name: Lab Class, logo: lab-class.png, website: http://labclass.co.uk }
|
||||
microserve: { name: Microserve, logo: microserve.png, website: https://microserve.io }
|
||||
nomensa: { name: Nomensa, logo: nomensa.png, website: http://www.nomensa.com }
|
||||
precedent: { name: Precedent, logo: precedent.jpg, website: http://precedent.com }
|
||||
proctors: { name: 'Proctor & Stevenson', logo: proctors.jpg, website: http://www.proctors.co.uk }
|
||||
trent: { name: Trent Design, logo: ~, website: http://www.trentdesign.net }
|
||||
zooba: { name: Zooba Ltd, logo: ~, website: ~ }
|
||||
appnovation: { name: Appnovation, logo: appnovation.png, url: https://www.appnovation.com }
|
||||
cti: { name: CTI Digital, logo: cti-digital.png, url: https://www.ctidigital.com }
|
||||
drupal_association: { name: Drupal Association, logo: drupal-association.png, url: https://assoc.drupal.org }
|
||||
freelance: { name: Freelance, logo: ~, url: ~ }
|
||||
horse_country: { name: 'Horse & Country TV', logo: horse-and-country.jpg, url: http://www.horseandcountry.tv }
|
||||
lab_class: { name: Lab Class, logo: lab-class.png, url: http://labclass.co.uk }
|
||||
microserve: { name: Microserve, logo: microserve.png, url: https://microserve.io }
|
||||
nomensa: { name: Nomensa, logo: nomensa.png, url: http://www.nomensa.com }
|
||||
precedent: { name: Precedent, logo: precedent.jpg, url: http://precedent.com }
|
||||
proctors: { name: 'Proctor & Stevenson', logo: proctors.jpg, url: http://www.proctors.co.uk }
|
||||
trent: { name: Trent Design, logo: ~, url: http://www.trentdesign.net }
|
||||
zooba: { name: Zooba Ltd, logo: ~, url: ~ }
|
||||
|
||||
drupalorg:
|
||||
name: opdavies
|
||||
|
|
@ -33,23 +33,23 @@ drupalorg:
|
|||
url: https://www.drupal.org/user/381388
|
||||
url_nice: https://www.drupal.org/u/opdavies
|
||||
|
||||
email: oliver+website@oliverdavies.uk
|
||||
email: oliver+url@oliverdavies.uk
|
||||
|
||||
events:
|
||||
drupal-bristol: { title: Drupal Bristol, location: 'Bristol, UK', website: https://www.drupalbristol.org.uk }
|
||||
drupalcamp-brighton-2015: { title: DrupalCamp Brighton 2015, location: 'Brighton, UK', website: ~ }
|
||||
drupalcamp-bristol-2016: { title: DrupalCamp Bristol 2016, location: 'Bristol, UK', website: https://www.drupalcampbristol.org.uk }
|
||||
drupalcamp-london-2014: { title: DrupalCamp London 2014, location: 'London, UK', website: ~ }
|
||||
drupalcamp-london-2015: { title: DrupalCamp London 2015, location: 'London, UK', website: ~ }
|
||||
drupalcamp-london-2016: { title: DrupalCamp London 2016, location: 'London, UK', website: ~ }
|
||||
drupalcamp-london-2017: { title: DrupalCamp London 2017, location: 'London, UK', website: https://drupalcamp.london }
|
||||
drupalcamp-north-2015: { title: DrupalCamp North 2015, location: 'Sunderland, UK', website: http://drupalcampnorth.org }
|
||||
nwdug: { title: NWDUG, location: 'Manchester, UK', website: http://nwdrupal.org.uk }
|
||||
phpsc-16: { title: PHP South Coast 2016, location: 'Portsmouth, UK', website: http://2016.phpsouthcoast.co.uk }
|
||||
phpsw: { title: PHPSW, location: 'Bristol, UK', website: https://phpsw.uk }
|
||||
swdug: { title: 'SWDUG', location: 'Cardiff, UK', website: ~ }
|
||||
udiff: { title: Unified Diff, location: 'Cardiff, UK', website: http://unifieddiff.co.uk }
|
||||
umbristol: { title: 'umBristol', location: 'Bristol, UK', website: http://umbristol.co.uk }
|
||||
drupal-bristol: { title: Drupal Bristol, location: 'Bristol, UK', url: https://www.drupalbristol.org.uk }
|
||||
drupalcamp-brighton-2015: { title: DrupalCamp Brighton 2015, location: 'Brighton, UK', url: ~ }
|
||||
drupalcamp-bristol-2016: { title: DrupalCamp Bristol 2016, location: 'Bristol, UK', url: https://www.drupalcampbristol.org.uk }
|
||||
drupalcamp-london-2014: { title: DrupalCamp London 2014, location: 'London, UK', url: ~ }
|
||||
drupalcamp-london-2015: { title: DrupalCamp London 2015, location: 'London, UK', url: ~ }
|
||||
drupalcamp-london-2016: { title: DrupalCamp London 2016, location: 'London, UK', url: ~ }
|
||||
drupalcamp-london-2017: { title: DrupalCamp London 2017, location: 'London, UK', url: https://drupalcamp.london }
|
||||
drupalcamp-north-2015: { title: DrupalCamp North 2015, location: 'Sunderland, UK', url: http://drupalcampnorth.org }
|
||||
nwdug: { title: NWDUG, location: 'Manchester, UK', url: http://nwdrupal.org.uk }
|
||||
phpsc-16: { title: PHP South Coast 2016, location: 'Portsmouth, UK', url: http://2016.phpsouthcoast.co.uk }
|
||||
phpsw: { title: PHPSW, location: 'Bristol, UK', url: https://phpsw.uk }
|
||||
swdug: { title: 'SWDUG', location: 'Cardiff, UK', url: ~ }
|
||||
udiff: { title: Unified Diff, location: 'Cardiff, UK', url: http://unifieddiff.co.uk }
|
||||
umbristol: { title: 'umBristol', location: 'Bristol, UK', url: http://umbristol.co.uk }
|
||||
|
||||
github:
|
||||
name: opdavies
|
||||
|
|
@ -73,10 +73,10 @@ linkedin:
|
|||
url: http://uk.linkedin.com/in/opdavies
|
||||
|
||||
meetups:
|
||||
drupalbristol: { name: Drupal Bristol, logo: drupal-bristol.jpeg, website: http://www.drupalbristol.org.uk }
|
||||
drupalcampbristol: { name: DrupalCamp Bristol, logo: drupalcamp-bristol.png, website: http://www.drupalcampbristol.co.uk }
|
||||
phpsw: { name: PHPSW, logo: phpsw.jpeg, website: http://phpsw.uk }
|
||||
swdug: { name: SWDUG, logo: swdug.png, website: http://swdug.org.uk }
|
||||
drupalbristol: { name: Drupal Bristol, logo: drupal-bristol.jpeg, url: http://www.drupalbristol.org.uk }
|
||||
drupalcampbristol: { name: DrupalCamp Bristol, logo: drupalcamp-bristol.png, url: http://www.drupalcampbristol.co.uk }
|
||||
phpsw: { name: PHPSW, logo: phpsw.jpeg, url: http://phpsw.uk }
|
||||
swdug: { name: SWDUG, logo: swdug.png, url: http://swdug.org.uk }
|
||||
|
||||
packagist:
|
||||
name: opdavies
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{% if company.website %}
|
||||
<a href="{{ company.website }}" class="experience__website">
|
||||
{{ company.website }}
|
||||
{% if company.url %}
|
||||
<a href="{{ company.url }}" class="experience__website">
|
||||
{{ company.url }}
|
||||
</a>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<ul>
|
||||
{% for meetup in site.meetups %}
|
||||
<li class="meetups--{{ meetup.name|lower|replace({ ' ': '-' }) }}">
|
||||
<a href="{{ meetup.website }}" title="{{ meetup.name }}">
|
||||
<a href="{{ meetup.url }}" title="{{ meetup.name }}">
|
||||
<img src="{{ site.images_url }}/assets/images/meetups/{{ meetup.logo }}" alt="{{ meetup.name }}">
|
||||
</a>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@
|
|||
|
||||
<img src="{{ site.gravatar.url }}?s=100" alt="Picture of Oliver" class="img-circle">
|
||||
|
||||
<p>Oliver Davies is a Web Developer, System Administrator and Drupal specialist based in the UK. He is a {{ site.work.role }} at <a href="{{ site.companies[site.work.company].website }}">{{ site.companies[site.work.company].name }}</a> and also provides freelance consultancy services for Drupal websites, PHP applications and Linux servers.</p>
|
||||
<p>Oliver Davies is a Web Developer, System Administrator and Drupal specialist based in the UK. He is a {{ site.work.role }} at <a href="{{ site.companies[site.work.company].url }}">{{ site.companies[site.work.company].name }}</a> and also provides freelance consultancy services for Drupal websites, PHP applications and Linux servers.</p>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
{% set name = company.name %}
|
||||
{% endif %}
|
||||
|
||||
{% if company.website %}
|
||||
<a href="{{ company.website }}" title="{{ company.name }}">
|
||||
{% if company.url %}
|
||||
<a href="{{ company.url }}" title="{{ company.name }}">
|
||||
{{ name|raw }}
|
||||
</a>
|
||||
{% else %}
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@
|
|||
{% endif %}
|
||||
|
||||
<td>
|
||||
{% if event.website %}<a href="{{ event.website }}">{% endif %}
|
||||
{% if event.url %}<a href="{{ event.url }}">{% endif %}
|
||||
{{ event.title }}
|
||||
{% if event.website %}</a>{% endif %}
|
||||
{% if event.url %}</a>{% endif %}
|
||||
|
||||
{% if event.location %}
|
||||
<small class="event-location">
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ I’m a provisional member of the [Drupal Security team][14] and a documentation
|
|||
[17]: https://phpsw.uk
|
||||
[18]: http://www.drupalcampbristol.co.uk
|
||||
[19]: {{site.url}}/talks/
|
||||
[20]: {{site.companies[site.work.company].website}}
|
||||
[20]: {{site.companies[site.work.company].url}}
|
||||
[21]: {{site.twitter.url}}
|
||||
[22]: {{site.drupalorg.url_nice}}
|
||||
[23]: {{site.github.url}}
|
||||
|
|
|
|||
|
|
@ -37,4 +37,4 @@ Here are some videos of my previous talks:
|
|||
- <https://www.youtube.com/watch?v=qO_Wh5WE3VA>
|
||||
- <https://www.youtube.com/watch?v=Yi_FPI3xHwc>
|
||||
|
||||
[0]: {{site.companies[site.work.company].website}}
|
||||
[0]: {{site.companies[site.work.company].url}}
|
||||
|
|
|
|||
Loading…
Reference in a new issue