From b9c45535772335b7aa603791650f6a1146d8568e Mon Sep 17 00:00:00 2001
From: Sebastian Frank <frank@basiskonfiguration.de>
Date: Sun, 24 Mar 2019 14:51:40 +0100
Subject: [PATCH] fixed website blog

---
 .../de/01_Navigation/04_Blog/config.yml       |  6 ++---
 website/project-files/css/main.css            |  4 +++
 website/templates/base.html                   |  2 ++
 website/templates/base_blog.html              |  2 ++
 website/templates/base_blog_details.html      | 25 +++++++++++++++++++
 5 files changed, 36 insertions(+), 3 deletions(-)

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 @@
 
 	<!-- ========== Main Content ========== -->
 	<div class="maincontent">
+	{% block bg %}
 		{% if Data.background %}
 			<img 
 				src="{{ Data.background|image_process:"p=fill,w=1440,h=810,q=30,t=/img" }}" 
@@ -109,6 +110,7 @@
 						{{ Data.background|image_process:"p=fill,w=1920,h=1020,q=30,t=/img" }} 1920w"
 				alt="{{ Meta.Title }}" class="img2bg">
 		{% endif %}
+	{% endblock bg %}
 		<div class="white_section section_padding">
 			<div class="container">
 	{% 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 %}
+        <div class="blogEntry">
         <h2>
             {{ e.title }}
             <div class="datum">{{ e.date|datum }}</div>
@@ -27,5 +28,6 @@
         {% if e.body %}
             <a href="{{ e.date|add:"-"|add:e.title|slugify }}" class="btn">mehr lesen &raquo;</a>
         {% endif %}
+        </div>
     {% 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 %}
+		<div class="slide">
+			<img 
+				src="{{ "https://mark2web.basiscms.de"|add:img.path|image_process:"p=fill,w=1440,h=600,q=60" }}" 
+				srcset="{{ "https://mark2web.basiscms.de"|add:img.path|image_process:"p=fill,w=768,h=384,q=60" }} 768w,
+						{{ "https://mark2web.basiscms.de"|add:img.path|image_process:"p=fill,w=1440,h=600,q=60" }} 1440w,
+						{{ "https://mark2web.basiscms.de"|add:img.path|image_process:"p=fill,w=1920,h=800,q=60" }} 1920w"
+				alt="{{ img.meta.title }}">
+		</div>
+		{% endif %}
+	{% endwith %}
 	{% for sl in Data.details.slider %}
 		<div class="slide">
 			<img 
@@ -29,6 +41,19 @@
     {{ Data.details.teaser|markdown:"s=monokai" }}
 {% endblock part0 %}
 
+{% block bg %}
+	{% with Data.details.firstimg as img %}
+		{% if img %}
+			<img 
+				src="{{ "https://mark2web.basiscms.de"|add:img.path|image_process:"p=fill,w=1440,h=810,q=30,t=/img" }}" 
+				srcset="{{ "https://mark2web.basiscms.de"|add:img.path|image_process:"p=fill,w=768,h=768,q=30,t=/img" }} 768w,
+						{{ "https://mark2web.basiscms.de"|add:img.path|image_process:"p=fill,w=1440,h=810,q=30,t=/img" }} 1440w,
+						{{ "https://mark2web.basiscms.de"|add:img.path|image_process:"p=fill,w=1920,h=1020,q=30,t=/img" }} 1920w"
+				alt="{{ Meta.Title }}" class="img2bg">
+		{% endif %}
+	{% endwith %}
+{% endblock bg %}
+
 {% block part1 %}
     {{ Body }}
     <br>