From d6cd11ed4490761cf5117ddd834e4772a6789dbe Mon Sep 17 00:00:00 2001 From: Stephan Date: Tue, 6 Apr 2021 19:31:00 +0200 Subject: [PATCH 1/5] Added the latest 3 podcast episodes the the "Aktuelles" submenu. --- templates/header_slim.html | 12 ++++++++++++ templates/header_with_logo.html | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/templates/header_slim.html b/templates/header_slim.html index 320859f..15a070f 100644 --- a/templates/header_slim.html +++ b/templates/header_slim.html @@ -69,6 +69,18 @@ {% endif %} {% endfor %} {% endif %} + {% if sub_title == 'Podcast' %} + {% set children = site.get(href).children %} + {% for child in children %} + {% if loop.index <= 3 %} +
  • + + {{ child.title }} + +
    • + {% endif %} + {% endfor %} + {% endif %} {% endfor %} {% endif %} diff --git a/templates/header_with_logo.html b/templates/header_with_logo.html index c3feaf4..3ca4214 100644 --- a/templates/header_with_logo.html +++ b/templates/header_with_logo.html @@ -69,6 +69,18 @@ {% endif %} {% endfor %} {% endif %} + {% if sub_title == 'Podcast' %} + {% set children = site.get(href).children %} + {% for child in children %} + {% if loop.index <= 3 %} +
  • + + {{ child.title }} + +
    • + {% endif %} + {% endfor %} + {% endif %} {% endfor %} {% endif %} From 373f213981f34f07e80b657d677c9cf8f41a665f Mon Sep 17 00:00:00 2001 From: Stephan Date: Tue, 6 Apr 2021 21:10:16 +0200 Subject: [PATCH 2/5] Added image model to enable content files for images. --- models/image.ini | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 models/image.ini diff --git a/models/image.ini b/models/image.ini new file mode 100644 index 0000000..f1bf7cd --- /dev/null +++ b/models/image.ini @@ -0,0 +1,16 @@ +[model] +name = image +label = Image + +[fields.description] +label = Description +type = string + +[fields.photographer] +label = Photographer +type = string + +[fields.copyright] +label = Copyright +type = string + From 86f8552e2c7e7e2fea312c7f2c67c832794da4fe Mon Sep 17 00:00:00 2001 From: Stephan Date: Tue, 6 Apr 2021 21:10:58 +0200 Subject: [PATCH 3/5] Added content file for space shuttle image. --- content/nasa-space-shuttle.jpg.lr | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 content/nasa-space-shuttle.jpg.lr diff --git a/content/nasa-space-shuttle.jpg.lr b/content/nasa-space-shuttle.jpg.lr new file mode 100644 index 0000000..817051c --- /dev/null +++ b/content/nasa-space-shuttle.jpg.lr @@ -0,0 +1,7 @@ +_model: image +--- +description: STS-57 Endeavour, OV-105, framed by Florida vegetation, lifts off from KSC LC +--- +photographer: Unbekannt +--- +copyright: 1993, Public domain by NASA \ No newline at end of file From 1d7db54eae237c8ba17e4ead10b27a7c2f2f9021 Mon Sep 17 00:00:00 2001 From: Stephan Date: Tue, 6 Apr 2021 21:20:37 +0200 Subject: [PATCH 4/5] Linked to single post or episodes via menu. --- templates/header_slim.html | 4 ++-- templates/header_with_logo.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/header_slim.html b/templates/header_slim.html index 15a070f..0e61b29 100644 --- a/templates/header_slim.html +++ b/templates/header_slim.html @@ -62,7 +62,7 @@ {% for child in children %} {% if loop.index <= 3 %}
  • - + {{ child.title }}
    • @@ -74,7 +74,7 @@ {% for child in children %} {% if loop.index <= 3 %}
  • - + {{ child.title }}
    • diff --git a/templates/header_with_logo.html b/templates/header_with_logo.html index 3ca4214..a90f239 100644 --- a/templates/header_with_logo.html +++ b/templates/header_with_logo.html @@ -62,7 +62,7 @@ {% for child in children %} {% if loop.index <= 3 %}
  • - + {{ child.title }}
    • @@ -74,7 +74,7 @@ {% for child in children %} {% if loop.index <= 3 %}
  • - + {{ child.title }}
    • From 1b19f07b353e9b84edc79086daf87a46045fd62f Mon Sep 17 00:00:00 2001 From: Stephan Date: Tue, 6 Apr 2021 21:28:54 +0200 Subject: [PATCH 5/5] Replaced layout
    s via css. --- assets/css/style.css | 2 +- content/mitglieder/beitreten/contents.lr | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/assets/css/style.css b/assets/css/style.css index 159d1bc..1b574ee 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -488,7 +488,7 @@ h2 { font-family: 'Noto Serif'; font-size: 2rem; line-height: 1.1em; - margin-top: 1em; + margin: 1em 0 0.25em 0; } .content__inner_third_heading { diff --git a/content/mitglieder/beitreten/contents.lr b/content/mitglieder/beitreten/contents.lr index 27fa1eb..5f927a1 100644 --- a/content/mitglieder/beitreten/contents.lr +++ b/content/mitglieder/beitreten/contents.lr @@ -5,7 +5,7 @@ title: Beitreten zur WTF Kooperative eG body: Willkommen bei der WTF Kooperative eG! Schön, dass Du Mitglied werden möchtest! -
    + Als Hacker hast Du natürlich unsere [Charta](/mitglieder/charta) verinnerlicht und lebst nach ihr. Außerdem solltest Du vorher mal einen Blick in [unsere Satzung](/mitglieder/satzung/) und die Beitragsordnung *(die sind bei den [Dokumenten](/dokumente/) zu finden)* geworfen haben und mit ihnen einverstanden sein. @@ -13,12 +13,11 @@ Die **Dokumente für den Mitgliedsantrag** findest Du unter [wtf-eg.de/dokumente ## Prozess des Mitglied werden -
    Um Mitglied zu werden, fülle bitte die Beitrittserklärung aus und schicke ihn per Post zu unserem Hamburger Office. Fülle bitte ebenfalls den Fragebogen aus, damit wir erfahren, wer Du bist, und wir Dich in unserer Genossenschaft Willkommen heißen können. Der Fragebogen darf gerne auch per (auch PGP verschlüsselter) Mail an unser Office gesendet werden. ## Und dann? -
    + Der Vorstand wird Deinen Antrag prüfen und Du wirst eine Rückmeldung von unserem Office erhalten. ---