From af98fc66d382bdde851728b70aae8bb95ec898de Mon Sep 17 00:00:00 2001 From: LongHairedHacker Date: Mon, 14 Nov 2016 23:54:55 +0100 Subject: [PATCH] Updated to new verdandi version Updated content files to new format --- content/content.md | 2 ++ content/content_other.md | 30 +++++++++++++++++++++++++++++ content/content_yetanother.md | 29 ++++++++++++++++++++++++++++ content/test_gallery/description.md | 2 ++ templates/base.html | 4 ++-- templates/gallery.html | 3 ++- templates/newsfeed.rss | 1 + testblog.py | 6 ++---- verdandi | 2 +- 9 files changed, 71 insertions(+), 8 deletions(-) create mode 100644 content/content_other.md create mode 100644 content/content_yetanother.md diff --git a/content/content.md b/content/content.md index f5f27e5..2b07397 100644 --- a/content/content.md +++ b/content/content.md @@ -1,6 +1,8 @@ 12.2.2014 13:37 12.2.2014 23:42 +A cool new Page + Test ---- Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. diff --git a/content/content_other.md b/content/content_other.md new file mode 100644 index 0000000..c7c735a --- /dev/null +++ b/content/content_other.md @@ -0,0 +1,30 @@ +12.2.2014 13:37 +12.2.2014 23:42 + +Yet an other cool Page + + +Test +---- +Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. + +Foo | Rofl | Lol +----|------|----- +A | B | C +D | E | F + + +Stet clita +========== +kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus + +* est +* Lorem +* ipsum +* dolor +* *sit* +* **amet**. + +1. Lol +2. No +3. Nope diff --git a/content/content_yetanother.md b/content/content_yetanother.md new file mode 100644 index 0000000..6621bb3 --- /dev/null +++ b/content/content_yetanother.md @@ -0,0 +1,29 @@ +12.2.2014 13:37 +12.2.2014 23:42 + +An other cool Page + +Test +---- +Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. + +Foo | Rofl | Lol +----|------|----- +A | B | C +D | E | F + + +Stet clita +========== +kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus + +* est +* Lorem +* ipsum +* dolor +* *sit* +* **amet**. + +1. Lol +2. No +3. Nope diff --git a/content/test_gallery/description.md b/content/test_gallery/description.md index 81bce18..7caabb5 100644 --- a/content/test_gallery/description.md +++ b/content/test_gallery/description.md @@ -1,5 +1,7 @@ 28.1.2016 14.2.2016 +A Test Gallery + This is a test gallery description. Awesome shit an stuff ! diff --git a/templates/base.html b/templates/base.html index dcd2549..7e08dee 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,12 +1,12 @@ - {{page_title}} + {{title}} {{menu}}
{% block content %} -

{{page_title}}

+

{{title}}

{{content}}
Created: {{content_creation_time.strftime('%d.%m.%Y %H:%M:%S')}}
diff --git a/templates/gallery.html b/templates/gallery.html index 1b548dd..e15057c 100644 --- a/templates/gallery.html +++ b/templates/gallery.html @@ -1,7 +1,8 @@ {% extends "base.html" %} {% block content %} -

{{page_title}}

+

{{title}}

+ {{description}} {% for image in images %} diff --git a/templates/newsfeed.rss b/templates/newsfeed.rss index 03e9809..266f00f 100644 --- a/templates/newsfeed.rss +++ b/templates/newsfeed.rss @@ -1,5 +1,6 @@ + {{title}} {% for item in items %} diff --git a/testblog.py b/testblog.py index 66a2fc6..752324d 100644 --- a/testblog.py +++ b/testblog.py @@ -8,26 +8,25 @@ from verdandi.modules.gallery import Gallery from verdandi.modules.sassassets import SassAssets class TestPage1(Page): - title = "A cool new Page" menu_title = "New Page" menu_label = "new_cool_page" class TestPage2(Page): - title = "An other cool Page" assets = [('img/foo.png', 'img/'), ('img/foo.png', 'img/bar.png'), ('img/foo.png', 'img/bar')] url = "page2.html" menu_title = "Other new Page" menu_label = "cool_page1" + content_file = "content_other.md" class TestPage3(Page): - title = "Yet an other cool Page" menu_title = "Other new Page2" menu_label = "cool_page2" menu_parent = "cool_page1" url = "subdir/page3.html" + content_file = "content_yetanother.md" class Assets(CommonAssets): assets = [('img', 'img/dir'), @@ -44,7 +43,6 @@ class News(NewsFeed): menu_label = "news" class TestGallery(Gallery): - title = "A Test Gallery" url = "testgallery.html" gallery_directory = "test_gallery" gallery_images_url = "img/test_gallery" diff --git a/verdandi b/verdandi index fa872d9..5537235 160000 --- a/verdandi +++ b/verdandi @@ -1 +1 @@ -Subproject commit fa872d9a047171c64adbdb91710c346edd7e7553 +Subproject commit 5537235adf6939bd3c498e4428b937254a8fddb2