Merge branch 'source' into tags

app/config/sculpin_site.yml

@@ -1,4 +1,5 @@
 title: Oliver Davies
 subtitle: Drupal & Linux Specialist
-description: Personal website and blog of Oliver Davies, a Drupal Developer and Systems Administrator based in the UK.
 url: http://localhost:8000
+twitter_url: http://twitter.com/opdavies
+linkedin_url: http://uk.linkedin.com/in/opdavies

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

@@ -5,9 +5,14 @@ nav: blog
 use:
   - posts
 tags:
-  - drupal
-  - drupal-7
-  - drupal-planet
+  - Drupal
+  - Drupal 7
+  - Drupal Planet
+meta:
+  og:
+    title: 'How to Define a Minimum Drupal Core Version'
+    description: 'How to define a minimum Drupal core version for your module or theme.'
+    type: article
 ---
 This week, my first code patch was [committed to Drupal core](https://www.drupal.org/node/2394517#comment-9773143). The patch adds the `user_has_role()` function to theu user module, to simplify the way to check whether a user in Drupal has been assigned a specific role. This is something that I normally write a custom function for each project, but it's now available in Drupal core as of [7.36](https://www.drupal.org/drupal-7.36-release-notes).
 

source/_projects/accessible-bristol.md

@@ -1,11 +1,13 @@
 ---
 title: Accessible Bristol
-website: http://www.accessiblebristol.org
+link: http://www.accessiblebristol.org
+featured: true
 tags:
-  - Drupal 7
+  - drupal
+  - drupal-7
+  - accessibility
 ---
 
-
 ## Modules used
 
 * [Features](https://www.drupal.org/project/features)
@@ -15,4 +17,4 @@ tags:
 * [Override Node Options](https://www.drupal.org/project/override_node_options)
 * [User relationships](https://www.drupal.org/project/user_relationships)
 * [Views](https://www.drupal.org/project/views)
-* [Workbench Moderation](https://www.drupal.org/project/workbench_moderation)
+* [Workbench Moderation](https://www.drupal.org/project/workbench_moderation)

source/index.md

@@ -1,12 +1,19 @@
 ---
 layout: default
-title: About Oliver
 nav: about
-front: true
 use:
   - posts
 meta:
   description: 'The personal website and blog of Oliver Davies, a Drupal Developer and Systems Administrator from Wales, UK.'
+  og:
+    title: 'Oliver Davies - Drupal Developer'
+    description: 'The personal website and blog of Oliver Davies, a Drupal Developer and Systems Administrator from Wales, UK.'
+    type: website
+    image:
+      url: http://www.oliverdavies.co.uk/assets/images/oliver.jpg
+      width: 327
+      height: 327
+      type: image/jpg
 ---
 # About
 

source/robots.txt

@@ -0,0 +1,8 @@
+---
+permalink: none
+---
+User-agent: *
+Disallow: /_projects/
+Disallow: /_testimonials/
+
+Sitemap: {{ site.url }}/sitemap.xml

source/sitemap.xml

@@ -0,0 +1,40 @@
+---
+permalink: sitemap.xml
+use:
+  - posts
+---
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  <url>
+    <loc>{{ site.url }}</loc>
+    <lastmod>{{ site.calculated_date | date('Y-m-d') }}</lastmod>
+    <changefreq>daily</changefreq>
+    <priority>0.8</priority>
+  </url>
+
+    {% set pages = { 0: 'accessibility', 1: 'blog', 2: 'company-information', 3: 'contact', 4: 'services', 5: 'talks', 6: 'work' } %}
+    {% for page in pages %}
+      <url>
+        <loc>{{ site.url }}/{{ page }}</loc>
+        <lastmod>{{ site.calculated_date | date('Y-m-d') }}</lastmod>
+        <changefreq>monthly</changefreq>
+        <priority>0.6</priority>
+      </url>
+    {% endfor %}
+
+  <url>
+    <loc>{{ site.url }}/blog</loc>
+    <lastmod>{{ site.calculated_date | date('Y-m-d') }}</lastmod>
+    <changefreq>monthly</changefreq>
+    <priority>0.8</priority>
+  </url>
+
+  {% for post in data.posts %}
+  <url>
+    <loc>{{ site.url }}{{ post.url }}</loc>
+    <lastmod>{{ post.date|date('c') }}</lastmod>
+    <changefreq>weekly</changefreq>
+    <priority>1.0</priority>
+  </url>
+  {% endfor %}
+</urlset>

source/talks.html.twig

@@ -10,27 +10,60 @@ talks:
   - date: 2012-09-05
     location: unified.diff
     description: <a href="http://vimeo.com/49827006">So, what is this Drupal thing?</a> - an introduction to Drupal.
+    tags:
+      - user-group
+      - drupal
   - date: 2013-07-10
     location: South Wales Drupal User Group
     description: An overview of the Drupal LDAP module and how I customised it for a client project.
+    tags:
+      - user-group
+      - drupal
+      - ldap
   - date: 2014-03-01
     location: DrupalCamp London
     description: <a href="/blog/what-git-flow">Never Commit to Master</a>: An Introduction to Git Flow.
+    tags:
+      - conference
+      - drupalcamp
+      - git
+      - git-flow
   - date: 2014-07-02
     location: Drupal Bristol User Group
     description: <a href="/blog/drush-make-drupalbristol">drush make drupalbristol</a>: An introduction to Drush and Drush Make.
+    tags:
+      - user-group
+      - drush
+      - drush-make
   - date: 2014-08-09
     location: South Wales Drupal User Group
     description: An impromptu talk about the <a href="https://assoc.drupal.org">Drupal Association</a> and I've done there since joining the team.
+    tags:
+      - user-group
+      - drupal-association
   - date: 2015-01-18
     location: DrupalCamp Brighton
     description: Drupal.org in 2015: What's coming next?
+    tags:
+      - conference
+      - drupalcamp
+      - drupalorg
+      - drupal-association
   - date: 2015-02-28
     location: DrupalCamp London
     description: Drupal.org in 2015: What's coming next?
+    tags:
+      - conference
+      - drupalcamp
+      - drupalorg
+      - drupal-association
   - date: 2015-04-08
     location: PHPSW
     description: <a href="https://speakerdeck.com/opdavies/drupal-8">Drupal 8</a> (lightning talk)
+    tags:
+      - user-group
+      - drupal
+      - drupal-8
 ---
 <h1>Talks</h1>
 

source/themes/opdavies/opdavies/_layouts/default.html.twig

@@ -7,9 +7,9 @@
     {% if page.meta.description %}
       <meta name="description" content="{{ page.meta.description|e('html') }}">
     {% endif %}
+    {% if page.meta.og %}{% include "og" with {og: page.meta.og} %}{% endif %}
     <link rel="author" href="{{ site.url }}/humans.txt" />
-    <title>{% if (page.front == true) and (site.subtitle) %}{{ site.subtitle }}{% else %}{{ page.title }}{% endif %} | {{ site.title }}</title>
-    
+    {% include 'title' %}
     <link rel="stylesheet" href="{{ site.url }}/{{ theme_path('assets/css/styles.css') }}">
     {% block styles %}{% endblock %}
   </head>

source/themes/opdavies/opdavies/_partials/navbar.html.twig

@@ -12,11 +12,9 @@
     <div id="navbar" class="collapse navbar-collapse">
       <ul class="nav navbar-nav navbar-right" role="navigation">
         <li{% if page.nav == 'about' %} class="active"{% endif %}><a href="{{ site.url }}">About</a></li>
-        <li{% if page.nav == 'work' %} class="active"{% endif %}><a href="{{ site.url }}/work">Work</a></li>
-        <li{% if page.nav == 'services' %} class="active"{% endif %}><a href="{{ site.url }}/services">Services</a></li>
-        <li{% if page.nav == 'talks' %} class="active"{% endif %}><a href="{{ site.url }}/talks">Talks</a></li>
-        <li{% if page.nav == 'blog' %} class="active"{% endif %}><a href="{{ site.url }}/blog">Blog</a></li>
-        <li{% if page.nav == 'contact' %} class="active"{% endif %}><a href="{{ site.url }}/contact">Contact</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>
+        {% endfor %}
       </ul>
     </div>{# .nav-collapse #}
   </div>

source/themes/opdavies/opdavies/_partials/og.html.twig

@@ -0,0 +1,37 @@
+{% if og.title %}
+  <meta property="og:title" content="{{ og.title|raw }}"/>
+{% endif %}
+
+{% if og.description %}
+  <meta property="og:description" content="{{ og.description|raw }}"/>
+{% endif %}
+
+{% if og.type %}
+  <meta property="og:type" content="{{ og.type }}"/>
+{% endif %}
+
+{% if og.image and og.image.url %}
+  <meta property="og:image" content="{{ og.image.url }}"/>
+  {% if og.image.type %}
+    <meta property="og:image:type" content="{{ og.image.type }}"/>
+  {% endif %}
+  {% if og.image.width %}
+    <meta property="og:image:width" content="{{ og.image.width }}"/>
+  {% endif %}
+  {% if og.image.height %}
+    <meta property="og:image:height" content="{{ og.image.height }}"/>
+  {% endif %}
+{% endif %}
+
+{% if og.title %}
+  {% if og.image %}
+    <meta name="twitter:card" content="summary_large_image" />
+    <meta name="twitter:image:src" content="{{ og.image.url }}">
+    <meta name="twitter:creator" content="@opdavies" />
+  {% else %}
+    <meta name="twitter:card" content="summary" />
+  {% endif %}
+  <meta name="twitter:title" content="{{ og.title|raw }}" />
+  <meta name="twitter:description" content="{{ og.description|raw }}" />
+  <meta name="twitter:site" content="@opdavies" />
+{% endif %}

source/themes/opdavies/opdavies/_partials/title.html.twig

@@ -0,0 +1,14 @@
+{% set separator = '|' %}
+{% spaceless %}<title>
+  {% if page.full_title %}
+    {{ page.full_title }}
+  {% elseif page.title and site.title %}
+    {{ page.title }} {{ separator }} {{ site.title }}
+  {% elseif site.title %}
+    {% if site.subtitle %}
+      {{ site.subtitle }} {{ separator }} {{ site.title }}
+    {% else %}
+      {{ site.title }}
+    {% endif %}
+  {% endif %}
+</title>{% endspaceless %}