Updated to new verdandi version

Updated content files to new format
This commit is contained in:
Sebastian 2016-11-14 23:54:55 +01:00
parent 8d1ff710ca
commit af98fc66d3
9 changed files with 71 additions and 8 deletions

View File

@ -1,6 +1,8 @@
12.2.2014 13:37 12.2.2014 13:37
12.2.2014 23:42 12.2.2014 23:42
A cool new Page
Test 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. 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.

30
content/content_other.md Normal file
View File

@ -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
* <strike>dolor</strike>
* *sit*
* **amet**.
1. Lol
2. No
3. Nope

View File

@ -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
* <strike>dolor</strike>
* *sit*
* **amet**.
1. Lol
2. No
3. Nope

View File

@ -1,5 +1,7 @@
28.1.2016 28.1.2016
14.2.2016 14.2.2016
A Test Gallery
This is a test gallery description. This is a test gallery description.
Awesome shit an stuff ! Awesome shit an stuff !

View File

@ -1,12 +1,12 @@
<html> <html>
<head> <head>
<title>{{page_title}}</title> <title>{{title}}</title>
</head> </head>
<body> <body>
{{menu}} {{menu}}
<br/> <br/>
{% block content %} {% block content %}
<h1 class="mainheading">{{page_title}}</h1> <h1 class="mainheading">{{title}}</h1>
{{content}} {{content}}
<br/> <br/>
Created: {{content_creation_time.strftime('%d.%m.%Y %H:%M:%S')}}</br> Created: {{content_creation_time.strftime('%d.%m.%Y %H:%M:%S')}}</br>

View File

@ -1,7 +1,8 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<h1>{{page_title}}</h1> <h1>{{title}}</h1>
{{description}}
{% for image in images %} {% for image in images %}
<a href="{{image.image}}"><img src="{{image.thumb}}" /></a> <a href="{{image.image}}"><img src="{{image.thumb}}" /></a>

View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<rss version="2.0"> <rss version="2.0">
<title>{{title}}</title>
<channel> <channel>
{% for item in items %} {% for item in items %}
<item> <item>

View File

@ -8,26 +8,25 @@ from verdandi.modules.gallery import Gallery
from verdandi.modules.sassassets import SassAssets from verdandi.modules.sassassets import SassAssets
class TestPage1(Page): class TestPage1(Page):
title = "A cool new Page"
menu_title = "New Page" menu_title = "New Page"
menu_label = "new_cool_page" menu_label = "new_cool_page"
class TestPage2(Page): class TestPage2(Page):
title = "An other cool Page"
assets = [('img/foo.png', 'img/'), assets = [('img/foo.png', 'img/'),
('img/foo.png', 'img/bar.png'), ('img/foo.png', 'img/bar.png'),
('img/foo.png', 'img/bar')] ('img/foo.png', 'img/bar')]
url = "page2.html" url = "page2.html"
menu_title = "Other new Page" menu_title = "Other new Page"
menu_label = "cool_page1" menu_label = "cool_page1"
content_file = "content_other.md"
class TestPage3(Page): class TestPage3(Page):
title = "Yet an other cool Page"
menu_title = "Other new Page2" menu_title = "Other new Page2"
menu_label = "cool_page2" menu_label = "cool_page2"
menu_parent = "cool_page1" menu_parent = "cool_page1"
url = "subdir/page3.html" url = "subdir/page3.html"
content_file = "content_yetanother.md"
class Assets(CommonAssets): class Assets(CommonAssets):
assets = [('img', 'img/dir'), assets = [('img', 'img/dir'),
@ -44,7 +43,6 @@ class News(NewsFeed):
menu_label = "news" menu_label = "news"
class TestGallery(Gallery): class TestGallery(Gallery):
title = "A Test Gallery"
url = "testgallery.html" url = "testgallery.html"
gallery_directory = "test_gallery" gallery_directory = "test_gallery"
gallery_images_url = "img/test_gallery" gallery_images_url = "img/test_gallery"

@ -1 +1 @@
Subproject commit fa872d9a047171c64adbdb91710c346edd7e7553 Subproject commit 5537235adf6939bd3c498e4428b937254a8fddb2