opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/testimonials

Browse source
This commit is contained in:
Oliver Davies 2015-06-14 02:55:38 +01:00
parent a3227c5c42 e992c449a7
commit e95b67ba71
128 changed files with 1081 additions and 1055 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -1,4 +1,3 @@
oliverdavies.co.uk
==================
# oliverdavies.co.uk
My personal website, built with [Sculpin](http://sculpin.io).

1
app/config/sculpin_site.yml
View file

@ -16,6 +16,7 @@ github: http://github.com/opdavies
irc: opdavies
lanyrd: http://lanyrd.com/profile/opdavies
joindin: https://joind.in/user/view/27119
ansible_galaxy: https://galaxy.ansible.com/list#/users/14560
bio: >
<p><a href="/">Oliver Davies</a> is a Drupal Developer and System Administrator based in the UK. He works for the <a href="https://assoc.drupal.org">Drupal Association</a> and also provides freelance consultancy services for Drupal websites and Linux servers.</p>

16
source/_layouts/default.html.twig
View file

@ -4,7 +4,8 @@
<!--[if gt IE 9]> <html> <![endif]-->
<!--[if !IE]><!--> <html> <!--<![endif]-->
<head>
<meta charset="utf-8">
<meta lang="en-GB" charset="utf-8">
{% include 'title' %}
{% if page.meta.description %}
<meta name="description" content="{{ page.meta.description|e('html') }}">
@ -14,24 +15,21 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="author" href="{{ site.url }}/humans.txt" />
{% include 'title' %}
<link rel="stylesheet" href="{{ site.url }}/{{ theme_path('assets/css/styles.css') }}">
{% block styles %}{% endblock %}
<link rel="stylesheet" href="{{ site.url }}/assets/css/styles.css">
</head>
<body{% if page.body_class %} class="{{ page.body_class }}"{% endif %}>
{% include 'navbar' %}
<div class="container">
<div class="row">
<div class="col-md-12">
{% block content_wrapper %}
<div class="col-md-10">
{% block content %}{% endblock %}
{% endblock %}
</div>
{% endblock %}
{% include 'sidebar' %}
</div>{# .row #}
</div>{# .container #}

4
source/_layouts/post.html.twig
View file

@ -1,6 +1,8 @@
{% extends 'default' %}
{% block content_wrapper %}
<div class="col-md-10">
{% include 'post-header' %}
{% block content %}{% endblock %}
@ -21,4 +23,6 @@
{% if page.previous_post %}<li>Previous post: <a href="{{ page.previous_post.url }}">{{ page.previous_post.title }}</a></li>{% endif %}
</ul>
{% endif %}
</div>
{% endblock %}

8
source/_layouts/project.html.twig
View file

@ -1,8 +0,0 @@
{% extends 'default' %}
{% block content_wrapper %}
<div class="content">
{% if page.website %}<a href="{{ page.website }}">{{ page.website }}</a>{% endif %}
{% block content %}{% endblock %}
</div>
{% endblock %}

2
source/_partials/about-author.html.twig
View file

@ -1,5 +1,5 @@
<div class="about-author">
<h2>About the Author</h2>
<img src="{{ site.gravatar_url }}" alt="Picture of Oliver" class="img-circle">
<img src="{{ site.gravatar_url }}?s=50" alt="Picture of Oliver" class="img-circle">
<p>{{ site.bio|raw }}</p>
</div>

3
source/_partials/navbar.html.twig
View file

@ -9,8 +9,9 @@
</button>
<a class="navbar-brand" href="{{ site.url }}">{{ site.title }}</a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav navbar-right" role="navigation">
<ul class="nav navbar-nav">
<li{% if page.nav == 'about' %} class="active"{% endif %}><a href="{{ site.url }}">About</a></li>
{% for item in [ 'work', 'services', 'talks', 'blog', 'contact' ] %}
<li{% if page.nav == item %} class="active"{% endif %}><a href="{{ site.url }}/{{ item }}">{{ item|title }}</a></li>

16
source/_partials/sidebar.html.twig Normal file
View file

@ -0,0 +1,16 @@
<div class="col-md-2">
<section class="block block--da_member">
<h2>Drupal Association</h2>
<a href="https://assoc.drupal.org/membership" title="Become a Drupal Association member">
<img src="/assets/images/da-individual-member.png" alt="Drupal Association Individual Member">
</a>
</section>
<!--
<section class="block block__drupalcon_la">
<h2>DrupalCon LA</h2>
<img src="/assets/images/drupalcon-la-attending.png" alt="">
<img src="/assets/images/drupalcon-la-sprinter.png" alt="">
</section>
-->
</div>

2
source/_posts/2015-04-03-minimum-core-version.md
View file

@ -56,6 +56,8 @@ In the original scenario, we want to specify that the module can only be enabled
Because we need to check for Drupal's core version, we're using the system module as the dependency and specifying that it needs to be either equal to or greater than 7.36. If this dependency is not met, e.g. Drupal 7.35 is being used, then the module cannot be enabled rather than showing a function not found error for `user_has_role()` when it is called.
!['A screenshot of the modules page showing System as a dependency for a custom module.'](/assets/images/blog/minimum-drupal-version-d7.png)
## External Links
* [Writing module .info files (Drupal 7.x)](https://www.drupal.org/node/542202#dependencies)

2
source/_talks/2015-04-08-drupal-8.md
View file

@ -1,6 +1,6 @@
---
title: Drupal 8 (Lightning Talk)
location: <a href="http://phpsw.org.uk/events/221484360-lightning-talks" title="PHPSW: Lightning Talks">PHPSW</a>
location: <a href="http://phpsw.uk/events/221484360-lightning-talks" title="PHPSW: Lightning Talks">PHPSW</a>
date: 2015-04-08
description: <a href="https://speakerdeck.com/opdavies/drupal-8">Drupal 8</a> (lightning talk)
slides: https://speakerdeck.com/opdavies/drupal-8

2
source/assets/css/styles.css
View file

File diff suppressed because one or more lines are too long

BIN
source/assets/images/blog/minimum-drupal-version-d7.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
source/assets/images/da-individual-member.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
source/assets/images/drupalcon-la-attending.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
source/assets/images/drupalcon-la-sprinter.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 18 KiB

8
source/assets/sass/components/_about-author.scss Normal file
View file

@ -0,0 +1,8 @@
.about-author {
@include clearfix;
img {
float: left;
margin: 0 1em 1em 0;
}
}

5
source/assets/sass/components/blocks/_drupalcon-la.scss Normal file
View file

@ -0,0 +1,5 @@
.block--drupalcon_la {
img {
margin-bottom: .5em;
}
}

12
source/contact.md
View file

@ -7,27 +7,27 @@ meta:
---
# Contact
The best way to contact me is via [email](mailto:oliver+contact@oliverdavies.co.uk?subject=Contact%20Oliver%20Davies).
The best ways to contact me is via [email](mailto:oliver+contact@oliverdavies.co.uk?subject=Contact%20Oliver%20Davies) and <a href="{{ site.twitter }}">Twitter</a>.
If you have a support or feature request for one of the Drupal projects that I maintain, please create an issue in the appropriate issue queue on [Drupal.org](https://www.drupal.org).
If you want to report an issue or want to suggest any improvements to the site, you can do so on [GitHub](https://github.com/opdavies/opdavies.github.io/issues/new). I'm happy to receive [pull requests](https://help.github.com/articles/using-pull-requests) if you want to suggest a change to piece of content.
## Elsewhere
Here are the best places to contact me online:
* IRC ({{ site.irc }}) - I'm usually in #drupal-uk on Freenode, among others.
* IRC ({{ site.irc }}) - I'm usually in #drupal-uk and #drupal-contribute on Freenode, among others.
* <a href="{{ site.twitter }}">Twitter</a> (@{{ site.twitter_name }})
* <a href="{{ site.drupalorg_nice }}">Drupal.org</a>
* <a href="{{ site.linkedin }}">LinkedIn</a>
I also have profiles on <a href="{{ site.lanyrd }}">Lanyrd</a> and <a href="{{ site.joindin }}">Joind.in</a>.
## Meetups
Here are the user group meetups that I organise or attend regularly. If you're in the area, feel free to pop along and say hi!
* [SWDUG](http://www.swdug.co.uk) (South Wales Drupal user group)
* [SWDUG](http://www.swdug.org.uk) (South Wales Drupal user group)
* [Drupal Bristol](https://groups.drupal.org/bristol-and-west-uk)
* [PHPSW](http://www.phpsw.org.uk)
* [PHPSW](http://www.phpsw.uk)
* [SWLUG](http://www.swlug.org) (South Wales Linux user group)
* [Accessible Bristol](http://www.accessiblebristol.org.uk)

8
source/index.md
View file

@ -17,11 +17,11 @@ meta:
<!-- <img src="{{ site.gravatar_url }}" alt="Picture of Oliver" class="img-circle"> -->
Oliver Davies is a [Drupal Developer](https://www.drupal.org/u/opdavies) and Linux System Administrator based in the UK. He works for the [Drupal Association](https://assoc.drupal.org) and also provides part-time consultancy services.
Oliver Davies is a <a href="{{ site.drupalorg_nice }}">Drupal Developer</a> and Linux System Administrator based in the UK. He works for the [Drupal Association](https://assoc.drupal.org) and also provides part-time consultancy services.
An active community member, Oliver co-organises [SWDUG](https://groups.drupal.org/wales-uk) and the [Bristol Drupal user group](https://groups.drupal.org/bristol-west-uk), and is a founding member of the [DrupalCamp Bristol](http://2015.drupalcampbristol.co.uk) organising committee. He also attends other Drupal events and conferences as well as local PHP, Linux and web accessibility user groups.
A contributor to [Drupal 7](http://cgit.drupalcode.org/drupal/log/?h=7.x&qt=grep&q=opdavies) and [Drupal 8](http://cgit.drupalcode.org/drupal/log/?h=8.0.x&qt=grep&q=opdavies) core, Oliver also [mentors new contributors](https://www.drupal.org/user/381388/people-mentored) online and in person at local sprints, DrupalCamps and DrupalCons. He maintains several projects on Drupal.org, and has contributed to numerous others. He is also the Git Documentation Maintainer for the Drupal project, and a provisional member of the [Drupal Security team](https://www.drupal.org/security-team).
A contributor to [Drupal 7](http://cgit.drupalcode.org/drupal/log/?h=7.x&qt=grep&q=opdavies) and [Drupal 8](http://cgit.drupalcode.org/drupal/log/?h=8.0.x&qt=grep&q=opdavies) core, Oliver also <a href="{{ site.drupalorg }}/people-mentored">mentors new contributors</a> online and in person at local sprints, DrupalCamps and DrupalCons. He maintains several projects on Drupal.org, and has contributed to numerous others. He is also the Git Documentation Maintainer for the Drupal project, and a provisional member of the [Drupal Security team](https://www.drupal.org/security-team).
You can follow him on <a href="{{ site.twitter }}">Twitter</a> and <a href="{{ site.linkedin }}">LinkedIn</a>, and you can view his code on <a href="{{ site.drupalorg }}/track/code">Drupal.org</a> and <a href="{{ site.github }}?tab=activity">GitHub</a>.
You can follow him on <a href="{{ site.twitter }}">Twitter</a> and <a href="{{ site.linkedin }}">LinkedIn</a>, and you can view his code on
<a href="{{ site.drupalorg }}/track/code">Drupal.org</a> and <a href="{{ site.github }}?tab=activity">GitHub</a>.

4
source/services.md
View file

@ -22,8 +22,8 @@ meta:
## System Administration
* [CentOS](http://www.centos.org), [RHEL](http://www.redhat.com/en/technologies/linux-platforms/enterprise-linux) and [Ubuntu](http://www.ubuntu.com/server) server configuration, including [Apache](http://apache.org), [Nginx](http://nginx.org), [PHP](http://php.net), [MySQL](http://mysql.com) and [MariaDB](https://mariadb.org).
* Configuration management using [Puppet](http://puppetlabs.com) (preferred) or [Ansible](http://www.ansible.com).
* Server configuration and management using [Puppet](http://puppetlabs.com) and/or [Ansible](http://www.ansible.com).
* Continuous integration using [Jenkins](http://jenkins-ci.org).
* Server deployment using [Ansible](http://www.ansible.com).
* Virtual machine setup using [Vagrant](http://vagrantup.com) for development or server testing.
* Domain name and DNS management.