From d5878531808d93a93b7072ae1abcfb187d455cb2 Mon Sep 17 00:00:00 2001 From: Maximilian Held Date: Mon, 10 Mar 2014 14:57:59 +0100 Subject: [PATCH 1/6] Accepts G+ username instead of full URL, adds Google authorship as per https://support.google.com/webmasters/answer/1408986?expand=option2 --- _includes/_author-bio.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_includes/_author-bio.html b/_includes/_author-bio.html index ec97dc04..ffbb8c9b 100644 --- a/_includes/_author-bio.html +++ b/_includes/_author-bio.html @@ -3,7 +3,8 @@

{{ site.owner.bio }}

{% if site.owner.twitter %} Twitter{% endif %} {% if site.owner.facebook %} Facebook{% endif %} -{% if site.owner.google_plus %} Google+{% endif %} +{% if site.owner.google_plus %} Google+{% endif %} {% if site.owner.linkedin %} LinkedIn{% endif %} {% if site.owner.instagram %} Instagram{% endif %} {% if site.owner.tumblr %} Tumblr{% endif %} From a6dcf3a9e7feb45a94f3356684dbff2c2f036b33 Mon Sep 17 00:00:00 2001 From: Maximilian Held Date: Mon, 10 Mar 2014 16:25:07 +0100 Subject: [PATCH 2/6] Site.owner.avatar now accepts local images and hotlinked images (conditional on http://, https:// in string) --- _includes/_author-bio.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/_includes/_author-bio.html b/_includes/_author-bio.html index ffbb8c9b..3378a352 100644 --- a/_includes/_author-bio.html +++ b/_includes/_author-bio.html @@ -1,4 +1,10 @@ -{{ site.owner.name }} bio photo +{% if site.owner.avatar contains 'http://' %} + {{ site.owner.name }} bio photo +{% elsif site.owner.avatar contains 'https://' %} + {{ site.owner.name }} bio photo +{% else %} + {{ site.owner.name }} bio photo +{% endif %}

{{ site.owner.name }}

{{ site.owner.bio }}

{% if site.owner.twitter %} Twitter{% endif %} From e29ea63769af1c70c38a3e2bde41b01a2f7a6c95 Mon Sep 17 00:00:00 2001 From: Maximilian Held Date: Mon, 10 Mar 2014 16:38:18 +0100 Subject: [PATCH 3/6] Revert google change --- _includes/_author-bio.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/_includes/_author-bio.html b/_includes/_author-bio.html index 3378a352..0a6628fc 100644 --- a/_includes/_author-bio.html +++ b/_includes/_author-bio.html @@ -9,8 +9,7 @@

{{ site.owner.bio }}

{% if site.owner.twitter %} Twitter{% endif %} {% if site.owner.facebook %} Facebook{% endif %} -{% if site.owner.google_plus %} Google+{% endif %} +{% if site.owner.google_plus %} Google+{% endif %} {% if site.owner.linkedin %} LinkedIn{% endif %} {% if site.owner.instagram %} Instagram{% endif %} {% if site.owner.tumblr %} Tumblr{% endif %} From 8b65bf0fac8af4bb4336f0ec053de87edcfe2495 Mon Sep 17 00:00:00 2001 From: Maximilian Held Date: Mon, 10 Mar 2014 19:29:27 +0100 Subject: [PATCH 4/6] fix google plus integration in bio, now accepts username --- _config.yml | 2 +- _includes/_author-bio.html | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/_config.yml b/_config.yml index 59ea3183..f7651bfb 100644 --- a/_config.yml +++ b/_config.yml @@ -1,7 +1,7 @@ title: Site Title description: Describe your website. # Your site's domain goes here. Leave localhost server or blank when working locally. -url: http://localhost:4000 +url: #http://localhost:4000 # Owner/author information owner: diff --git a/_includes/_author-bio.html b/_includes/_author-bio.html index 0a6628fc..ffbb8c9b 100644 --- a/_includes/_author-bio.html +++ b/_includes/_author-bio.html @@ -1,15 +1,10 @@ -{% if site.owner.avatar contains 'http://' %} - {{ site.owner.name }} bio photo -{% elsif site.owner.avatar contains 'https://' %} - {{ site.owner.name }} bio photo -{% else %} - {{ site.owner.name }} bio photo -{% endif %} +{{ site.owner.name }} bio photo

{{ site.owner.name }}

{{ site.owner.bio }}

{% if site.owner.twitter %} Twitter{% endif %} {% if site.owner.facebook %} Facebook{% endif %} -{% if site.owner.google_plus %} Google+{% endif %} +{% if site.owner.google_plus %} Google+{% endif %} {% if site.owner.linkedin %} LinkedIn{% endif %} {% if site.owner.instagram %} Instagram{% endif %} {% if site.owner.tumblr %} Tumblr{% endif %} From 676d9f1854091613b78ffaebecb5761553334b7f Mon Sep 17 00:00:00 2001 From: Maximilian Held Date: Mon, 10 Mar 2014 22:41:12 +0100 Subject: [PATCH 5/6] revert some change --- _config.yml | 2 +- _includes/_author-bio.html | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/_config.yml b/_config.yml index f7651bfb..59ea3183 100644 --- a/_config.yml +++ b/_config.yml @@ -1,7 +1,7 @@ title: Site Title description: Describe your website. # Your site's domain goes here. Leave localhost server or blank when working locally. -url: #http://localhost:4000 +url: http://localhost:4000 # Owner/author information owner: diff --git a/_includes/_author-bio.html b/_includes/_author-bio.html index ffbb8c9b..fb6be480 100644 --- a/_includes/_author-bio.html +++ b/_includes/_author-bio.html @@ -3,8 +3,7 @@

{{ site.owner.bio }}

{% if site.owner.twitter %} Twitter{% endif %} {% if site.owner.facebook %} Facebook{% endif %} -{% if site.owner.google_plus %} Google+{% endif %} +{% if site.owner.google_plus %} Google+{% endif %} {% if site.owner.linkedin %} LinkedIn{% endif %} {% if site.owner.instagram %} Instagram{% endif %} {% if site.owner.tumblr %} Tumblr{% endif %} From 91dd45fa79628f6ed4c98e7871f5f04484564c98 Mon Sep 17 00:00:00 2001 From: Maximilian Held Date: Mon, 10 Mar 2014 22:49:54 +0100 Subject: [PATCH 6/6] Make google+ expect handle, not full url for head and author-bio --- _includes/_head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/_head.html b/_includes/_head.html index 399ea5bc..8a726f1b 100644 --- a/_includes/_head.html +++ b/_includes/_head.html @@ -26,7 +26,7 @@ {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %} -{% if site.owner.google_plus %}{% endif %} +{% if site.owner.google_plus %}{% endif %}