streamlined all templates
This commit is contained in:
parent
7f3fbd61cf
commit
4ccfa4b818
@ -283,14 +283,18 @@ h1, h2, h3, h4, h5, h6 {
|
|||||||
|
|
||||||
|
|
||||||
/* Main content */
|
/* Main content */
|
||||||
#main-header h1,
|
#site-footer p,
|
||||||
#site-footer p {
|
.extra-header h1 {
|
||||||
box-shadow: var(--pico-card-box-shadow);
|
box-shadow: var(--pico-card-box-shadow);
|
||||||
padding: calc(var(--pico-block-spacing-horizontal) * 0.5) calc(var(--pico-block-spacing-vertical) * 0.5);
|
padding: calc(var(--pico-block-spacing-horizontal) * 0.5) calc(var(--pico-block-spacing-vertical) * 0.5);
|
||||||
text-align: center;
|
text-align: center;
|
||||||
background-color: var(--pico-card-background-color);
|
background-color: var(--pico-card-background-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#content-header h1 {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
.featured-image {
|
.featured-image {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
@ -299,7 +303,7 @@ figcaption {
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
font-size: 0.8em;
|
font-size: 0.8em;
|
||||||
|
|
||||||
a { font-size: 0.85m;}
|
a { font-size: 0.85em;}
|
||||||
}
|
}
|
||||||
|
|
||||||
#no-bottom-margin {
|
#no-bottom-margin {
|
||||||
@ -307,8 +311,16 @@ figcaption {
|
|||||||
clip-path: inset(-138px -138px -0px -138px);
|
clip-path: inset(-138px -138px -0px -138px);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Index page */
|
article form {
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.padded {
|
||||||
|
margin-left: var(--pico-block-spacing-horizontal);
|
||||||
|
margin-right: var(--pico-block-spacing-horizontal);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Index page */
|
||||||
.index {
|
.index {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
@ -593,7 +605,7 @@ img.impr {
|
|||||||
height: 1.2lh;
|
height: 1.2lh;
|
||||||
}
|
}
|
||||||
|
|
||||||
.main-footer {
|
.content-footer {
|
||||||
font-size: calc(var(--pico-font-size) * .7);
|
font-size: calc(var(--pico-font-size) * .7);
|
||||||
|
|
||||||
a {
|
a {
|
||||||
|
|||||||
@ -7,14 +7,16 @@
|
|||||||
{% if article.summary %} {{ article.summary|e }} {% else %} An Article in {{ SITETAG }}: {{ article.title }}{% endif %}
|
{% if article.summary %} {{ article.summary|e }} {% else %} An Article in {{ SITETAG }}: {{ article.title }}{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block content_header %}
|
{% block content_all %}
|
||||||
<header id="main-header">
|
|
||||||
<h1>{{ article.title }}</h1>
|
|
||||||
</header>
|
|
||||||
{% endblock content_header %}
|
|
||||||
|
|
||||||
{% block content_body %}
|
|
||||||
<article>
|
<article>
|
||||||
|
|
||||||
|
{% block content_header %}
|
||||||
|
<header id="content-header">
|
||||||
|
<h1>{{ article.title }}</h1>
|
||||||
|
</header>
|
||||||
|
{% endblock content_header %}
|
||||||
|
|
||||||
|
{% block content_body %}
|
||||||
<div id="content-body">
|
<div id="content-body">
|
||||||
<div class="body-column-text">
|
<div class="body-column-text">
|
||||||
{% if article.content | length is not eq(0) %}
|
{% if article.content | length is not eq(0) %}
|
||||||
@ -62,9 +64,12 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endblock content_body %}
|
{% endblock content_body %}
|
||||||
|
|
||||||
{% block content_footer %}
|
{% block content_footer %}
|
||||||
<footer class="content-footer">
|
<footer class="content-footer">
|
||||||
<a href="/{{ article.save_as.split('/')[:-1] | join('/') }}/">← {{ article.category }}</a>
|
<a href="/{{ article.save_as.split('/')[:-1] | join('/') }}/">← {{ article.category }}</a>
|
||||||
</footer>
|
</footer>
|
||||||
|
{% endblock content_footer %}
|
||||||
|
|
||||||
</article>
|
</article>
|
||||||
{% endblock content_footer %}
|
{% endblock content_all %}
|
||||||
|
|||||||
@ -17,22 +17,26 @@
|
|||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<header>
|
{% block site_header %}
|
||||||
<div id="jumbotron">{% include "includes/jumbotron.html" %}</div>
|
<header><div id="jumbotron">{% include "includes/jumbotron.html" %}</div></header>
|
||||||
</header>
|
{% endblock site_header %}
|
||||||
|
|
||||||
<main class="container">
|
<main class="container">
|
||||||
<div id="main-content" role="document">
|
<div id="site-content" role="document">
|
||||||
|
{% block content_all %}
|
||||||
{% block content_header %}
|
{% block content_header %}
|
||||||
{% endblock %}
|
{% endblock content_header %}
|
||||||
{% block content_body %}
|
{% block content_body %}
|
||||||
{% endblock %}
|
{% endblock content_body %}
|
||||||
{% block content_footer %}
|
{% block content_footer %}
|
||||||
{% endblock %}
|
{% endblock content_footer %}
|
||||||
|
{% endblock content_all %}
|
||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
|
{% block site_footer %}
|
||||||
<footer id="site-footer">{% include "includes/footer.html" %}</footer>
|
<footer id="site-footer">{% include "includes/footer.html" %}</footer>
|
||||||
|
{% endblock site_footer %}
|
||||||
</body>
|
</body>
|
||||||
<script src="{{ SITEURL }}/theme/js/SwitchColorMode.js"></script>
|
<script src="{{ SITEURL }}/theme/js/SwitchColorMode.js"></script>
|
||||||
</html>
|
</html>
|
||||||
@ -1,8 +1,16 @@
|
|||||||
{% extends "page.html" %}
|
{% extends "base.html" %}
|
||||||
|
|
||||||
|
{% block content_all %}
|
||||||
|
|
||||||
|
{% block content_header %}
|
||||||
|
<div class="extra-header">
|
||||||
|
<h1>{{ page.title }}</h1>
|
||||||
|
</div>
|
||||||
|
{% endblock content_header %}
|
||||||
|
|
||||||
{% block content_body %}
|
{% block content_body %}
|
||||||
{% set selector_value = page.card_selector_value if page.card_selector_value is defined else page.title %}
|
{% set selector_value = page.card_selector_value if page.card_selector_value is defined else page.title %}
|
||||||
<section class="cards">
|
<div class="cards">
|
||||||
{% set article_list = [] %}
|
{% set article_list = [] %}
|
||||||
{% for article in articles if article[page.card_selector_key] == selector_value %}{% do article_list.append(article) %}{% endfor %}
|
{% for article in articles if article[page.card_selector_key] == selector_value %}{% do article_list.append(article) %}{% endfor %}
|
||||||
{% for article in article_list | sort(attribute="order") %}
|
{% for article in article_list | sort(attribute="order") %}
|
||||||
@ -19,5 +27,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</article>
|
</article>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</section>
|
</div>
|
||||||
{% endblock content_body %}
|
{% endblock content_body %}
|
||||||
|
|
||||||
|
{% endblock content_all %}
|
||||||
|
|||||||
@ -1,13 +1,28 @@
|
|||||||
{% extends "page.html" %} {% block content_header %}
|
{% extends "page.html" %}
|
||||||
|
|
||||||
|
{% block content_all %}
|
||||||
<article>
|
<article>
|
||||||
|
|
||||||
|
{% block content_header %}
|
||||||
|
{{ super() }}
|
||||||
|
{% endblock content_header %}
|
||||||
|
|
||||||
|
{% block content_body %}
|
||||||
{% if page.featured_image %}
|
{% if page.featured_image %}
|
||||||
<header class="content-header">
|
{% from 'includes/macros.html' import fi %}
|
||||||
{% from 'includes/macros.html' import fi %} {% set i =
|
{% set i = page.featured_image[0] %}
|
||||||
page.featured_image[0] %} {{ fi(i.pic, i.link, i.text, i.alt, i.credit,
|
{{ fi(i.pic, i.link, i.text, i.alt, i.credit, i.credit_link) }}
|
||||||
i.credit_link) }}
|
{% endif %}
|
||||||
</header>
|
|
||||||
{% endif %} {% endblock content_header %} {% block content_body %} {% include
|
{% if page.content %}
|
||||||
"includes/contact_form.html" %} {% endblock content_body %} {% block
|
<div class="padded">
|
||||||
content_footer %}
|
{{ page.content }}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% include "includes/contact_form.html" %}
|
||||||
|
|
||||||
|
{% endblock content_body %}
|
||||||
|
|
||||||
</article>
|
</article>
|
||||||
{% endblock content_footer %}
|
{% endblock content_all %}
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
<div class="container main-footer" >
|
<div class="container site-footer" >
|
||||||
{% set t = [ pages | map(attribute="modified") | list | max , articles | map(attribute="modified") | list | max ] | max %}
|
{% set t = [ pages | map(attribute="modified") | list | max , articles | map(attribute="modified") | list | max ] | max %}
|
||||||
<p>{{ t.strftime("%Y") }} erstellt mit <a href="https://www.getpelican.com/" target="_blank">Pelican</a> und viel <span class="heart">♥</span> von Tobias Radloff</p>
|
<p>{{ t.strftime("%Y") }} erstellt mit <a href="https://www.getpelican.com/" target="_blank">Pelican</a> und viel <span class="heart">♥</span> von Tobias Radloff</p>
|
||||||
</div>
|
</div>
|
||||||
@ -3,7 +3,7 @@
|
|||||||
<div class="featured-image">
|
<div class="featured-image">
|
||||||
<figure>
|
<figure>
|
||||||
{% if link %}<a href="{{ link }}"{% if title %} title="{{ title }}"{% endif %}>{% endif %}<img class="image-process-featured" src="{{ pic }}"{% if alt %} alt="{{ alt }}"{% endif %}/>{% if link %}</a>{% endif %}
|
{% if link %}<a href="{{ link }}"{% if title %} title="{{ title }}"{% endif %}>{% endif %}<img class="image-process-featured" src="{{ pic }}"{% if alt %} alt="{{ alt }}"{% endif %}/>{% if link %}</a>{% endif %}
|
||||||
{% if credit %}<figcaption>{% if credit_link %}<a href="{{ credit_link }}" alt="Bildquelle: {{ credit }}" target="_blank">{% endif %}{{ credit }}{% if credit_link %}</a>{% endif %}</figcaption>{% endif %}
|
{% if credit %}<figcaption>Bild: {% if credit_link %}<a href="{{ credit_link }}" alt="Bildquelle: {{ credit }}" target="_blank">{% endif %}{{ credit }}{% if credit_link %}</a>{% endif %}</figcaption>{% endif %}
|
||||||
</figure>
|
</figure>
|
||||||
</div>
|
</div>
|
||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
@ -13,7 +13,7 @@
|
|||||||
<div class="card-image">
|
<div class="card-image">
|
||||||
<figure>
|
<figure>
|
||||||
{% if link %}<a href="{{ link }}"{% if title %} title="{{ title }}"{% endif %}>{% endif %}<img class="image-process-card" src="{{ pic }}"{% if alt %} alt="{{ alt }}"{% endif %}/>{% if link %}</a>{% endif %}
|
{% if link %}<a href="{{ link }}"{% if title %} title="{{ title }}"{% endif %}>{% endif %}<img class="image-process-card" src="{{ pic }}"{% if alt %} alt="{{ alt }}"{% endif %}/>{% if link %}</a>{% endif %}
|
||||||
{% if credit %}<figcaption>{% if credit_link %}<a href="{{ credit_link }}" alt="Bildquelle: {{ credit }}" target="_blank">{% endif %}{{ credit }}{% if credit_link %}</a>{% endif %}</figcaption>{% endif %}
|
{% if credit %}<figcaption>Bild: {% if credit_link %}<a href="{{ credit_link }}" alt="Bildquelle: {{ credit }}" target="_blank">{% endif %}{{ credit }}{% if credit_link %}</a>{% endif %}</figcaption>{% endif %}
|
||||||
</figure>
|
</figure>
|
||||||
</div>
|
</div>
|
||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
|
|||||||
@ -1,17 +1,22 @@
|
|||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
|
|
||||||
{% block content_body %}
|
{% block content_body %}
|
||||||
{% for p in pages if p.title == "Index" %}
|
{% for p in pages if p.title == "Index" %}
|
||||||
{% set lr = cycler("row-reverse", "row") %}
|
|
||||||
{% if p.featured is defined %}
|
{% if p.featured is defined %}
|
||||||
<div class="index-featured"></div>
|
<div class="index-featured">not implemented yet</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% from 'includes/macros.html' import fi %}
|
|
||||||
{% for i in p.index_cards %}
|
{% set lr = cycler("row-reverse", "row") %}
|
||||||
<div class="index" style="flex-direction: {{ lr.next() }};">
|
{% from 'includes/macros.html' import fi %}
|
||||||
|
{% for i in p.index_cards %}
|
||||||
|
<section class="index" style="flex-direction: {{ lr.next() }};">
|
||||||
{{ fi( i.pic, i.link, i.alt, i.title, i.credit, i.credit_link) }}
|
{{ fi( i.pic, i.link, i.alt, i.title, i.credit, i.credit_link) }}
|
||||||
<p><a class="index-link" href="{{ i.link }}">{{ i.alt }}</a></p>
|
<p><a class="index-link" href="{{ i.link }}">{{ i.alt }}</a></p>
|
||||||
</div>
|
</section>
|
||||||
{% endfor %}
|
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% include "includes/subscribe.html" %}
|
{% endfor %}
|
||||||
|
|
||||||
|
{% include "includes/subscribe_form.html" %}
|
||||||
|
|
||||||
{% endblock content_body %}
|
{% endblock content_body %}
|
||||||
|
|||||||
@ -6,14 +6,16 @@
|
|||||||
{% if page.summary %}{{ page.summary|e }}{% else %}{{ super() }}{% endif %}
|
{% if page.summary %}{{ page.summary|e }}{% else %}{{ super() }}{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block content_header %}
|
{% block content_all %}
|
||||||
<header id="main-header">
|
|
||||||
<h1>{{ page.title }}</h1>
|
|
||||||
</header>
|
|
||||||
{% endblock content_header %}
|
|
||||||
|
|
||||||
{% block content_body %}
|
|
||||||
<article>
|
<article>
|
||||||
|
|
||||||
|
{% block content_header %}
|
||||||
|
<header id="content-header">
|
||||||
|
<h1>{{ page.title }}</h1>
|
||||||
|
</header>
|
||||||
|
{% endblock content_header %}
|
||||||
|
|
||||||
|
{% block content_body %}
|
||||||
<div id="content-body">
|
<div id="content-body">
|
||||||
<div class="body-column-text">
|
<div class="body-column-text">
|
||||||
{{ page.content }}
|
{{ page.content }}
|
||||||
@ -39,4 +41,6 @@
|
|||||||
</footer>
|
</footer>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endblock content_footer %}
|
{% endblock content_footer %}
|
||||||
|
|
||||||
</article>
|
</article>
|
||||||
|
{% endblock content_all %}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
{% extends "index.html" %}
|
{% extends "index.html" %}
|
||||||
|
|
||||||
{% block content_header %}
|
{% block content_header %}
|
||||||
<header id="main-header">
|
<header id="content_header">
|
||||||
<h1>{{ tag }} (Schlagwort)</h1>
|
<h1>{{ tag }} (Schlagwort)</h1>
|
||||||
</header>
|
</header>
|
||||||
{% endblock content_header %}
|
{% endblock content_header %}
|
||||||
|
|||||||
@ -3,15 +3,23 @@
|
|||||||
{% if page.termine is defined %}
|
{% if page.termine is defined %}
|
||||||
{% set date_format = "%d.%m." %}
|
{% set date_format = "%d.%m." %}
|
||||||
{% set time_format = "%H:%M" %}
|
{% set time_format = "%H:%M" %}
|
||||||
{% block content_body %}
|
|
||||||
|
{% block content_all %}
|
||||||
<article>
|
<article>
|
||||||
{% if page.featured_image %}
|
|
||||||
<header class="content-header">
|
{% block content_header %}
|
||||||
|
{{ super() }}
|
||||||
|
{% endblock content_header %}
|
||||||
|
|
||||||
|
{% block content_body %}
|
||||||
|
{% if page.featured_image %}
|
||||||
|
<div>
|
||||||
{% from 'includes/macros.html' import fi %}
|
{% from 'includes/macros.html' import fi %}
|
||||||
{% set i = page.featured_image[0] %}
|
{% set i = page.featured_image[0] %}
|
||||||
{{ fi(i.pic, i.link, i.text, i.alt, i.credit, i.credit_link) }}
|
{{ fi(i.pic, i.link, i.text, i.alt, i.credit, i.credit_link) }}
|
||||||
</header>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<div id="content-body">
|
<div id="content-body">
|
||||||
<table class="events">
|
<table class="events">
|
||||||
<thead>
|
<thead>
|
||||||
@ -35,12 +43,16 @@
|
|||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
{% endblock content_body %}
|
{% endblock content_body %}
|
||||||
{% if page.written_at is defined %}
|
|
||||||
{% block content_footer %}
|
{% block content_footer %}
|
||||||
|
{% if page.written_at is defined %}
|
||||||
<footer class="content-footer">
|
<footer class="content-footer">
|
||||||
<p>Letzte Aktualisierung: {{ page.written_at | strftime("%d.%m.%Y, %H:%M Uhr") }}</p>
|
<p>Letzte Aktualisierung: {{ page.written_at | strftime("%d.%m.%Y, %H:%M Uhr") }}</p>
|
||||||
</footer>
|
</footer>
|
||||||
{% endblock content_footer %}
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% endblock content_footer %}
|
||||||
|
|
||||||
</article>
|
</article>
|
||||||
|
{% endblock content_all %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,12 @@
|
|||||||
{% extends "page.html" %}
|
{% extends "base.html" %}
|
||||||
|
|
||||||
|
{% block content_all%}
|
||||||
|
|
||||||
|
{% block content_header %}
|
||||||
|
<div class="extra-header">
|
||||||
|
<h1>{{ page.title }}</h1>
|
||||||
|
</div>
|
||||||
|
{% endblock content_header %}
|
||||||
|
|
||||||
{% block content_body %}
|
{% block content_body %}
|
||||||
{# build list of pages where the slugs correspond to an entry in page.wide_cards; some hackiness required to keep the
|
{# build list of pages where the slugs correspond to an entry in page.wide_cards; some hackiness required to keep the
|
||||||
@ -35,5 +43,4 @@ wide_card) | list | first is defined %}
|
|||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% endblock content_body %}
|
{% endblock content_body %}
|
||||||
|
|
||||||
{% block content_footer %}
|
{% endblock content_all %}
|
||||||
{% endblock content_footer %}
|
|
||||||
Loading…
Reference in New Issue
Block a user