apairon/mark2web
1
1
Fork 0
Code Issues 8 Pull Requests Releases 5 Activity

fixed website blog
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Sebastian Frank 2019-03-24 14:51:40 +01:00
parent 745c886cec
commit b9c4553577
Signed by: apairon
GPG Key ID: 7270D06DDA7FE8C3
5 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
website/content/de/01_Navigation/04_Blog/config.yml
View File

@ -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 }}'

4
website/project-files/css/main.css
View File

@ -302,4 +302,8 @@ code.language-mermaid svg {
background: #ddd;
border: #444 solid 1px;
border-radius: 5px;
}
.blogEntry {
margin-bottom: 50px;
}

2
website/templates/base.html
View File

@ -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 %}

2
website/templates/base_blog.html
View File

@ -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 %}

25
website/templates/base_blog_details.html
View File

@ -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>