From 2de838b458cbfbef8046bc0dd09c2ccae3d0d69b Mon Sep 17 00:00:00 2001
From: Marc Horne <me@marcushorne.com>
Date: Sun, 21 May 2017 21:36:05 +0200
Subject: [PATCH 1/3] [#25] Added social media meta-data

---
 config.toml                |  3 +++
 layouts/partials/head.html | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/config.toml b/config.toml
index 3fa730f..4c95c20 100644
--- a/config.toml
+++ b/config.toml
@@ -9,6 +9,9 @@ DefaultContentLanguage = "en"
   languageCode = "en-us"
   languageName = "English"
   favicon = "favicon.ico"
+  url = "http://pmpc.mehl.mx/"
+  image_url = "http://pmpc.mehl.mx/img/header.jpg"
+  fb_admin = "mehl.max"
 
 
 # Navigation
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 3b84a74..0f2b29b 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -10,6 +10,22 @@
 {{ range .Translations }}
   <link type="text/html" rel="alternate" hreflang="{{ .Lang }}" lang="{{ .Lang }}" href="{{ .RelPermalink }}" title="{{ .Site.Params.languageName }}">
 {{end}}
+
+{{ "<!-- Facebook meta-data -->" | safeHTML }}
+<meta property="og:title" content="{{ .Site.Title }}"/>
+<meta property="og:type" content="website"/>
+<meta property="og:image" content="{{ .Site.Params.image_url }}"/>
+<meta property="og:url" content="{{ .Site.Params.url }}"/>
+<meta property="og:description" content="{{ .Site.Params.description }}"/>
+<meta property="fb:admins" content="{{ .Site.Params.fb_admin }}"/>
+
+{{ "<!-- Twitter meta-data -->" | safeHTML }}
+<meta name="twitter:card" content="summary">
+<meta name="twitter:url" content="{{ .Site.Params.url }}">
+<meta name="twitter:title" content="{{ .Site.Title }}">
+<meta name="twitter:description" content="{{ .Site.Params.description }}">
+<meta name="twitter:image" content="{{ .Site.Params.image_url }}">
+
 {{ "<!-- Favicon -->" | safeHTML }}
 <link rel="shortcut icon" href="{{ .Site.Params.favicon | absURL }}">
 {{ "<!-- Bootstrap Core CSS -->" | safeHTML }}

From b625d5416e4abc0d6152d3de0d9499152babe508 Mon Sep 17 00:00:00 2001
From: "max.mehl" <max.mehl@fsfe.org>
Date: Mon, 22 May 2017 14:53:15 +0200
Subject: [PATCH 2/3] add/change some fields, add a separate meta section for
 share meta data

---
 config.toml                |  8 +++++---
 layouts/partials/head.html | 15 +++++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/config.toml b/config.toml
index 4c95c20..f3e8c49 100644
--- a/config.toml
+++ b/config.toml
@@ -9,10 +9,12 @@ DefaultContentLanguage = "en"
   languageCode = "en-us"
   languageName = "English"
   favicon = "favicon.ico"
-  url = "http://pmpc.mehl.mx/"
-  image_url = "http://pmpc.mehl.mx/img/header.jpg"
-  fb_admin = "mehl.max"
+  url = "http://pmpc.mehl.mx"
 
+[params.sharemeta]
+  previewImage = "img/header.jpg"
+  fbPageID = "336939393138306"
+  twitterUser = "@fsfe"
 
 # Navigation
 [params.navigation]
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 0f2b29b..b285773 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -13,18 +13,21 @@
 
 {{ "<!-- Facebook meta-data -->" | safeHTML }}
 <meta property="og:title" content="{{ .Site.Title }}"/>
-<meta property="og:type" content="website"/>
-<meta property="og:image" content="{{ .Site.Params.image_url }}"/>
 <meta property="og:url" content="{{ .Site.Params.url }}"/>
+<meta property="og:image" content="{{ .Site.Params.url }}/{{ .Site.Params.Sharemeta.previewImage }}"/>
 <meta property="og:description" content="{{ .Site.Params.description }}"/>
-<meta property="fb:admins" content="{{ .Site.Params.fb_admin }}"/>
+<meta property="og:type" content="website"/>
+<meta property="og:locale" content="{{ .Lang }}"/>
+<meta property="fb:page_id" content="{{ .Site.Params.Sharemeta.fbPageID }}"/>
 
 {{ "<!-- Twitter meta-data -->" | safeHTML }}
-<meta name="twitter:card" content="summary">
-<meta name="twitter:url" content="{{ .Site.Params.url }}">
 <meta name="twitter:title" content="{{ .Site.Title }}">
+<meta name="twitter:url" content="{{ .Site.Params.url }}">
+<meta name="twitter:image" content="{{ .Site.Params.url }}/{{ .Site.Params.Sharemeta.previewImage }}">
 <meta name="twitter:description" content="{{ .Site.Params.description }}">
-<meta name="twitter:image" content="{{ .Site.Params.image_url }}">
+<meta name="twitter:card" content="summary">
+<meta name="twitter:site" content="{{ .Site.Params.Sharemeta.twitterUser }}">
+<meta name="twitter:creator" content="{{ .Site.Params.Sharemeta.twitterUser }}">
 
 {{ "<!-- Favicon -->" | safeHTML }}
 <link rel="shortcut icon" href="{{ .Site.Params.favicon | absURL }}">

From ed27e1c504d12550ee024f3e4c01d09f969743d6 Mon Sep 17 00:00:00 2001
From: "max.mehl" <max.mehl@fsfe.org>
Date: Tue, 30 May 2017 13:18:49 +0200
Subject: [PATCH 3/3] dynamic url in share meta item

---
 layouts/partials/head.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index b285773..4ae381e 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -13,7 +13,7 @@
 
 {{ "<!-- Facebook meta-data -->" | safeHTML }}
 <meta property="og:title" content="{{ .Site.Title }}"/>
-<meta property="og:url" content="{{ .Site.Params.url }}"/>
+<meta property="og:url" content="{{ .Site.Params.url }}{{ .RelPermalink }}"/>
 <meta property="og:image" content="{{ .Site.Params.url }}/{{ .Site.Params.Sharemeta.previewImage }}"/>
 <meta property="og:description" content="{{ .Site.Params.description }}"/>
 <meta property="og:type" content="website"/>
@@ -22,7 +22,7 @@
 
 {{ "<!-- Twitter meta-data -->" | safeHTML }}
 <meta name="twitter:title" content="{{ .Site.Title }}">
-<meta name="twitter:url" content="{{ .Site.Params.url }}">
+<meta name="twitter:url" content="{{ .Site.Params.url }}{{ .RelPermalink }}">
 <meta name="twitter:image" content="{{ .Site.Params.url }}/{{ .Site.Params.Sharemeta.previewImage }}">
 <meta name="twitter:description" content="{{ .Site.Params.description }}">
 <meta name="twitter:card" content="summary">