Merge branch 'feature-add-avatar-default-meta-image'

app/config/sculpin_site.yml

@@ -13,6 +13,9 @@ availability:
     part: limited
     full: no
 
+avatar:
+    url: /assets/images/me-precedent.jpg
+
 companies:
     appnovation:        { name: Appnovation,           logo: appnovation.png,        url: 'https://www.appnovation.com' }
     cti:                { name: CTI Digital,           logo: cti-digital.png,        url: 'https://www.ctidigital.com' }

source/_partials/head.twig

@@ -9,9 +9,7 @@
         <meta name="description" content="{{ page.meta.description|e('html') }}">
     {% endif %}
 
-    {% if page.meta.og %}
     {% include 'og' with { og: page.meta.og } %}
-    {% endif %}
 
     <link rel="stylesheet" href="{{ site.url }}/assets/css/site.css">
     {% block styles %}{% endblock %}

source/_partials/og.twig

@@ -1,8 +1,5 @@
 <meta property="og:url" content="{{ site.url }}{{ page.url }}">
-
+<meta property="og:title" content="{{ og.title ? og.title|raw : page.title|raw }}"/>
-{% if og.title %}
-    <meta property="og:title" content="{{ og.title|raw }}"/>
-{% endif %}
 
 {% if og.description %}
     <meta property="og:description" content="{{ og.description|raw }}"/>
@@ -23,16 +20,22 @@
     {% if og.image.height %}
         <meta property="og:image:height" content="{{ og.image.height }}"/>
     {% endif %}
+{% else %}
+    <meta property="og:image" content="{{ site.url }}{{ site.avatar.url }}"/>
+    <meta property="og:image:height" content="327"/>
+    <meta property="og:image:type" content="image/jpg">
+    <meta property="og:image:width" content="327"/>
 {% endif %}
 
 {% if og.title %}
     {% if og.image %}
         <meta name="twitter:card" content="summary_large_image"/>
         <meta name="twitter:image:src" content="{{ site.url }}{{ og.image.url }}">
-        <meta name="twitter:creator" content="@{{ site.twitter.name }}"/>
     {% else %}
         <meta name="twitter:card" content="summary"/>
+        <meta name="twitter:image:src" content="{{ site.url }}{{ site.avatar.url }}">
     {% endif %}
+    <meta name="twitter:creator" content="@{{ site.twitter.name }}"/>
     <meta name="twitter:title" content="{{ og.title|raw }}"/>
     <meta name="twitter:text:description" content="{{ og.description|raw }}"/>
     <meta name="twitter:site" content="@{{ site.twitter.name }}"/>

source/_partials/post/about-author.twig

@@ -1,7 +1,7 @@
 <div class="about-author">
     <h2>About the Author</h2>
 
-    <img src="{{ site.gravatar.url }}?s=100" alt="Picture of Oliver" class="img-circle">
+    <img src="{{ site.images_url }}{{ site.avatar.url }}" 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].url }}">{{ site.companies[site.work.company].name }}</a> and also provides freelance consultancy services for Drupal websites, PHP applications and Linux servers.</p>
 </div>