From e3fae415b7466ef1750a79ad1b4f7b6135cfe80c Mon Sep 17 00:00:00 2001 From: Dominik George <dominik.george@teckids.org> Date: Wed, 16 Oct 2024 22:32:12 +0200 Subject: [PATCH] Reformat templates --- templates/base.html | 54 +++++------ templates/blog/author_media.html | 40 ++++---- templates/blog/card.html | 64 ++++++------- templates/blog/overview.html | 42 ++++----- templates/blog/post.html | 34 +++---- templates/blog/tag_line.html | 12 +-- templates/footer.html | 110 +++++++++++----------- templates/frontpage/claim.html | 42 ++++----- templates/frontpage/projects.html | 36 +++---- templates/menu.html | 8 +- templates/menu/gemeinschaft.html | 52 +++++----- templates/menu/infos.html | 24 ++--- templates/menu/projects.html | 52 +++++----- templates/pages/content.html | 2 +- templates/project.html | 58 ++++++------ templates/shortcodes/further.html | 2 +- templates/shortcodes/hero_section.html | 2 +- templates/shortcodes/photo_section.html | 2 +- templates/shortcodes/teckids_contact.html | 8 +- templates/shortcodes/teckids_event.html | 48 +++++----- templates/shortcodes/teckids_related.html | 84 ++++++++--------- 21 files changed, 388 insertions(+), 388 deletions(-) diff --git a/templates/base.html b/templates/base.html index 327e2b4f..922e8036 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,50 +1,50 @@ {% if page -%} -{% set thing = page -%} + {% set thing = page -%} {% elif section -%} -{% set thing = section -%} + {% set thing = section -%} {% endif -%} <!DOCTYPE html> <html lang="{{ lang }}" data-theme="light" {% if current_path %}resource="https://www.teckids.org{{ current_path }}"{% endif %} typeof="{% block rdfa_type %}{{ thing.extra.microdata.type | default(value='schema:WebPage') }}{% endblock rdfa_type %}"> <head> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1" /> - <meta property="schema:publisher" href="https://teckids.org/" /> + <meta property="schema:publisher" href="https://teckids.org/" /> {% block meta %} - <meta name="description" content="{{ thing.description | default(value=config.description) }}" /> - <link rel="alternate" type="application/atom+xml" href="{{ get_url(path="atom.xml", trailing_slash=false) }}" /> + <meta name="description" content="{{ thing.description | default(value=config.description) }}" /> + <link rel="alternate" type="application/atom+xml" href="{{ get_url(path="atom.xml", trailing_slash=false) }}" /> {% endblock %} - {% block meta_extra %}{% endblock %} + {% block meta_extra %}{% endblock %} {% block og %} - <meta property="og:site_name" content="{{ config.title }}" /> - {% if thing %} - <meta property="og:title" content="{% block og_title %}{{ thing.title | default(value=config.title) }}{% endblock og_title %}" /> - <meta property="og:description" content="{{ thing.description | default(value=config.description) }}" /> - <meta property="og:type" content="{% block og_type %}{{ thing.extra.og.type | default(value='article') }}{% endblock og_type %}" /> - <meta property="og:url" content="{% block og_url %}{{ thing.permalink | safe }}{% endblock og_url %}" /> - {% if thing.extra.depiction %} - <meta property="og:image" content="{{ get_url(path="@/" ~ thing.relative_path, trailing_slash=true) }}{{ thing.extra.depiction.image | safe }}" /> <meta property="og:image:alt" content="{{ thing.extra.depiction.alt }}" /> - {% elif config.extra.og.image %} - <meta property="og:image" content="{{ get_url(path=config.extra.og.image.url) }}" /> - <meta property="og:image:alt" content="{{ config.extra.og.image.alt }}" /> + <meta property="og:site_name" content="{{ config.title }}" /> + {% if thing %} + <meta property="og:title" content="{% block og_title %}{{ thing.title | default(value=config.title) }}{% endblock og_title %}" /> + <meta property="og:description" content="{{ thing.description | default(value=config.description) }}" /> + <meta property="og:type" content="{% block og_type %}{{ thing.extra.og.type | default(value='article') }}{% endblock og_type %}" /> + <meta property="og:url" content="{% block og_url %}{{ thing.permalink | safe }}{% endblock og_url %}" /> + {% if thing.extra.depiction %} + <meta property="og:image" content="{{ get_url(path="@/" ~ thing.relative_path, trailing_slash=true) }}{{ thing.extra.depiction.image | safe }}" /> <meta property="og:image:alt" content="{{ thing.extra.depiction.alt }}" /> + {% elif config.extra.og.image %} + <meta property="og:image" content="{{ get_url(path=config.extra.og.image.url) }}" /> + <meta property="og:image:alt" content="{{ config.extra.og.image.alt }}" /> + {% endif %} + {% if thing.extra.og.video %} + <meta property="og:video" content="{{ thing.extra.og.video.url }}" /> + {% endif %} {% endif %} - {% if thing.extra.og.video %} - <meta property="og:video" content="{{ thing.extra.og.video.url }}" /> - {% endif %} - {% endif %} {% endblock %} <link rel="stylesheet" href="{{ get_url(path="fonts/roboto/index.css") }}" /> <link rel="stylesheet" href="{{ get_url(path="fonts/font-awesome/css/all.css") }}" /> <link rel="stylesheet" href="{{ get_url(path="style.css") }}" /> - {% if thing.path %} - {% set local_style = get_url(path=thing.path ~ "/style.css") %} - {% if local_style is defined %} - <link rel="stylesheet" href="{{ local_style }}" /> - {% endif %} - {% endif %} + {% if thing.path %} + {% set local_style = get_url(path=thing.path ~ "/style.css") %} + {% if local_style is defined %} + <link rel="stylesheet" href="{{ local_style }}" /> + {% endif %} + {% endif %} <title>{% block title %}{{ thing.title | default(value=config.title) }}{% endblock %}</title> </head> diff --git a/templates/blog/author_media.html b/templates/blog/author_media.html index df16b9f1..bd222fa1 100644 --- a/templates/blog/author_media.html +++ b/templates/blog/author_media.html @@ -1,28 +1,28 @@ <div class="media author-section is-flex" resource="{{ post.permalink }}" typeof="schema:BlogPosting"> <div class="media-left author-images is-align-self-center"> -{% set authors_data = load_data(path="authors.json") -%} -{% for author in post.authors -%} -<figure class="image is-48x48 is-inline-block" property="schema:contributor" resource="https://teckids.org/authors/{{ author }}/" typeof="schema:Person"> - {% set meta = get_image_metadata(path="authors/" ~ author ~ ".jpg", allow_missing=true) -%} - {% if meta -%} - {% set image = resize_image(path="authors/" ~ author ~ ".jpg", width=48, height=48) -%} - <img property="schema:image" class="is-rounded" src="{{ image.url }}" alt="Benutzerbild von {{ authors_data[post.authors.0].display_name }}" /> - {% else -%} - <div class="is-flex is-fullheight"> - <span class="fa-stack fa-lg is-block is-align-self-center"> - <i class="fa-solid fa-circle fa-stack-2x"></i> - <i class="fa-solid fa-{{ author | truncate(length=1, end="") | lower() }} fa-stack-1x fa-inverse"></i> - </span> - </div> - {% endif -%} - </figure> -{% endfor %} + {% set authors_data = load_data(path="authors.json") -%} + {% for author in post.authors -%} + <figure class="image is-48x48 is-inline-block" property="schema:contributor" resource="https://teckids.org/authors/{{ author }}/" typeof="schema:Person"> + {% set meta = get_image_metadata(path="authors/" ~ author ~ ".jpg", allow_missing=true) -%} + {% if meta -%} + {% set image = resize_image(path="authors/" ~ author ~ ".jpg", width=48, height=48) -%} + <img property="schema:image" class="is-rounded" src="{{ image.url }}" alt="Benutzerbild von {{ authors_data[post.authors.0].display_name }}" /> + {% else -%} + <div class="is-flex is-fullheight"> + <span class="fa-stack fa-lg is-block is-align-self-center"> + <i class="fa-solid fa-circle fa-stack-2x"></i> + <i class="fa-solid fa-{{ author | truncate(length=1, end="") | lower() }} fa-stack-1x fa-inverse"></i> + </span> + </div> + {% endif -%} + </figure> + {% endfor %} </div> <ul class="media-content is-align-self-center"> <div class="title is-5"> -{% for author in post.authors -%} -<span resource="https://teckids.org/authors/{{ author }}/" typeof="schema:Person" class="is-text-nowrap"><span property="schema:name">{{ authors_data[author].display_name }}</span></span>{% if not loop.last %}, {% endif %} -{% endfor %} + {% for author in post.authors -%} + <span resource="https://teckids.org/authors/{{ author }}/" typeof="schema:Person" class="is-text-nowrap"><span property="schema:name">{{ authors_data[author].display_name }}</span></span>{% if not loop.last %}, {% endif %} + {% endfor %} </div> </ul> </div> diff --git a/templates/blog/card.html b/templates/blog/card.html index 8f4b4581..5be1fad6 100644 --- a/templates/blog/card.html +++ b/templates/blog/card.html @@ -1,33 +1,33 @@ - <div class="card is-flex is-flex-direction-column is-fullheight is-justify-content-space-between" typeof="schema:BlogPosting" resource="{{ post.permalink }}" property="schema:blogPost"> - <div class="card-image"> - <a href="{{ post.permalink }}"> - <figure class="image is-4by3"> - {% set image = resize_image(path="@/" ~ post.colocated_path ~ "/" ~ post.extra.depiction.image, width=800, height=600) -%} - <img src="{{ image.url }}" alt="{{ post.extra.depiction.alt }}" /> - {% if post.extra.depiction.credits %} - <figcaption class="p-1 has-text-white has-background-black is-size-7 is-italic">{{ post.extra.depiction.credits }}</figcaption> - {% endif %} - </figure> - </a> - </div> - <div class="card-content is-fullheight"> - <a href="{{ post.permalink }}"><h3 class="title is-4" property="schema:headline">{{ post.title }}</h3></a> - <div class="content"> - {% include "blog/meta_line.html" -%} - <span propery="schema:abstract">{{ post.summary | safe }}</span> - </div> - </div> - <div class="card-footer"> - <div class="card-footer-item"> - <div class="is-fullwidth"> - {% include "blog/author_media.html" -%} - </div> - </div> - </div> - {% if post.extra.microdata.about %} - {% for about in post.extra.microdata.about %} - <meta property="schema:about" href="{{ about }}" /> - {% endfor %} - {% endif %} - </div> +<div class="card is-flex is-flex-direction-column is-fullheight is-justify-content-space-between" typeof="schema:BlogPosting" resource="{{ post.permalink }}" property="schema:blogPost"> + <div class="card-image"> + <a href="{{ post.permalink }}"> + <figure class="image is-4by3"> + {% set image = resize_image(path="@/" ~ post.colocated_path ~ "/" ~ post.extra.depiction.image, width=800, height=600) -%} + <img src="{{ image.url }}" alt="{{ post.extra.depiction.alt }}" /> + {% if post.extra.depiction.credits %} + <figcaption class="p-1 has-text-white has-background-black is-size-7 is-italic">{{ post.extra.depiction.credits }}</figcaption> + {% endif %} + </figure> + </a> + </div> + <div class="card-content is-fullheight"> + <a href="{{ post.permalink }}"><h3 class="title is-4" property="schema:headline">{{ post.title }}</h3></a> + <div class="content"> + {% include "blog/meta_line.html" -%} + <span propery="schema:abstract">{{ post.summary | safe }}</span> + </div> + </div> + <div class="card-footer"> + <div class="card-footer-item"> + <div class="is-fullwidth"> + {% include "blog/author_media.html" -%} + </div> + </div> + </div> + {% if post.extra.microdata.about %} + {% for about in post.extra.microdata.about %} + <meta property="schema:about" href="{{ about }}" /> + {% endfor %} + {% endif %} +</div> diff --git a/templates/blog/overview.html b/templates/blog/overview.html index 3f181f35..9598470f 100644 --- a/templates/blog/overview.html +++ b/templates/blog/overview.html @@ -9,26 +9,26 @@ {% include "blog/section.html" %} {% if paginator.number_pagers > 1 %} - <nav class="pagination is-centered section" role="navigation" aria-label="pagination"> - <a href="{{ paginator.previous }}" class="pagination-previous">Vorherige</a> - <a href="{{ paginator.next }}" class="pagination-next">Nächste</a> - <ul class="pagination-list"> - <li><a href="{{ paginator.first }}" class="pagination-link {% if paginator.current_index == 1 %}is-current{% endif %}" aria-label="Seite 1">1</a></li> - {% set range_start = paginator.current_index - 3 %} - {% if range_start < 2 %}{% set range_start = 2 %}{% endif %} - {% set range_end = paginator.current_index + 3 %} - {% if range_end > paginator.number_pagers - 1 %}{% set range_end = paginator.number_pagers - 1 %}{% endif %} - {% if range_start > 2 %} - <li><span class="pagination-ellipsis">…</span></li> - {% endif %} - {% for pn in range(start=range_start, end=range_end + 1) %} - <li><a href="{{ paginator.base_url ~ pn ~ "/" }}" class="pagination-link {% if pn == paginator.current_index %}is-current{% endif %}" aria-label="Seite {{ pn }}">{{ pn }}</a></li> - {% endfor %} - {% if range_end < paginator.number_pagers - 1 %} - <li><span class="pagination-ellipsis">…</span></li> - {% endif %} - <li><a href="{{ paginator.last }}" class="pagination-link {% if paginator.current_index == paginator.number_pagers %}is-current{% endif %}" aria-label="Seite {{ paginator.number_pagers }}">{{ paginator.number_pagers }}</a></li> - </ul> - </nav> + <nav class="pagination is-centered section" role="navigation" aria-label="pagination"> + <a href="{{ paginator.previous }}" class="pagination-previous">Vorherige</a> + <a href="{{ paginator.next }}" class="pagination-next">Nächste</a> + <ul class="pagination-list"> + <li><a href="{{ paginator.first }}" class="pagination-link {% if paginator.current_index == 1 %}is-current{% endif %}" aria-label="Seite 1">1</a></li> + {% set range_start = paginator.current_index - 3 %} + {% if range_start < 2 %}{% set range_start = 2 %}{% endif %} + {% set range_end = paginator.current_index + 3 %} + {% if range_end > paginator.number_pagers - 1 %}{% set range_end = paginator.number_pagers - 1 %}{% endif %} + {% if range_start > 2 %} + <li><span class="pagination-ellipsis">…</span></li> + {% endif %} + {% for pn in range(start=range_start, end=range_end + 1) %} + <li><a href="{{ paginator.base_url ~ pn ~ "/" }}" class="pagination-link {% if pn == paginator.current_index %}is-current{% endif %}" aria-label="Seite {{ pn }}">{{ pn }}</a></li> + {% endfor %} + {% if range_end < paginator.number_pagers - 1 %} + <li><span class="pagination-ellipsis">…</span></li> + {% endif %} + <li><a href="{{ paginator.last }}" class="pagination-link {% if paginator.current_index == paginator.number_pagers %}is-current{% endif %}" aria-label="Seite {{ paginator.number_pagers }}">{{ paginator.number_pagers }}</a></li> + </ul> + </nav> {% endif %} {% endblock %} diff --git a/templates/blog/post.html b/templates/blog/post.html index 52397bbc..3d78ea53 100644 --- a/templates/blog/post.html +++ b/templates/blog/post.html @@ -13,11 +13,11 @@ {% set blog_section = get_section(path="blog/_index.md") %} {% set post = page -%} <div class="columns mt-4"> - <meta property="schema:isPartOf" href="{{ blog_section.permalink }}" /> + <meta property="schema:isPartOf" href="{{ blog_section.permalink }}" /> {% if post.extra.microdata.about %} - {% for about in post.extra.microdata.about %} - <meta property="schema:about" href="{{ about }}" /> - {% endfor %} + {% for about in post.extra.microdata.about %} + <meta property="schema:about" href="{{ about }}" /> + {% endfor %} {% endif %} <div class="column is-three-quarters"> <div class="content" property="schema:articleBody"> @@ -29,7 +29,7 @@ <div class="card-image"> <figure class="image is-4by3"> {% set image = resize_image(path="@/" ~ post.colocated_path ~ "/" ~ post.extra.depiction.image, width=800, height=600) -%} - <img src="{{ image.url }}" alt="{{ post.extra.depiction.alt }}" property="schema:thumbnailUrl" /> + <img src="{{ image.url }}" alt="{{ post.extra.depiction.alt }}" property="schema:thumbnailUrl" /> {% if post.extra.depiction.credits %} <figcaption class="p-1 has-text-white has-background-black is-size-7 is-italic">{{ post.extra.depiction.credits }}</figcaption> {% endif %} @@ -46,18 +46,18 @@ </div> <nav class="panel is-light mt-6"> <p class="panel-heading">Weitere Posts dazu</p> - {% for kind, terms in page.taxonomies %} - {% for term in terms %} - {% set taxonomy = get_taxonomy_term(kind=kind, term=term) %} - {% set posts = taxonomy.pages | filter(attribute="date") %} - {% if posts %} - <p class="panel-block subtitle is-7">{{ kind | title }}: {{ term }}</p> - {% for post in posts | slice(end=5) %} - <a class="panel-block" href="{{ post.permalink }}">{{ post.title}}</a> - {% endfor %} - {% endif %} - {% endfor %} - {% endfor %} + {% for kind, terms in page.taxonomies %} + {% for term in terms %} + {% set taxonomy = get_taxonomy_term(kind=kind, term=term) %} + {% set posts = taxonomy.pages | filter(attribute="date") %} + {% if posts %} + <p class="panel-block subtitle is-7">{{ kind | title }}: {{ term }}</p> + {% for post in posts | slice(end=5) %} + <a class="panel-block" href="{{ post.permalink }}">{{ post.title}}</a> + {% endfor %} + {% endif %} + {% endfor %} + {% endfor %} </div> </div> </div> diff --git a/templates/blog/tag_line.html b/templates/blog/tag_line.html index 5782c3d7..8398220e 100644 --- a/templates/blog/tag_line.html +++ b/templates/blog/tag_line.html @@ -1,7 +1,7 @@ - <div class="tags"> - {% for kind, terms in post.taxonomies %} - {% for term in terms %} - <span class="tag">{{ term }}</span> - {% endfor %} +<div class="tags"> + {% for kind, terms in post.taxonomies %} + {% for term in terms %} + <span class="tag">{{ term }}</span> {% endfor %} - </div> + {% endfor %} +</div> diff --git a/templates/footer.html b/templates/footer.html index 6853e7d9..65c9636c 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -1,58 +1,58 @@ - <div class="columns is-multiline" resource="https://teckids.org/" typeof="schema:Organization"> - <meta property="rdfs:seeAlso" href="http://www.wikidata.org/entity/Q122507357" /> - <div class="column is-one-fourth"> - <p class="title is-5" property="schema:name">Teckids e.V.</p> - <address property="schema:address" typeof="schema:PostalAddress"> - <span property="schema:streetAddress">{{config.extra.footer.address.street|safe}}</span><br/> - <span property="schema:postalCode">{{config.extra.footer.address.postal_code|safe}}</span> - <span property="schema:addressLocality">{{config.extra.footer.address.city|safe}}</span> - </address> - <aside class="mt-5"> - <p class="title is-6">Spendenkonto</p> - <p>{{config.extra.footer.bank|safe}}</p> - </aside> - </div> - <div class="column is-half"> - <p class="title is-5">Unterstützer und Partner*innen</p> - <div class="columns is-centered is-vcentered is-multiline"> - {% for sponsor in config.extra.footer.sponsor %} - <div class="column is-one-quarter" property="schema:sponsor" typeof="schema:Organization"> - <figure class="image"> - <meta property="schema:name" content="{{sponsor.alt}}" /> - <a property="schema:url" href="{{sponsor.link}}"> - <img src="/images/sponsoren/{{sponsor.logo}}" alt="{{sponsor.alt}}" /> - </a> - </figure> - </div> - {% endfor %} - </div> - </div> - <div class="column is-onw-fourth"> - <p class="title is-5">Weiteres</p> - <aside class="menu"> - {% for menu in config.extra.footer.menu %} - <p class="menu-label">{{menu.label}}</p> - <ul class="menu-list"> - {% for item in menu.items %} - <li><a href="{{ item.url }}">{{ item.title }}</a></li> - {% endfor %} - </ul> - {% endfor %} - </aside> - <p class="title is-5 mt-5">Kanäle und Netzwerke</p> - <aside class="columns is-centered is-vcentered is-multiline is-mobile"> - {% for social in config.extra.footer.social %} - <div class="column is-one-third"> - <a href="{{social.link}}" rel="{{social.rel}}" class="icon is-large"> - <i class="{{social.icon}} fa-2x"></i> +<div class="columns is-multiline" resource="https://teckids.org/" typeof="schema:Organization"> + <meta property="rdfs:seeAlso" href="http://www.wikidata.org/entity/Q122507357" /> + <div class="column is-one-fourth"> + <p class="title is-5" property="schema:name">Teckids e.V.</p> + <address property="schema:address" typeof="schema:PostalAddress"> + <span property="schema:streetAddress">{{config.extra.footer.address.street|safe}}</span><br/> + <span property="schema:postalCode">{{config.extra.footer.address.postal_code|safe}}</span> + <span property="schema:addressLocality">{{config.extra.footer.address.city|safe}}</span> + </address> + <aside class="mt-5"> + <p class="title is-6">Spendenkonto</p> + <p>{{config.extra.footer.bank|safe}}</p> + </aside> + </div> + <div class="column is-half"> + <p class="title is-5">Unterstützer und Partner*innen</p> + <div class="columns is-centered is-vcentered is-multiline"> + {% for sponsor in config.extra.footer.sponsor %} + <div class="column is-one-quarter" property="schema:sponsor" typeof="schema:Organization"> + <figure class="image"> + <meta property="schema:name" content="{{sponsor.alt}}" /> + <a property="schema:url" href="{{sponsor.link}}"> + <img src="/images/sponsoren/{{sponsor.logo}}" alt="{{sponsor.alt}}" /> </a> - </div> - {% endfor %} - </aside> + </figure> + </div> + {% endfor %} </div> </div> - <aside class="section has-text-centered is-size-7"> - © {{ config.author }} · Lizenziert unter <a property="schema:license" href="{{ config.extra.footer.license.url }}">{{ config.extra.footer.license.name }}</a><br/> - Erstellt mit <a href="https://www.getzola.org/">Zola</a> und <a href="https://bulma.io/">Bulma</a><br/> - {% if thing.path %}Diese Seite kann <a href="{{ config.extra.repo.web.tree }}/{{ thing.relative_path }}">auf EduGit editiert werden</a> oder <a href="{{ config.extra.repo.web.issues }}">eine Verbesserung vorgeschlagen werden</a>.<br/>{% endif %} - </aside> + <div class="column is-onw-fourth"> + <p class="title is-5">Weiteres</p> + <aside class="menu"> + {% for menu in config.extra.footer.menu %} + <p class="menu-label">{{menu.label}}</p> + <ul class="menu-list"> + {% for item in menu.items %} + <li><a href="{{ item.url }}">{{ item.title }}</a></li> + {% endfor %} + </ul> + {% endfor %} + </aside> + <p class="title is-5 mt-5">Kanäle und Netzwerke</p> + <aside class="columns is-centered is-vcentered is-multiline is-mobile"> + {% for social in config.extra.footer.social %} + <div class="column is-one-third"> + <a href="{{social.link}}" rel="{{social.rel}}" class="icon is-large"> + <i class="{{social.icon}} fa-2x"></i> + </a> + </div> + {% endfor %} + </aside> + </div> +</div> +<aside class="section has-text-centered is-size-7"> + © {{ config.author }} · Lizenziert unter <a property="schema:license" href="{{ config.extra.footer.license.url }}">{{ config.extra.footer.license.name }}</a><br/> + Erstellt mit <a href="https://www.getzola.org/">Zola</a> und <a href="https://bulma.io/">Bulma</a><br/> + {% if thing.path %}Diese Seite kann <a href="{{ config.extra.repo.web.tree }}/{{ thing.relative_path }}">auf EduGit editiert werden</a> oder <a href="{{ config.extra.repo.web.issues }}">eine Verbesserung vorgeschlagen werden</a>.<br/>{% endif %} +</aside> diff --git a/templates/frontpage/claim.html b/templates/frontpage/claim.html index bb681ccf..8969298c 100644 --- a/templates/frontpage/claim.html +++ b/templates/frontpage/claim.html @@ -8,31 +8,31 @@ <p class="title is-1 has-text-centered" property="schema:slogan">{{ config.description }}</p> <div class="columns is-same-height mt-4"> {% for claim in section.extra.claims %} - <div class="column is-one-third"> - <div class="card is-flex is-flex-direction-column is-fullheight is-justify-content-space-between frontpage-claim-box"> - <div class="card-content is-fullheight"> - <div class="columns is-vcentered"> - <div class="column"> - <img src="/{{ claim.image }}" alt="image"> - </div> - <div class="column is-four-fifths"> - <h1 class="title is-3">{{ claim.title }}</h1> + <div class="column is-one-third"> + <div class="card is-flex is-flex-direction-column is-fullheight is-justify-content-space-between frontpage-claim-box"> + <div class="card-content is-fullheight"> + <div class="columns is-vcentered"> + <div class="column"> + <img src="/{{ claim.image }}" alt="image"> + </div> + <div class="column is-four-fifths"> + <h1 class="title is-3">{{ claim.title }}</h1> + </div> </div> + <p>{{ claim.content }}</p> </div> - <p>{{ claim.content }}</p> + <footer class="card-footer"> + {% for link in claim.links %} + <a href="{{ get_url(path=link.url) }}" class="card-footer-item"> + <span class="icon-text"> + <span>{{ link.title }}</span> + <span class="icon"><i class="fa-solid fa-arrow-right"></i></span> + </span> + </a> + {% endfor %} + </footer> </div> - <footer class="card-footer"> - {% for link in claim.links %} - <a href="{{ get_url(path=link.url) }}" class="card-footer-item"> - <span class="icon-text"> - <span>{{ link.title }}</span> - <span class="icon"><i class="fa-solid fa-arrow-right"></i></span> - </span> - </a> - {% endfor %} - </footer> </div> - </div> {% endfor %} </div> </div> diff --git a/templates/frontpage/projects.html b/templates/frontpage/projects.html index 936fe349..50ac2f20 100644 --- a/templates/frontpage/projects.html +++ b/templates/frontpage/projects.html @@ -5,27 +5,27 @@ <h2 class="title is-2">Unsere Projekte</h2> <div class="columns is-same-height mt-4"> {% for project_section_path in projects_section.subsections %} - {% set project_section = get_section(path=project_section_path) %} - <div class="column is-one-third" property="schema:brand" resource="{{ project_section.permalink }}" typeof="schema:Brand"> - <div class="card is-shadowless"> - <div class="card-image"> - <figure class="image is-70p"> - <a href="{{ project_section.permalink }}"><img src="{{ project_section.extra.title_icon }}" alt="Logo {{ project_section.title }}" /></a> - </figure> - </div> - <div class="card-content"> - <a href="{{ project_section.permalink }}"><h3 class="title is-3" property="schema:name">{{ project_section.title }}</h3></a> - <div class="content"> - <span property="schema:description">{{ project_section.description }}</span> - <ul> - {% for thesis in project_section.extra.theses %} - <li>{{ thesis }}</li> - {% endfor %} - </ul> + {% set project_section = get_section(path=project_section_path) %} + <div class="column is-one-third" property="schema:brand" resource="{{ project_section.permalink }}" typeof="schema:Brand"> + <div class="card is-shadowless"> + <div class="card-image"> + <figure class="image is-70p"> + <a href="{{ project_section.permalink }}"><img src="{{ project_section.extra.title_icon }}" alt="Logo {{ project_section.title }}" /></a> + </figure> + </div> + <div class="card-content"> + <a href="{{ project_section.permalink }}"><h3 class="title is-3" property="schema:name">{{ project_section.title }}</h3></a> + <div class="content"> + <span property="schema:description">{{ project_section.description }}</span> + <ul> + {% for thesis in project_section.extra.theses %} + <li>{{ thesis }}</li> + {% endfor %} + </ul> + </div> </div> </div> </div> - </div> {% endfor %} </div> </div> diff --git a/templates/menu.html b/templates/menu.html index 592169ba..8409dcec 100644 --- a/templates/menu.html +++ b/templates/menu.html @@ -2,9 +2,9 @@ <input type="checkbox" id="burger-toggle" role="button" class="navbar-toggle" aria-label="menu" aria-expanded="false" data-target="main-menu" /> <div class="navbar-brand"> <a href="{{ get_url(path="@/_index.md") }}" class="navbar-item"> - <figure class="image" id="navbar-logo"> - <img src="{{ get_url(path="artwork/logo-teckids.svg") }}" alt="Schriftzug Teckids e.V." /> - </figure> + <figure class="image" id="navbar-logo"> + <img src="{{ get_url(path="artwork/logo-teckids.svg") }}" alt="Schriftzug Teckids e.V." /> + </figure> </a> <label for="burger-toggle" class="navbar-burger"> @@ -39,7 +39,7 @@ </div> {% for item in config.extra.main_menu_item %} - <a href="{{ get_url(path=item.path) }}" class="navbar-item is-hoverable">{{ item.title }}</a> + <a href="{{ get_url(path=item.path) }}" class="navbar-item is-hoverable">{{ item.title }}</a> {% endfor %} </div> </div> diff --git a/templates/menu/gemeinschaft.html b/templates/menu/gemeinschaft.html index d50624fb..0ccbabfd 100644 --- a/templates/menu/gemeinschaft.html +++ b/templates/menu/gemeinschaft.html @@ -5,33 +5,33 @@ {% for gemeinschaft_section_path in gemeinschaft_section.subsections %} {% set gemeinschaft_subsection = get_section(path=gemeinschaft_section_path) %} <section class="column"> - <div class="card p-0 m-0 is-shadowless is-radiusless is-overlay is-flex is-flex-direction-column is-fullheight is-justify-content-space-between"> - <div class="card-content p-0 m-0"> - <h1 class="title is-6 is-mega-menu-title"> - <p> {{ gemeinschaft_subsection.title }} </p> - <p class="is-4">{{ gemeinschaft_subsection.description }}</p> - </h1> + <div class="card p-0 m-0 is-shadowless is-radiusless is-overlay is-flex is-flex-direction-column is-fullheight is-justify-content-space-between"> + <div class="card-content p-0 m-0"> + <h1 class="title is-6 is-mega-menu-title"> + <p> {{ gemeinschaft_subsection.title }} </p> + <p class="is-4">{{ gemeinschaft_subsection.description }}</p> + </h1> - {% for page in gemeinschaft_subsection.pages %} - <a class="navbar-item" href="{{ page.permalink }}"> - <div class="navbar-content">{{ page.title }}</div> - </a> - {% endfor %} - </div> - {% if gemeinschaft_subsection.extra.products %} - <div class="card-footer"> - {% for product in gemeinschaft_subsection.extra.products %} - <a class="card-footer-item" href="{{ product.link }}"> - <span class="icon-text"> - <span>{{ product.name }}</span> - <span class="icon"><i class="fa-solid fa-up-right-from-square"></i></span> - </span> - </a> - {% endfor %} - </div> - {% endif %} - </div> - </section> + {% for page in gemeinschaft_subsection.pages %} + <a class="navbar-item" href="{{ page.permalink }}"> + <div class="navbar-content">{{ page.title }}</div> + </a> + {% endfor %} + </div> + {% if gemeinschaft_subsection.extra.products %} + <div class="card-footer"> + {% for product in gemeinschaft_subsection.extra.products %} + <a class="card-footer-item" href="{{ product.link }}"> + <span class="icon-text"> + <span>{{ product.name }}</span> + <span class="icon"><i class="fa-solid fa-up-right-from-square"></i></span> + </span> + </a> + {% endfor %} + </div> + {% endif %} + </div> + </section> {% endfor %} </div> </div> diff --git a/templates/menu/infos.html b/templates/menu/infos.html index b8367774..0e634d38 100644 --- a/templates/menu/infos.html +++ b/templates/menu/infos.html @@ -3,19 +3,19 @@ <div class="container is-fluid"> <div class="columns"> {% for zielgruppe in zielgruppen.items %} - <section - class="column menu-zielgruppe-section" - id="menu-zielgruppe-section-{{ zielgruppe.slug }}" - > - <h1 class="title is-6 is-mega-menu-title">{{ zielgruppe.name }}</h1> + <section + class="column menu-zielgruppe-section" + id="menu-zielgruppe-section-{{ zielgruppe.slug }}" + > + <h1 class="title is-6 is-mega-menu-title">{{ zielgruppe.name }}</h1> - {% for page in zielgruppe.pages %} - {% if page.date %}{% continue %}{% endif %} - <a class="navbar-item" href="{{ page.permalink }}"> - <div class="navbar-content">{{ page.title }}</div> - </a> - {% endfor %} - </section> + {% for page in zielgruppe.pages %} + {% if page.date %}{% continue %}{% endif %} + <a class="navbar-item" href="{{ page.permalink }}"> + <div class="navbar-content">{{ page.title }}</div> + </a> + {% endfor %} + </section> {% endfor %} </div> </div> diff --git a/templates/menu/projects.html b/templates/menu/projects.html index 16aba357..dbd5d91b 100644 --- a/templates/menu/projects.html +++ b/templates/menu/projects.html @@ -5,33 +5,33 @@ {% for project_section_path in projects_section.subsections %} {% set project_section = get_section(path=project_section_path) %} <section class="column menu-project-section" id="menu-project-section-{{ project_section.components[1] }}"> - <div class="card p-0 m-0 is-shadowless is-radiusless is-overlay is-flex is-flex-direction-column is-fullheight is-justify-content-space-between"> - <div class="card-content p-0 m-0"> - <h1 class="title is-6 is-mega-menu-title"><a href="{{ project_section.permalink }}"> - <p> {{ project_section.title }} </p> - <p class="is-4">{{ project_section.description }}</p> - </a></h1> + <div class="card p-0 m-0 is-shadowless is-radiusless is-overlay is-flex is-flex-direction-column is-fullheight is-justify-content-space-between"> + <div class="card-content p-0 m-0"> + <h1 class="title is-6 is-mega-menu-title"><a href="{{ project_section.permalink }}"> + <p> {{ project_section.title }} </p> + <p class="is-4">{{ project_section.description }}</p> + </a></h1> - {% for page in project_section.pages %} - <a class="navbar-item" href="{{ page.permalink }}"> - <div class="navbar-content">{{ page.title }}</div> - </a> - {% endfor %} - </div> - {% if project_section.extra.products %} - <div class="card-footer"> - {% for product in project_section.extra.products %} - <a class="card-footer-item" href="{{ product.link }}"> - <span class="icon-text"> - <span>{{ product.name }}</span> - <span class="icon"><i class="fa-solid fa-up-right-from-square"></i></span> - </span> - </a> - {% endfor %} - </div> - {% endif %} - </div> - </section> + {% for page in project_section.pages %} + <a class="navbar-item" href="{{ page.permalink }}"> + <div class="navbar-content">{{ page.title }}</div> + </a> + {% endfor %} + </div> + {% if project_section.extra.products %} + <div class="card-footer"> + {% for product in project_section.extra.products %} + <a class="card-footer-item" href="{{ product.link }}"> + <span class="icon-text"> + <span>{{ product.name }}</span> + <span class="icon"><i class="fa-solid fa-up-right-from-square"></i></span> + </span> + </a> + {% endfor %} + </div> + {% endif %} + </div> + </section> {% endfor %} </div> </div> diff --git a/templates/pages/content.html b/templates/pages/content.html index 916a22f6..19059e6e 100644 --- a/templates/pages/content.html +++ b/templates/pages/content.html @@ -26,5 +26,5 @@ {% include "blog/section.html" %} </aside> {% endif %} - {% endif %} + {% endif %} {% endblock %} diff --git a/templates/project.html b/templates/project.html index b1027c16..1baa9b4f 100644 --- a/templates/project.html +++ b/templates/project.html @@ -1,46 +1,46 @@ {% extends "base.html" %} {% block meta %} - {% if section.description %} - <meta name="description" content="{{ section.description }}" /> - {% elif config.description %} - <meta name="description" content="{{ config.description }}" /> - {% endif %} + {% if section.description %} + <meta name="description" content="{{ section.description }}" /> + {% elif config.description %} + <meta name="description" content="{{ config.description }}" /> + {% endif %} {% endblock %} {% block title %} - {{ section.title }} + {{ section.title }} {% endblock %} {% block main %} <section class="hero hero-main is-fullheight-with-navbar project-background-{{ section.extra.project_slug }} roboto-black"> - <div class="hero-body" typeof="schema:Brand"> - <div class="container"> - <div class="columns is-centered project-title-{{ section.extra.project_slug }}"> - <h1 class="title is-1" property="schema:name">{{ section.title }}</h1> - </div> - <div class="container"> - <div class="columns is-vcentered"> - <div class="column is-one-third circle-bg"> - <img class="is-1by1" src="/{{ section.extra.title_icon }}" alt="Projekt-Icon"> + <div class="hero-body" typeof="schema:Brand"> + <div class="container"> + <div class="columns is-centered project-title-{{ section.extra.project_slug }}"> + <h1 class="title is-1" property="schema:name">{{ section.title }}</h1> </div> - <div class="project-theses"> - {% for thesis in section.extra.theses %} - <article class="media-v-centered"> - <figure class="media-left"> - <p class="image is-64x64"> - <img src="/{{ section.extra.list_icon }}" /> - </p> - </figure> - <div class="media-content"> - <p class="title is-4">{{ thesis }}</p> + <div class="container"> + <div class="columns is-vcentered"> + <div class="column is-one-third circle-bg"> + <img class="is-1by1" src="/{{ section.extra.title_icon }}" alt="Projekt-Icon"> + </div> + <div class="project-theses"> + {% for thesis in section.extra.theses %} + <article class="media-v-centered"> + <figure class="media-left"> + <p class="image is-64x64"> + <img src="/{{ section.extra.list_icon }}" /> + </p> + </figure> + <div class="media-content"> + <p class="title is-4">{{ thesis }}</p> + </div> + </article> + {% endfor %} </div> - </article> - {% endfor %} </div> </div> </div> </div> - </div> -</section> + </section> {% endblock %} diff --git a/templates/shortcodes/further.html b/templates/shortcodes/further.html index b823e51c..7f8b0ace 100644 --- a/templates/shortcodes/further.html +++ b/templates/shortcodes/further.html @@ -21,7 +21,7 @@ </a> </div> <div class="card-content"> - <p class="title"><a href="{{ link }}">{{further.title}}</a></p> + <p class="title"><a href="{{ link }}">{{further.title}}</a></p> <p class="content"> {{further.description}} </p> diff --git a/templates/shortcodes/hero_section.html b/templates/shortcodes/hero_section.html index 4b580150..2da93b04 100644 --- a/templates/shortcodes/hero_section.html +++ b/templates/shortcodes/hero_section.html @@ -1,7 +1,7 @@ <section class="hero is-fullheight-with-navbar {% if background_img %}has-background{% endif %} {% if background_transparent %}is-transparent{% endif %}"> {% if background_img %} {% set image = resize_image(path="@/" ~ page.colocated_path ~ "/" ~ background_img, width=800, height=600) -%} - <img class="hero-background" src="{{ image.url }}" alt=""> + <img class="hero-background" src="{{ image.url }}" alt=""> {% endif -%} <div class="hero-body pl-0 pr-0"> <div class="container has-text-centered"> diff --git a/templates/shortcodes/photo_section.html b/templates/shortcodes/photo_section.html index f5f1b43f..b39538b4 100644 --- a/templates/shortcodes/photo_section.html +++ b/templates/shortcodes/photo_section.html @@ -7,7 +7,7 @@ {% set image = resize_image(path="@/" ~ page.colocated_path ~ "/" ~ img, width=800, height=600) -%} <img src="{{image.url}}" alt="{{ alt }}"/> {% if credit %} - <figcaption class="p-1 has-text-white has-background-black is-size-7 is-italic">{{ credit }}</figcaption> + <figcaption class="p-1 has-text-white has-background-black is-size-7 is-italic">{{ credit }}</figcaption> {% endif %} </figure> </div> diff --git a/templates/shortcodes/teckids_contact.html b/templates/shortcodes/teckids_contact.html index 98f8dced..482730dd 100644 --- a/templates/shortcodes/teckids_contact.html +++ b/templates/shortcodes/teckids_contact.html @@ -10,14 +10,14 @@ <div class="icon-text"> <span class="icon"><i class="fa-solid fa-envelope-open-text"></i></span> <span>E-Mail schreiben</span> - </div> + </div> </a> - <a class="button is-link is-fullwidth" href="tel:{{ phone|default(value="+4922892934160") }}"> + <a class="button is-link is-fullwidth" href="tel:{{ phone|default(value="+4922892934160") }}"> <div class="icon-text"> <span class="icon"><i class="fa-solid fa-phone"></i></span> - <span>Anrufen</span> + <span>Anrufen</span> </div> - </a> + </a> </div> </div> </div> diff --git a/templates/shortcodes/teckids_event.html b/templates/shortcodes/teckids_event.html index eeff94d3..c388f437 100644 --- a/templates/shortcodes/teckids_event.html +++ b/templates/shortcodes/teckids_event.html @@ -28,43 +28,43 @@ </div> </div> </div> - <div class="message is-success"> - <div class="message-body"> - Uns ist wichtig, dass alle Interessierten an unserer Freizeit teilnehmen können. - Uns ist bewusst, dass die Kosten für viele Familien sehr hoch sind, ganz egal - aus welchen Gründen. Sollte der Betrag zu hoch sein, schickt uns bitte einfach - eine E-Mail mit eurem Wunschbetrag. Die Gründe dafür müsst ihr nicht nennen. - </div> - </div> - {% if event.fully_booked %} - <meta property="remainingAttendeeCapacity" content="0"/> - <div class="message is-danger"> - <div class="message-body"> - Die Veranstaltung ist ausgebucht. Für weitere Anmeldungen oder Plätze auf der - Warteliste können uns Interessierte per E-Mail kontaktieren. + <div class="message is-success"> + <div class="message-body"> + Uns ist wichtig, dass alle Interessierten an unserer Freizeit teilnehmen können. + Uns ist bewusst, dass die Kosten für viele Familien sehr hoch sind, ganz egal + aus welchen Gründen. Sollte der Betrag zu hoch sein, schickt uns bitte einfach + eine E-Mail mit eurem Wunschbetrag. Die Gründe dafür müsst ihr nicht nennen. + </div> </div> - </div> - {% endif %} - {% if body %} - <div class="content"> - {{ body|markdown|safe }} - </div> - {% endif %} + {% if event.fully_booked %} + <meta property="remainingAttendeeCapacity" content="0"/> + <div class="message is-danger"> + <div class="message-body"> + Die Veranstaltung ist ausgebucht. Für weitere Anmeldungen oder Plätze auf der + Warteliste können uns Interessierte per E-Mail kontaktieren. + </div> + </div> + {% endif %} + {% if body %} + <div class="content"> + {{ body|markdown|safe }} + </div> + {% endif %} </div> <div class="column is-one-third"> <div class="buttons are-responsive are-medium"> <a class="button is-primary is-fullwidth is-justify-content-start" - href="https://ticdesk.teckids.org/app/paweljong/event/{{ slug }}"> + href="https://ticdesk.teckids.org/app/paweljong/event/{{ slug }}"> <span class="icon"><i class="fa-regular fa-paper-plane"></i></span> <span>Alle Infos und Anmeldung</span> </a> <a class="button is-link is-fullwidth is-justify-content-start" href="mailto:{{ mail|default(value=" - verein@teckids.org") }}"> + verein@teckids.org") }}"> <span class="icon"><i class="fa-regular fa-envelope-open-text"></i></span> <span>E-Mail schreiben</span> </a> <a class="button is-link is-fullwidth is-justify-content-start mb-0" href="tel:{{ phone|default(value=" - +4922892934160") }}"> + +4922892934160") }}"> <span class="icon"><i class="fa-regular fa-phone"></i></span> <span>Anrufen</span> </a> diff --git a/templates/shortcodes/teckids_related.html b/templates/shortcodes/teckids_related.html index 8856704c..1691c820 100644 --- a/templates/shortcodes/teckids_related.html +++ b/templates/shortcodes/teckids_related.html @@ -6,64 +6,64 @@ </div> <div class="column is-one-third"> {% if page.extra.platforms.wiki %} - <div class="media"> - <div class="media-left"> - <div class="icon is-large"> - <i class="fa-solid fa-2x fa-book"></i> + <div class="media"> + <div class="media-left"> + <div class="icon is-large"> + <i class="fa-solid fa-2x fa-book"></i> + </div> + </div> + <div class="media-content"> + <a href="https://wiki.teckids.org/{{page.extra.platforms.wiki}}"> + <p class="title is-4">Wiki</p> + <p class="subtitle is-6">Informationen und Handreichungen im Teckids-Wiki</p> + </a> </div> </div> - <div class="media-content"> - <a href="https://wiki.teckids.org/{{page.extra.platforms.wiki}}"> - <p class="title is-4">Wiki</p> - <p class="subtitle is-6">Informationen und Handreichungen im Teckids-Wiki</p> - </a> - </div> - </div> {% endif %} {% if page.extra.platforms.forum %} - <div class="media"> - <div class="media-left"> - <div class="icon is-large"> - <i class="fa-brands fa-2x fa-discourse"></i> + <div class="media"> + <div class="media-left"> + <div class="icon is-large"> + <i class="fa-brands fa-2x fa-discourse"></i> + </div> + </div> + <div class="media-content"> + <a href="https://forum.teckids.org/c/{{page.extra.platforms.forum}}"> + <p class="title is-4">Forum</p> + <p class="subtitle is-6">Fragen und Diskussion im Teckids-Forum</p> + </a> </div> </div> - <div class="media-content"> - <a href="https://forum.teckids.org/c/{{page.extra.platforms.forum}}"> - <p class="title is-4">Forum</p> - <p class="subtitle is-6">Fragen und Diskussion im Teckids-Forum</p> - </a> - </div> - </div> {% endif %} {% if page.extra.platforms.chat %} + <div class="media"> + <div class="media-left"> + <div class="icon is-large"> + <i class="fa-solid fa-2x fa-comments"></i> + </div> + </div> + <div class="media-content"> + <a href="https://matrix.to/#/{{page.extra.platforms.chat}}"> + <p class="title is-4">Chat</p> + <p class="subtitle is-6">Darüber reden im Chat</p> + </a> + </div> + </div> + {% endif %} <div class="media"> <div class="media-left"> <div class="icon is-large"> - <i class="fa-solid fa-2x fa-comments"></i> + <i class="fa-regular fa-2x fa-circle-question"></i> </div> </div> <div class="media-content"> - <a href="https://matrix.to/#/{{page.extra.platforms.chat}}"> - <p class="title is-4">Chat</p> - <p class="subtitle is-6">Darüber reden im Chat</p> - </a> + <p class="is-subtitle is-6"> + <a href="{{ get_url(path="@/gemeinschaft/offene-gemeinschaft/plattformen.md") }}"> + Informationen und Hilfe zu unseren Plattformen + </a> + </p> </div> </div> - {% endif %} - <div class="media"> - <div class="media-left"> - <div class="icon is-large"> - <i class="fa-regular fa-2x fa-circle-question"></i> - </div> - </div> - <div class="media-content"> - <p class="is-subtitle is-6"> - <a href="{{ get_url(path="@/gemeinschaft/offene-gemeinschaft/plattformen.md") }}"> - Informationen und Hilfe zu unseren Plattformen - </a> - </p> - </div> - </div> </div> </div> </section> -- GitLab