From a2eaa3f4b4594b79bdcbe80badc1b216a6781f0e Mon Sep 17 00:00:00 2001
From: Sebastian Frank <frank@basiskonfiguration.de>
Date: Sun, 10 Mar 2019 16:41:56 +0100
Subject: [PATCH] meta in blog details

---
 config/tree.go                                      | 13 +++++++------
 website/content/de/01_Navigation/04_Blog/config.yml |  4 ++--
 website/templates/base.html                         |  2 ++
 website/templates/base_blog_details.html            |  6 ++++++
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/config/tree.go b/config/tree.go
index 2a2bca0..d5c6c63 100644
--- a/config/tree.go
+++ b/config/tree.go
@@ -11,12 +11,13 @@ type CollectionConfig struct {
 	Name        *string `yaml:"Name"`
 	EntriesJSON *string `yaml:"EntriesJSON"`
 	NavTemplate *struct {
-		GoTo     string `yaml:"GoTo"`
-		Navname  string `yaml:"Navname"`
-		Body     string `yaml:"Body"`
-		DataKey  string `yaml:"DataKey"`
-		Hidden   bool   `yaml:"Hidden"`
-		Template string `yaml:"Template"`
+		GoTo      string `yaml:"GoTo"`
+		Navname   string `yaml:"Navname"`
+		Body      string `yaml:"Body"`
+		DataKey   string `yaml:"DataKey"`
+		Hidden    bool   `yaml:"Hidden"`
+		Template  string `yaml:"Template"`
+		Recursive bool   `yaml:"Recursive"`
 	} `yaml:"NavTemplate"`
 }
 
diff --git a/website/content/de/01_Navigation/04_Blog/config.yml b/website/content/de/01_Navigation/04_Blog/config.yml
index c309c6c..527d5ae 100644
--- a/website/content/de/01_Navigation/04_Blog/config.yml
+++ b/website/content/de/01_Navigation/04_Blog/config.yml
@@ -3,7 +3,7 @@ This:
     - Name: blog1st
       EntriesJSON: '{{ fnRequest("https://mark2web.basiscms.de/api/collections/get/mark2webBlog?token=89ff216524093123bf7a0a10f7b273&filter[published]=true&sort[date]=-1&skip=0&limit=1").entries|json }}'
       NavTemplate:
-        GoTo: '{{ date|add:"-"|add:title|slugify }}'
+        GoTo: '{{ date }}-{{ title }}'
         Navname: '{{ title }}'
         Body: '{{ body }}'
         Template: base_blog_details.html
@@ -13,7 +13,7 @@ This:
     - Name: blog1skip
       EntriesJSON: '{{ fnRequest("https://mark2web.basiscms.de/api/collections/get/mark2webBlog?token=89ff216524093123bf7a0a10f7b273&filter[published]=true&sort[date]=-1&skip=1&limit=100").entries|json }}'
       NavTemplate:
-        GoTo: '{{ date|add:"-"|add:title|slugify }}'
+        GoTo: '{{ date }}-{{ title }}'
         Navname: '{{ title }}'
         Body: '{{ body }}'
         Template: base_blog_details.html
diff --git a/website/templates/base.html b/website/templates/base.html
index 6fdaa03..231b833 100755
--- a/website/templates/base.html
+++ b/website/templates/base.html
@@ -9,9 +9,11 @@
 
 
 	<!-- Meta -->
+	{% block meta %}
 	<title>{{ Meta.Title }}</title>
     <meta name="description" content="{{ Meta.Description }}" />
     <meta name="keywords" content="{{ Meta.Keywords }}" />
+	{% endblock meta %}
 
 	<link rel="stylesheet" type="text/css" href="project-files/css/preloader.css">
 
diff --git a/website/templates/base_blog_details.html b/website/templates/base_blog_details.html
index af771bd..00d298f 100644
--- a/website/templates/base_blog_details.html
+++ b/website/templates/base_blog_details.html
@@ -1,5 +1,11 @@
 {% extends 'base.html' %}
 
+{% block meta %}
+	<title>{{ Data.details.date|datum }} {{ Data.details.title }}</title>
+    <meta name="description" content="{{ Data.details.teaser }}" />
+    <meta name="keywords" content="{{ Meta.Keywords }}" />
+{% endblock meta %}
+
 {% block part0 %}
     <h1>
         {{ Data.details.title }}