Merge pull request #67 from gregology/updating_tags_categories_and_add_descriptions

audited tags & categories and adding descriptions

Author: gregology

_config.yml

@@ -83,7 +83,7 @@ defaults:
       layout: "page"
       show-avatar: true
 
-link-tags: false
+link-tags: true
 
 exclude:
   - Gemfile

_includes/head.html

@@ -4,13 +4,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
   <meta name="google-site-verification" content="8zE_jkCHHlmp8mLItr7EvVzSutuT6dv7z3tW9oqd8oo" />
 
-  <title>{% if page.use-site-title %}{{ site.title }} {{ site.title-separator }} {{ site.description }}{% elsif page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
   {% if page.charts %}<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>{% endif %}
-  <meta name="author" content="{{ site.author.name }}" />
-
-  {% if page.subtitle %}
-  <meta name="description" content="{{ page.subtitle }}">
-  {% endif %}
 
   {% if page.chart %}
   <script src="/js/Chart.bundle.min.js"></script>
@@ -57,71 +51,5 @@
     {% endfor %}
   {% endif %}
 
-    <!-- Facebook OpenGraph tags -->
-  {% if site.fb_app_id %}
-  <meta property="fb:app_id" content="{{ site.fb_app_id }}" />
-  {% endif %}
-
-  {% if page.meta-title %}
-  <meta property="og:title" content="{{ page.meta-title }}" />
-  {% elsif page.title %}
-  <meta property="og:title" content="{{ page.title }}" />
-  {% else %}
-  <meta property="og:title" content="{{ site.title }}" />
-  {% endif %}
-
-   {% if page.meta-description %}
-  <meta property="og:description" content="{{ page.meta-description }}">
-  {% elsif page.subtitle %}
-  <meta property="og:description" content="{{ page.subtitle }}">
-  {% else %}
-  <meta property="og:description" content="{{ page.content | strip_html | xml_escape | truncatewords: 50 }}">
-  {% endif %}
-
-
-  <meta property="og:type" content="website" />
-
-  {% if page.id %}
-  <meta property="og:url" content="{{ site.url }}{{ page.url }}" />
-  <link rel="canonical" href="{{ site.url }}{{ page.url }}" />
-  {% else %}
-  <meta property="og:url" content="{{ site.url }}{{ page.url | remove: '/index.html' | remove: '.html' }}" />
-  <link rel="canonical" href="{{ site.url }}{{ page.url | remove: '/index.html' | remove: '.html' }}" />
-  {% endif %}
-
-  {% if page.share-img %}
-  <meta property="og:image" content="{{ page.share-img }}" />
-  {% elsif site.avatar %}
-  <meta property="og:image" content="{{ site.url }}{{ site.avatar }}" />
-  {% endif %}
-
-
-  <!-- Twitter summary cards -->
-  <meta name="twitter:card" content="summary" />
-  <meta name="twitter:site" content="@{{ site.author.twitter }}" />
-  <meta name="twitter:creator" content="@{{ site.author.twitter }}" />
-
-  {% if page.meta-title %}
-  <meta name="twitter:title" content="{{ page.meta-title }}" />
-  {% elsif page.title %}
-  <meta name="twitter:title" content="{{ page.title }}" />
-  {% else %}
-  <meta name="twitter:title" content="{{ site.title }}" />
-  {% endif %}
-
-  {% if page.meta-description %}
-  <meta name="twitter:description" content="{{ page.meta-description }}">
-  {% elsif page.subtitle %}
-  <meta name="twitter:description" content="{{ page.subtitle }}">
-  {% else %}
-  <meta name="twitter:description" content="{{ page.content | strip_html | xml_escape | truncatewords: 50 }}">
-  {% endif %}
-
-  {% if page.share-img %}
-  <meta name="twitter:image" content="{{ page.share-img }}" />
-  {% elsif site.avatar %}
-  <meta name="twitter:image" content="{{ site.url }}{{ site.avatar }}" />
-  {% endif %}
-
   <a rel="me" href="https://clar.ke/@greg">Mastodon</a>
 </head>

_layouts/post.html

@@ -2,6 +2,30 @@
 layout: base
 ---
 
+{% if page.tags.size > 0 or page.categories.size > 0 %}
+<script type="application/ld+json">
+{
+  "@context": "https://schema.org",
+  "@type": "BlogPosting",
+  "headline": {{ page.title | jsonify }},
+  "datePublished": "{{ page.date | date_to_xmlschema }}",
+  {% if page.last_modified_at %}"dateModified": "{{ page.last_modified_at | date_to_xmlschema }}",{% endif %}
+  "author": {
+    "@type": "Person",
+    "name": "{{ site.author.name }}",
+    "url": "{{ site.url }}"
+  },
+  "description": {{ page.content | strip_html | truncatewords: 50 | jsonify }},
+  "mainEntityOfPage": {
+    "@type": "WebPage",
+    "@id": "{{ page.url | absolute_url }}"
+  }{% if page.categories.size > 0 %},
+  "articleSection": {{ page.categories[0] | jsonify }}{% endif %}{% if page.tags.size > 0 %},
+  "keywords": {{ page.tags | join: ', ' | jsonify }}{% endif %}
+}
+</script>
+{% endif %}
+
 {% include header.html type="post" %}
 
 <div class="container">
@@ -22,7 +46,7 @@
           Tags:
           {% if site.link-tags %}
           {% for tag in page.tags %}
-            <a href="/tag/{{ tag }}">{{ tag }}</a>
+            <a href="/tag/{{ tag | slugify }}">{{ tag }}</a>
           {% endfor %}
           {% else %}
             {{ page.tags | join: ", " }}

_layouts/tag_index.html

@@ -2,7 +2,11 @@
 layout: default
 ---
 
-<h2 class="post_title">{{page.title}}:</h2>
+{% if page.robots %}
+<meta name="robots" content="{{ page.robots }}">
+{% endif %}
+
+<h2 class="post_title">{{ page.tag }}</h2>
 
 <div class="posts-list">
   {% for post in site.posts %}
@@ -29,9 +33,9 @@ <h4 class="post-subtitle">
     </div>
 
     <div class="blog-tags">
-      Tags: 
+      Tags:
       {% for tag in post.tags %}
-        <a href="/tag/{{ tag }}">{{ tag }}</a>
+        <a href="/tag/{{ tag | slugify }}">{{ tag }}</a>
       {% endfor %}
     </div>
   </article>

_posts/1983-05-03-born.md

@@ -7,9 +7,9 @@ date: 1983-05-03 06:05:00 +0100
 comments: True
 licence: Creative Commons
 categories:
-  - life events
+  - personal
 tags:
-  - born
+  - family
 ---
 
 Today I was born. Waaaaaa!

_posts/2005-01-01-pocket-bike.md

@@ -7,9 +7,9 @@ published_at: 2005-01-01 00:00:00 UTC
 comments: True
 licence: Creative Commons
 categories:
-  - YouTube
+  - creative
 tags:
-  - motor bike
+  - video
 ---
 
 {% include youtube_player.html id='zpscuMoeF0M' %}

_posts/2005-01-01-toast-rider.md

@@ -7,9 +7,9 @@ published_at: 2005-01-01 00:00:00 UTC
 comments: True
 licence: Creative Commons
 categories:
-  - YouTube
+  - creative
 tags:
-  - motor bike
+  - video
 ---
 
 {% include youtube_player.html id='aCWU55Fwzu8' %}

_posts/2006-10-03-ive-got-a-blog.md

@@ -5,6 +5,6 @@ layout: post
 permalink: /2006/10/ive-got-a-blog/
 comments: True
 categories:
-  - Uncategorized
+  - personal
 ---
 It's about time but now I've got a Blog to keep you all up to date with everything that is going in the world of Greg. YAY!

_posts/2006-10-04-no-bike-ride.md

@@ -5,6 +5,6 @@ layout: post
 permalink: /2006/10/no-bike-ride/
 comments: True
 categories:
-  - Army
+  - military
 ---
 On the weekend I was going to be involved in a 24 hour mountain bike race with the Army. A team of 6 have 24 hours to ride as many laps as possible. But I just received a phone call from my Sgt that we're not going any more :,( Stupid unorganised army.

_posts/2006-10-04-still-sick.md

@@ -5,8 +5,9 @@ layout: post
 permalink: /2006/10/still-sick/
 comments: True
 categories:
-  - Play
-  - Work
+  - personal
+tags:
+  - dog
 ---
 I'm still sick :( I need sympathy... I bought natural yogurt. I thought I'd be healthy, get some good cultures while I'm taking antibiotics. I figured natural yogurt would be really nice but no, no it isn't. It doesn't have any sugar in it :( it's so plan and boring. It's just milk and cultures. Who came up with that? It's ridiculous!