9 changed files with 18 additions and 169 deletions
--- a/content/about/contents.lr
+++ b/content/about/contents.lr
@ -4,10 +4,6 @@ title: Services
 ---
 meta_description: Die WTF Kooperative bietet viel Erfahrung und Know-how in der Informationstechnologie. Sprechen Sie uns an!
 ---
-intro: Hallo!
-
-Du kannst dich bei uns anstellen lassen. Und das ist was wir tun:
---
 section:

 #### flow_services_cards ####
--- a/content/aktuelles/contents.lr
+++ b/content/aktuelles/contents.lr
@ -1,21 +1,8 @@
 _model: aggregator_page
 ---
-title: Regelmäßige Termine
+
+# Title und Body werden aktuell nicht gerendert.
+
+title: Aktuelles
 ---
-body:
-
-### Telebier
-Lockere Runde für alle inner- und außerhalb der WTF: Jeden Mittwoch um 21 Uhr im [BigBlueButton](https://bbb.cyber4edu.org/b/l3d-ecy-qks-ojk).
-
-Dank an die [infra.run](https://infra.run) fürs Hosting.
-
-#### Onboardingtreffen für neue Member
-Die Aufnahmetreffen für neue Member der Genossenschaft finden immer im [Onboarding-Jitsi](https://meet.wtf-eg.de/aufnahme) statt.
-
-Nächste Termine bis Oktober 2023:
-
- 03.07.2023 um 18:30 Uhr
- 01.08.2023 um 18:30 Uhr
- 06.09.2023 um 18:30 Uhr
- 02.10.2023 um 18:30 Uhr
- 07.10.2023 um 18:30 Uhr
+body: Die neusten Blogposts und Podcastepisoden siehst Du hier, die vollständige Historie findest Du unter [Blog](/blog) und [Podcast](/podcast).
--- a/content/contents+en.lr
+++ b/content/contents+en.lr
@ -1,60 +0,0 @@
-_model: homepage
---
-title: Die WTF Kooperative eG
---
-meta_description: The hacker community for doing next generation social business 🚀
---
-claim_heading:
-
-<span>Boost your <em>IT project</em> with a</span><br>
-<span>cooperative close to the Chaos community.</span>
---
-claim_content:
-
-<ul>
-<li class="-first">Consulting</li>
-<li class="-second">Development</li>
-<li class="-third">Operations</li>
-</ul>
---
-subclaim_heading: WTF Kooperative eG is your competent partner!
---
-subclaim_content: Benefit from the know-how of the experts of WTF Kooperative eG from a wide range of disciplines in information technology. You have a project you want to implement? Contact us!
---
-section:
-
-#### flow_text_image_section ####
-title: Where we come from
----
-content_body:
-
-WTF Kooperative eG (Werkkooperative der Technikfreund*innen) was founded in December 2020 and and brings valuable expert know-how most diverse disciplines of information technology to the table.<br>
-From the start, more than 150 people found each other and worked to successful founding of the cooperative.
-
-A company that belongs to all of us, in which each of us has a voice and the right to have a say.<br>
-We see ourselves as a platform for hackers, where with like-minded people economic projects become possible that would not otherwise exist. We promote and manage the services of our members collectively as a cooperative.
----
-content_image: map.png
----
-content_image_alt: Map of the Federal Republic of Germany with regions in which members are active
----
-content_image_src:
---
-contact_form_button: Send message
---
-contact_form_email: Email address
---
-contact_form_heading: Contact
---
-contact_form_info:
-
-Your email address will not be published.<br>
-<span aria-hidden="true">Required fields are marked <span class="contact_form--required" aria-hidden="true">*</span>
---
-contact_form_message: Message
---
-contact_form_name: Name
---
-contact_form_subheading: Contact form
---
-contact_form_subject: Subject
--- a/content/contents.lr
+++ b/content/contents.lr
@ -38,23 +38,4 @@ content_image: map.png
 ----
 content_image_alt: Karte der Bundesrepublik mit Regionen in denen Member aktiv sind
 ----
-content_image_src:
---
-contact_form_button: Kommentar abschicken
---
-contact_form_email: E-Mail-Adresse
---
-contact_form_heading: Kontakt
---
-contact_form_info:
-
-Deine E-Mail-Adresse wird nicht veröffentlicht.<br>
-<span aria-hidden="true">Erforderliche Felder sind gekennzeichnet <span class="contact_form--required" aria-hidden="true">*</span>
---
-contact_form_message: Nachricht
---
-contact_form_name: Name
---
-contact_form_subheading: Kontaktformular
---
-contact_form_subject: Betreff
+content_image_src: 
--- a/models/about_page.ini
+++ b/models/about_page.ini
@ -8,11 +8,6 @@ label = Title
 description = Der Seitentitel und die Überschrift dieser Seite
 type = string

-[fields.intro]
-label = Intro
-description = Kurzer Einleitungstext der Seite
-type = markdown
-
 [fields.meta_description]
 label = Meta Beschreibung
 description = Hier kommt die Beschreibung rein, die von Suchmachinen, Seitencrawlern und Previews auf diese Seite generiert werden
--- a/models/homepage.ini
+++ b/models/homepage.ini
@ -3,8 +3,6 @@ name = Homepage
 label = Homepage
 inherits = header_with_logo

-# Header
-
 [fields.title]
 label = Title
 description = Der Seitentitel und die Überschrift dieser Seite
@ -35,43 +33,7 @@ label = Sub-Claim-Inhalt
 description = Inhalt des Subclaims im Kopf der Seite
 type = markdown

-# Flow Block Section
-
 [fields.section]
 label = Sections
 type = flow
 flow_blocks = flow_text_image_section
-
-# Kontakt-Formular
-
-[fields.contact_form_heading]
-label = Kontaktformular: Überschrift
-type = string
-
-[fields.contact_form_subheading]
-label = Kontaktformular: Unterüberschrift
-type = string
-
-[fields.contact_form_info]
-label = Kontaktformular: Einleitung
-type = markdown
-
-[fields.contact_form_subject]
-label = Kontaktformular: Betreff
-type = string
-
-[fields.contact_form_message]
-label = Kontaktformular: Nachricht
-type = string
-
-[fields.contact_form_name]
-label = Kontaktformular: Name
-type = string
-
-[fields.contact_form_email]
-label = Kontaktformular: E-Mail-Adresse
-type = string
-
-[fields.contact_form_button]
-label = Kontaktformular: Buttonbeschriftung
-type = string
--- a/templates/about_page.html
+++ b/templates/about_page.html
@ -11,13 +11,6 @@
 {% block body %}
    <section class="content">
      <div class="content__box">
-        {% if this.intro %}
-          <div class="content__box">
-              <div class="content__inner_box">
-                  {{ this.intro }}
-              </div>
-          </div>
-        {% endif %}

        <div class="services_box">
          <h1>{{ this.title }}</h1>
--- a/templates/aggregator_page.html
+++ b/templates/aggregator_page.html
@ -8,15 +8,6 @@
  {%- endif -%}
 {%- endblock -%}
 {% block body %}
-  <section class="content">
-  <div class="content__box">
-      <div class="content__box">
-          <div class="content__inner_box">
-            <h2>{{ this.title }}</h2>
-            {{ this.body }}
-          </div>
-      </div>
-  </div>
  <section class="card_grid -no_pad">
    {% set blog_posts = site.get('/blog').children.order_by('-pub_date').limit(3) %}
    {% set episodes = site.get('/podcast').children.order_by('-pub_date').limit(3) %}
--- a/templates/homepage.html
+++ b/templates/homepage.html
@ -16,7 +16,7 @@
  {% endfor %}

  <div class="contact__box">
-    <h1>{{ this.contact_form_headig }}</h1>
+    <h1>Kontakt</h1>

      <div class="contact_info__box">
      <p>
@ -36,26 +36,30 @@
    </div>
      <section class="contact_form_box">
      <div class="content__box">
+          <div class="content__inner_box -width_constraint">
+              {{ this.body }}
+          </div>
          <div class="content__inner_box -width_constraint content__contact_form_wrapper" style="display:none">
-            <h2>{{ this.contact_form_subheading }}</h2>
+            <h2>Kontaktformular</h2>
            <form id="contact_form" class="content__contact_form">
              <p class="contact_form__note">
-                {{ this.contact_form_info }}
+                Deine E-Mail-Adresse wird nicht veröffentlicht.<br>
+                <span aria-hidden="true">Erforderliche Felder sind gekennzeichnet <span class="contact_form--required" aria-hidden="true">*</span></span>
              </p>
              <p class="contact_form__text_input">
-                <label for="name">{{ this.contact_form_subject }} <span class="contact_form--required" aria-hidden="true">*</span></label>
+                <label for="name">Betreff <span class="contact_form--required" aria-hidden="true">*</span></label>
                <input id="name" class="contact_form__subject" name="subject" type="text" value="" size="30" maxlength="245" required />
              </p>
              <p class="contact_form__textarea">
-                <label for="message">{{ this.contact_form_message }} <span class="contact_form--required" aria-hidden="true">*</span></label>
+                <label for="message">Nachricht <span class="contact_form--required" aria-hidden="true">*</span></label>
                <textarea id="message" class="contact_form__message" aria-label="message" aria-hidden="true" cols="65" rows="7" name="message" required></textarea>
              </p>
              <p class="contact_form__text_input">
-                <label for="name">{{ this.contact_form_name }} <span class="contact_form--required" aria-hidden="true">*</span></label>
+                <label for="name">Name <span class="contact_form--required" aria-hidden="true">*</span></label>
                <input id="name" class="contact_form__name" name="name" type="text" value="" size="30" maxlength="245" required />
              </p>
              <p class="contact_form__text_input">
-                <label for="email">{{ this.contact_form_email }} <span class="contact_form--required" aria-hidden="true">*</span></label>
+                <label for="email">E-Mail-Adresse <span class="contact_form--required" aria-hidden="true">*</span></label>
                <input id="email" class="contact_form__email" name="email" type="email" value="" size="30" maxlength="100" aria-describedby="email-address" required />
              </p>
              <p class="contact_form__captcha">
@ -63,7 +67,7 @@
                <input id="captcha" class="contact_form__captcha" name="captcha" type="captcha" value="…" size="30" maxlength="100" required placeholder="Wie viele Ecken hat ein Pentagramm?"/>
              </p>
              <p class="contact_form__submit">
-                <input name="submit" type="submit" id="submit" class="contact_form__submit_button" value="{{ this.contact_form_button }}" />
+                <input name="submit" type="submit" id="submit" class="contact_form__submit_button" value="Kommentar abschicken" />
                <p class="contact_form__feedback"></p>
              </p>
            </form>