summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas "Cakeisalie5" Touhey <thomas@touhey.fr>2018-08-28 13:45:36 +0200
committerThomas "Cakeisalie5" Touhey <thomas@touhey.fr>2018-08-28 13:45:36 +0200
commitf7e9803ca0e2dee0519dc09e2ca6d0135c3cd6a6 (patch)
tree6ff849d1ff5d08c5f0eedbc5a1ae8223a0d44f57
parent2ac360f9e472c377c87a0045be291150f8ab3431 (diff)
Corrected metadata.
-rw-r--r--_config/dev.yml3
-rwxr-xr-x_config/prod.yml3
-rw-r--r--_data/authors.yml16
-rw-r--r--_layouts/default.html42
-rw-r--r--biography.md1
-rw-r--r--paintings.md1
-rw-r--r--pavatar.pngbin0 -> 42237 bytes
7 files changed, 59 insertions, 7 deletions
diff --git a/_config/dev.yml b/_config/dev.yml
index 312759d..dcb9be2 100644
--- a/_config/dev.yml
+++ b/_config/dev.yml
@@ -10,7 +10,8 @@ name: John Touhey
email: john.touhey@orange.fr
url: "https://john.touhey.fr"
baseurl: ""
-bio: Hi, I'm John
+author: john
+description: "John Touhey's personal website."
# Build settings.
destination: _site/dev
diff --git a/_config/prod.yml b/_config/prod.yml
index c0ba40e..4439b48 100755
--- a/_config/prod.yml
+++ b/_config/prod.yml
@@ -10,7 +10,8 @@ name: John Touhey
email: john.touhey@orange.fr
url: "https://john.touhey.fr"
baseurl: ""
-bio: Hi, I'm John
+author: john
+description: "John Touhey's personal website."
# Build settings.
destination: _site/prod
diff --git a/_data/authors.yml b/_data/authors.yml
new file mode 100644
index 0000000..18af94c
--- /dev/null
+++ b/_data/authors.yml
@@ -0,0 +1,16 @@
+john:
+ name:
+ first: John
+ last: Touhey
+ gender: male
+ born: 1960-04-14T00:00:00+01:00
+ website: https://john.touhey.fr/
+
+thomas:
+ name:
+ first: Thomas
+ last: Touhey
+ gender: male
+ born: 1996-12-28T00:00:00+01:00
+ website: https://thomas.touhey.fr/
+ email: thomas@touhey.fr
diff --git a/_layouts/default.html b/_layouts/default.html
index 9ef849e..495e2b1 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,20 +1,52 @@
-<!DOCTYPE html>
+{% comment %} === DESCRIPTION === {% endcomment
+%}{% if page.description %}{% assign desc = page.description %}{% else
+%}{% assign desc = site.description %}{% endif
+%}{% assign url = site.url | append: site.baseurl | append: page.url
+
+%}{% comment %} === AUTHOR === {% endcomment
+%}{% if page.author %}{% assign author = site.data.authors[page.author]
+%}{% else %}{% assign author = site.data.authors[site.author]
+%}{% endif
+
+%}<!DOCTYPE html>
<html><head>
<meta charset="utf-8">
-<title>{% if page.title %}{{ page.title }} | {% endif %}John Touhey</title>
+<title>{% if page.title %}{{ page.title }} | {% endif %}{{ site.name }}</title>
<link rel="canonical" href="{{ site.url }}{{ page.url }}">
-<meta name="author" content="John Touhey">
-<link rel="author" href="{{ page.url }}">
+<meta name="author" content="{{ author.name.first }} {{ author.name.last }}">
+{% if author.website
+%}<link rel="author" href="{{ author.website }}">
+{% endif
+%}<meta property="og:description" name="description" content="{{ desc }}">
<link rel="icon" type="image/png" href="{{ site.baseurl }}/favicon.png">
<!--[if IE]>
<link rel="shortcut icon" type="image/ico" href="{{ site.baseurl }}/favicon.ico">
<[endif]-->
+<meta property="og:title" content="{% if page.title %}{{ page.title }}{% else %}{{ site.name }}{% endif %}">
+<meta property="og:site_name" content="{{ site.name }}">
+<meta property="og:url" content="{{ url }}">
+<meta property="og:type" content="website">
+
+<meta name="twitter:card" content="summary">
+<meta name="twitter:title" content="{% if page.title %}{{ page.title }} | {% endif %}{{ site.name }}">
+<meta name="twitter:description" content="{{ desc }}">
+<meta name="twitter:url" content="{{ url }}">
+{% if site.thumb
+%}<meta name="twitter:image" content="{{ site.thumb }}">
+{% endif
+%}
+{% if site.flattr
+%}<meta name="flattr:id" content="{{ site.flattr }}">
+{% endif
+%}
+<link rel="pavatar" href="{{ site.url }}{{ site.baseurl }}/pavatar.png">
+
{% asset css/main.css %}
</head><body><div class="container">
<div class="side">
-<img class="picture" src="{% asset profile.jpg @path %}" alt="Photo of me during a concert">
+<a href="{{ site.url }}{{ site.baseurl }}/"><img class="picture" src="{% asset profile.jpg @path %}" alt="Photo of me during a concert"></a>
<div class="side-content"><header>
<h1>John Touhey</h1>
diff --git a/biography.md b/biography.md
index 392a70f..f401cfc 100644
--- a/biography.md
+++ b/biography.md
@@ -1,6 +1,7 @@
---
layout: default
title: Biography
+author: thomas
---
_This biography has been written not by John himself, but by his son, who_
_started writing this shortly after he had found old tapes in the loft._
diff --git a/paintings.md b/paintings.md
index 606c104..7af164f 100644
--- a/paintings.md
+++ b/paintings.md
@@ -1,6 +1,7 @@
---
layout: default
title: Paintings
+description: Paintings by John Touhey.
---
<div class="gallery">
diff --git a/pavatar.png b/pavatar.png
new file mode 100644
index 0000000..a9d0462
--- /dev/null
+++ b/pavatar.png
Binary files differ