From 856d5474afd75b5d11e008cd42c082c6e36ab3ee Mon Sep 17 00:00:00 2001
From: davegson <3080765+davegson@users.noreply.github.com>
Date: Wed, 20 May 2020 17:56:03 +0200
Subject: [PATCH] Fix all page titles

---
 _includes/head.html   | 14 +++++++++++++-
 about/index.html      |  1 +
 blog/index.html       |  2 +-
 contact/index.html    |  2 +-
 index.html            |  2 +-
 ownership/index.html  |  2 +-
 portmaster/index.html |  1 +
 team/index.html       |  2 +-
 video/index.html      |  2 +-
 9 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/_includes/head.html b/_includes/head.html
index 663faf0..7cb8407 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -4,7 +4,19 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
 <meta name="description" content="{{ site.description }}">
 <meta name="author" content="{{ site.author }}">
-<title>{% if page.type == "podcast" %}The Safing Podcast {{ page.title }}{% elsif page.type == "post" %}Safing Blog: {{ page.title }}{% elsif page.title == "Safing" %}{{ page.title }}{% else %}Safing {{ page.title }}{% endif %}</title>
+<title>
+  {% if page.type == "podcast" %}
+    {% assign title_length = page.title | size %}
+    {{ page.title | slice: 7, title_length }} - The Safing Podcast #{{ page.title | slice: 2, 2 }}
+  {% elsif page.type == "video" %}
+    {% assign title_length = page.title | size %}
+    {{ page.title | slice: 7, title_length }} - Safing Update #{{ page.title | slice: 2, 2 }}
+  {% elsif page.type == "post" %}
+    {{ page.title }} - Safing Blog
+  {% else %}
+    {{ page.title }}
+  {% endif %}
+</title>
 
 <!-- Favicon and other icons (made with http://www.favicon-generator.org/) -->
 <link rel="apple-touch-icon" sizes="57x57" href="{{ site.assets_url }}icons/apple-icon-57x57.png">
diff --git a/about/index.html b/about/index.html
index b6f2811..30a7a41 100644
--- a/about/index.html
+++ b/about/index.html
@@ -1,4 +1,5 @@
 ---
+title: About Safing
 layout: page
 redirect_from:
   - /our-values/
diff --git a/blog/index.html b/blog/index.html
index 3bba8af..9fb3d8b 100644
--- a/blog/index.html
+++ b/blog/index.html
@@ -1,5 +1,5 @@
 ---
-title: The Safing Blog
+title: Safing Blog
 layout: page
 ---
 
diff --git a/contact/index.html b/contact/index.html
index 5382937..920c96a 100644
--- a/contact/index.html
+++ b/contact/index.html
@@ -1,6 +1,6 @@
 ---
 layout: page_container
-title: Contact
+title: Legal Disclosure - Impressum
 heading: Contact
 container_class: imprint
 ---
diff --git a/index.html b/index.html
index 85fc7b0..309df50 100644
--- a/index.html
+++ b/index.html
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: Safing
+title: Safing - Love Freedom
 ---
 
 {% include header.html %}
diff --git a/ownership/index.html b/ownership/index.html
index eb33016..3d5ecff 100644
--- a/ownership/index.html
+++ b/ownership/index.html
@@ -1,5 +1,5 @@
 ---
-title: Safing Team
+title: Safing Ownership
 layout: page
 ---
 
diff --git a/portmaster/index.html b/portmaster/index.html
index f2f7479..b9c4330 100644
--- a/portmaster/index.html
+++ b/portmaster/index.html
@@ -1,5 +1,6 @@
 ---
 layout: page
+title: Safing Portmaster
 redirect_from:
 - /technology/
 ---
diff --git a/team/index.html b/team/index.html
index 7ff0463..1244a99 100644
--- a/team/index.html
+++ b/team/index.html
@@ -1,5 +1,5 @@
 ---
-title: The Safing Podcast
+title: Team Overview
 layout: page
 ---
 
diff --git a/video/index.html b/video/index.html
index 4b434b8..d5035d1 100644
--- a/video/index.html
+++ b/video/index.html
@@ -1,5 +1,5 @@
 ---
-title: Safing - Video Updates
+title: Safing Video Updates
 layout: page
 ---