From 0090dcc57ff6c16ca3628b2c5f0e56cd330a908e Mon Sep 17 00:00:00 2001
From: LongHairedHacker <sebastian@sebastians-site.de>
Date: Tue, 15 Nov 2016 19:53:18 +0100
Subject: [PATCH] Switched to new metadata format

---
 content/content.md                  | 7 ++++---
 content/content_other.md            | 8 +++-----
 content/content_yetanother.md       | 7 +++----
 content/news/test.md                | 8 +++-----
 content/news/test1.md               | 8 +++-----
 content/test_gallery/description.md | 7 ++++---
 testblog.py                         | 3 +++
 verdandi                            | 2 +-
 8 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/content/content.md b/content/content.md
index 2b07397..4e19adb 100644
--- a/content/content.md
+++ b/content/content.md
@@ -1,7 +1,8 @@
-12.2.2014 13:37
-12.2.2014 23:42
+title: A cool new Page
+creation_time:  12.2.2014 13:37
+edit_time:      12.2.2014 23:42
 
-A cool new Page
+I don't have a news item ....
 
 Test
 ----
diff --git a/content/content_other.md b/content/content_other.md
index c7c735a..5f5fd64 100644
--- a/content/content_other.md
+++ b/content/content_other.md
@@ -1,8 +1,6 @@
-12.2.2014 13:37
-12.2.2014 23:42
-
-Yet an other cool Page
-
+title: Yet an other cool Page
+creation_time:  12.2.2014 13:37
+edit_time:      12.2.2014 23:42
 
 Test
 ----
diff --git a/content/content_yetanother.md b/content/content_yetanother.md
index 6621bb3..68d9bfd 100644
--- a/content/content_yetanother.md
+++ b/content/content_yetanother.md
@@ -1,7 +1,6 @@
-12.2.2014 13:37
-12.2.2014 23:42
-
-An other cool Page
+title: An other cool Page
+creation_time:  12.2.2014 13:37
+edit_time:      12.2.2014 23:42
 
 Test
 ----
diff --git a/content/news/test.md b/content/news/test.md
index 59af990..adbb56d 100644
--- a/content/news/test.md
+++ b/content/news/test.md
@@ -1,7 +1,5 @@
-1.1.2016 12:00
-22.1.2016 17:00
-
-First test
-
+title: First test
+creation_time:  1.1.2016 12:00
+edit_time:      22.1.2016 17:00
 
 This is a first test newsitem
diff --git a/content/news/test1.md b/content/news/test1.md
index e670ebb..7d90bec 100644
--- a/content/news/test1.md
+++ b/content/news/test1.md
@@ -1,7 +1,5 @@
-15.1.2016 12:00
-22.1.2016 17:00
-
-Second test
-
+title: Second test
+creation_time:  15.1.2016 12:00
+edit_time:      22.1.2016 17:00
 
 This is an other test newsitem
diff --git a/content/test_gallery/description.md b/content/test_gallery/description.md
index 7caabb5..b1d1c79 100644
--- a/content/test_gallery/description.md
+++ b/content/test_gallery/description.md
@@ -1,7 +1,8 @@
-28.1.2016
-14.2.2016
+title: A Test Gallery
+creation_time:  28.1.2016
+edit_time:      14.2.2016
+
 
-A Test Gallery
 
 This is a test gallery description.
 Awesome shit an stuff !
diff --git a/testblog.py b/testblog.py
index 752324d..2f9ef02 100644
--- a/testblog.py
+++ b/testblog.py
@@ -19,6 +19,7 @@ class TestPage2(Page):
 	menu_title = "Other new Page"
 	menu_label = "cool_page1"
 	content_file = "content_other.md"
+	news_feed_id = "news"
 
 
 class TestPage3(Page):
@@ -27,6 +28,7 @@ class TestPage3(Page):
 	menu_parent = "cool_page1"
 	url = "subdir/page3.html"
 	content_file = "content_yetanother.md"
+	news_feed_id = "news"
 
 class Assets(CommonAssets):
 	assets = [('img', 'img/dir'),
@@ -41,6 +43,7 @@ class News(NewsFeed):
 	url = "news.html"
 	menu_title = "News"
 	menu_label = "news"
+	news_feed_id = "news"
 
 class TestGallery(Gallery):
 	url = "testgallery.html"
diff --git a/verdandi b/verdandi
index 5537235..9d52409 160000
--- a/verdandi
+++ b/verdandi
@@ -1 +1 @@
-Subproject commit 5537235adf6939bd3c498e4428b937254a8fddb2
+Subproject commit 9d524093e3573656feba2b52e22c4b86cc1c0046