From 2d5c422a76d326534135cf1dd2aad93e5abff444 Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Sun, 6 Apr 2014 15:35:15 +0200
Subject: [PATCH] improve open graph and twitter cards

---
 _src/_includes/head.html         | 41 ++++++++++----------------------
 _src/_includes/opengraph.html    | 37 ++++++++++++++++++++++++++++
 _src/_includes/twittercards.html | 22 +++++++++++++++++
 _src/index.html                  |  3 +--
 4 files changed, 73 insertions(+), 30 deletions(-)
 create mode 100644 _src/_includes/opengraph.html
 create mode 100644 _src/_includes/twittercards.html

diff --git a/_src/_includes/head.html b/_src/_includes/head.html
index 52fa7748..e741eb76 100644
--- a/_src/_includes/head.html
+++ b/_src/_includes/head.html
@@ -31,15 +31,17 @@
     <title>
         {% if paginator.previous_page %}
             Page {{ paginator.page }} &brvbar; {{ page.title }}
-        {% elsif page.path contains '_posts' %}
+        {% elsif page.title %}
             {{ page.title }} &brvbar; {{ site.name }}
         {% else %}
-            {{ page.title }} &brvbar; {{ site.description }}
+            {{ site.name }} &brvbar; {{ site.description }}
         {% endif %}
     </title>
     
     {% if page.description %}
         <meta name="description" content="{{ page.description }}">
+    {% elsif page.front_page %}
+        <meta name="description" content="{{ site.description }}">
     {% else %}
         <meta name="description" content="{{ page.excerpt | strip_html | strip_newlines }}" />
     {% endif %}
@@ -79,31 +81,14 @@
 		var total = {{ paginator.total_pages }};
 	</script>
     {% endif %}
-        
+    
+    <!-- OpenGraph -->
+    {% include opengraph.html %}
+    
     <!-- Twitter Cards -->
-    <meta name="twitter:card" content="summary">
-    <meta name="twitter:site" content="@kremaliciouscom">
-    <meta name="twitter:creator" content="@kremalicious">
-    {% if page.title %}
-        <meta name="twitter:title" content="{{ page.title }}">
-    {% else %}
-        <meta name="twitter:title" content="{{ site.title }}">
-    {% endif %}
-    {% if page.url %}
-        <meta name="twitter:url" content="{{ site.url }}{{ page.url }}">
-    {% endif %}
-    {% if page.description %}
-        <meta name="twitter:description" content="{{ page.description }}">
-    {% else %}
-        <meta name="twitter:description" content="{{ page.excerpt | strip_html }}">
-    {% endif %}
-    {% if page.image %}
-        <meta name="twitter:image:src" content="{{ site.url }}/media/{{ page.image }}">
-    {% else %}
-    	<meta name="twitter:image:src" content="{{ site.url }}/kremalicious1024.png">
-    {% endif %}
-	
-    <!-- Facebook/Google+ Sharing -->
-    <link rel="image_src" href="{{ site.url }}/kremalicious1024.png" />
-
+    {% include twittercards.html %}
+    
+    <!-- Google Authorship -->
+    <link href="https://plus.google.com/+MatthiasKretschmann" rel="author"/>
+    
 </head>
\ No newline at end of file
diff --git a/_src/_includes/opengraph.html b/_src/_includes/opengraph.html
new file mode 100644
index 00000000..06c75505
--- /dev/null
+++ b/_src/_includes/opengraph.html
@@ -0,0 +1,37 @@
+
+<meta content="{{ site.name }}" property="og:site_name">
+{% if page.title %}
+    <meta content="{{ page.title }}" property="og:title">
+{% else %}
+    <meta content="{{ site.name }}" property="og:title">
+{% endif %}
+{% if page.title %}
+    <meta content="article" property="og:type">
+    <meta content="{{ site.url }}/about/" property="article:author">
+{% else %}
+    <meta content="website" property="og:type">
+{% endif %}
+{% if page.description %}
+    <meta content="{{ page.description }}" property="og:description">
+{% elsif page.front_page %}
+    <meta content="{{ site.description }}" property="og:description">
+{% else %}
+    <meta content="{{ page.excerpt | strip_html | strip_newlines }}" property="og:description">
+{% endif %}
+{% if page.url %}
+    {% capture canonical %}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %}
+    <meta content="{{ site.url }}{{ canonical }}" property="og:url"> 
+{% endif %}
+{% if page.date %}
+    <meta content="{{ page.date | date_to_xmlschema }}" property="article:published_time">
+{% endif %}
+{% if page.image %}
+    <meta content="{{ site.url }}/media/{{ page.image }}" property="og:image">
+{% else %}
+    <meta content="{{ site.url }}/kremalicious1024.png" property="og:image">
+{% endif %}
+{% if page.categories %}
+    {% for category in page.categories limit:1 %}
+        <meta content="{{ category }}" property="article:section">
+    {% endfor %}
+{% endif %}
\ No newline at end of file
diff --git a/_src/_includes/twittercards.html b/_src/_includes/twittercards.html
new file mode 100644
index 00000000..f2edf440
--- /dev/null
+++ b/_src/_includes/twittercards.html
@@ -0,0 +1,22 @@
+
+<meta name="twitter:card" content="summary">
+<meta name="twitter:site" content="@kremaliciouscom">
+<meta name="twitter:creator" content="@kremalicious">
+{% if page.title %}
+    <meta name="twitter:title" content="{{ page.title }}">
+{% else %}
+    <meta name="twitter:title" content="{{ site.title }}">
+{% endif %}
+{% if page.url %}
+    <meta name="twitter:url" content="{{ site.url }}{{ page.url }}">
+{% endif %}
+{% if page.description %}
+    <meta name="twitter:description" content="{{ page.description }}">
+{% else %}
+    <meta name="twitter:description" content="{{ page.excerpt | strip_html }}">
+{% endif %}
+{% if page.image %}
+    <meta name="twitter:image:src" content="{{ site.url }}/media/{{ page.image }}">
+{% else %}
+	<meta name="twitter:image:src" content="{{ site.url }}/kremalicious1024.png">
+{% endif %}
\ No newline at end of file
diff --git a/_src/index.html b/_src/index.html
index 1daa12dc..b1c05862 100644
--- a/_src/index.html
+++ b/_src/index.html
@@ -1,7 +1,6 @@
 ---
 layout: base
-title: kremalicious
-description: 'Blog of designer & developer Matthias Kretschmann'
+front_page: true
 ---
 
 {% if paginator.next_page == 2 %}