diff --git a/website/content/de/01_Navigation/04_Blog/config.yml b/website/content/de/01_Navigation/04_Blog/config.yml index b22e788..060561e 100644 --- a/website/content/de/01_Navigation/04_Blog/config.yml +++ b/website/content/de/01_Navigation/04_Blog/config.yml @@ -1,7 +1,7 @@ -#This: +This: Collections: - Name: blog1st - URL: 'https://mark2web.basiscms.de/api/collections/get/mark2webBlog?token={{ Data.token }}&filter[published]=true&sort[date]=-1&skip=0&limit=1{% if Data.details._id %}&filter[link._id]={{ Data.details._id }}{% else %}&filter[link][$exists]=0{% endif %}' + URL: 'https://mark2web.basiscms.de/api/collections/get/mark2webBlog?token={{ Data.token }}&filter[published]=true&sort[date]=-1&skip=0&limit=1' NavTemplate: EntriesAttribute: entries GoTo: '{{ date }}-{{ title }}' @@ -12,7 +12,7 @@ Hidden: true # hide from nav, but use this feature for rendering detail sites - Name: blog1skip - URL: 'https://mark2web.basiscms.de/api/collections/get/mark2webBlog?token={{ Data.token }}&filter[published]=true&sort[date]=-1&skip=1&limit=100{% if Data.details._id %}&filter[link._id]={{ Data.details._id }}{% else %}&filter[link][$exists]=0{% endif %}' + URL: 'https://mark2web.basiscms.de/api/collections/get/mark2webBlog?token={{ Data.token }}&filter[published]=true&sort[date]=-1&skip=1&limit=100' NavTemplate: EntriesAttribute: entries GoTo: '{{ date }}-{{ title }}' diff --git a/website/project-files/css/main.css b/website/project-files/css/main.css index 78823a7..6f9fc98 100755 --- a/website/project-files/css/main.css +++ b/website/project-files/css/main.css @@ -302,4 +302,8 @@ code.language-mermaid svg { background: #ddd; border: #444 solid 1px; border-radius: 5px; +} + +.blogEntry { + margin-bottom: 50px; } \ No newline at end of file diff --git a/website/templates/base.html b/website/templates/base.html index a69ab2d..ad9ff60 100755 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -101,6 +101,7 @@
+ {% block bg %} {% if Data.background %} {{ Meta.Title }} {% endif %} + {% endblock bg %}
{% block part1 %} diff --git a/website/templates/base_blog.html b/website/templates/base_blog.html index d400371..86f3fb8 100644 --- a/website/templates/base_blog.html +++ b/website/templates/base_blog.html @@ -19,6 +19,7 @@ limit wird für skip in Query gebraucht {% endcomment %} {% for e in NavElement.ColMap.blog1skip.entries %} +

{{ e.title }}
{{ e.date|datum }}
@@ -27,5 +28,6 @@ {% if e.body %} mehr lesen » {% endif %} +

{% endfor %} {% endblock part1 %} diff --git a/website/templates/base_blog_details.html b/website/templates/base_blog_details.html index a5b648e..2a335fe 100644 --- a/website/templates/base_blog_details.html +++ b/website/templates/base_blog_details.html @@ -8,6 +8,18 @@ {% if Data.details.slider %} {% block slider %} + {% with Data.details.firstimg as img %} + {% if img %} +
+ {{ img.meta.title }} +
+ {% endif %} + {% endwith %} {% for sl in Data.details.slider %}
{{ Meta.Title }} + {% endif %} + {% endwith %} +{% endblock bg %} + {% block part1 %} {{ Body }}