Update models and templates

models/blog.ini

@@ -9,7 +9,7 @@ type = string
 
 [fields.description]
 label = Description
-type = markdown
+type = text
 
 [fields.spruch]
 label = Werbespruch

models/page.ini

@@ -15,6 +15,10 @@ type = string
 label = Start-Slogan
 type = string
 
+[fields.teaser]
+label = Kurz umrissen: was sieht man hier?
+type = text
+
 [fields.content]
 label = Seiteninhalt
 type = markdown

models/presse.ini

@@ -15,6 +15,10 @@ type = string
 label = Start-Slogan
 type = string
 
+[fields.teaser]
+label = Kurz umrissen: was sieht man hier?
+type = text
+
 [fields.p1]
 label = Überschrift 1. Tabelle
 type = string

models/projekte.ini

@@ -9,7 +9,7 @@ type = string
 
 [fields.description]
 label = Description
-type = markdown
+type = text
 
 [fields.link]
 label = RSS Feed

models/vereinsheim.ini

@@ -15,6 +15,10 @@ type = string
 label = Start-Slogan
 type = string
 
+[fields.teaser]
+label = Kurz umrissen: was sieht man hier?
+type = text
+
 [fields.precontent]
 label = Seiteninhalt vor der Map
 type = markdown

templates/blog-post.html

@@ -7,6 +7,13 @@
 <link rel="import" href="{{ '/youtube-embed.html'|url }}"> {% endif %}
 {% endblock %}{% endif %}
 {% block title %}{{ this.title }}{% endblock %}
+{% block expand_description %}
+    <meta name="description" content="{% 
+        if this.xml %}{{ this.xml }}{% else %}{%
+            if bag('translate', this.alt, 'description') %}{{ bag('translate', this.alt, 'description') }}{% 
+            else %}{{ bag('translate', 'de', 'description') }}{% endif %}
+        {% endif %}" />
+{% endblock %}
 {% block body %}
 <!-- Main -->
 <div id="main" class="wrapper style1">

templates/blog.html

@@ -8,7 +8,7 @@
   <div class="container">
     <header class="major">
       <h2>{{ this.title }}</h2>
-      {{ this.description }}
+      <p>{{ this.description }}</p>
     </header>
    <center>  
       <a href="{{ this.link|url }}" class="button primary fit" >{{ this.spruch }}
@@ -27,3 +27,11 @@
   </div>
 </div>
 {% endblock %}
+{% block expand_description %}
+    <meta name="description" content="{% 
+        if this.description %}{{ this.description }}{% else %}{%
+            if bag('translate', this.alt, 'description') %}{{ bag('translate', this.alt, 'description') }}{% 
+            else %}{{ bag('translate', 'de', 'description') }}{% endif %}
+        {% endif %}" />
+{% endblock %}
+

templates/layout.html

@@ -4,9 +4,13 @@
     <meta charset="utf-8">
     <title>{% block title %}Startseite{% endblock %}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="stylesheet" href="{{ '/css/main.min.css'|url }}" />
+    <link rel="stylesheet" href="{{ '/css/main.css'|url }}" />
-    <!--[if lte IE 9]><link rel="stylesheet" href="{{ 'assets/css/ie9.min.css'|url }}" /><![endif]-->
+    <!--[if lte IE 9]><link rel="stylesheet" href="{{ 'assets/css/ie9.css'|url }}" /><![endif]-->
-    <meta name="description" content="{% if bag('translate', this.alt, 'description') %}{{ bag('translate', this.alt, 'description') }}{% else %}{{ bag('translate', 'de', 'description') }}{% endif %}" />
+    {% block expand_description 
+    %}<meta name="description" content="{% 
+        if bag('translate', this.alt, 'description') %}{{ bag('translate', this.alt, 'description') }}{% 
+        else %}{{ bag('translate', 'de', 'description') }}{% endif %}" />{%
+     endblock %}
     <link rel="apple-touch-icon" sizes="180x180" href="{{ '/images/icons/apple-touch-icon.png'|url }}">
     <link rel="icon" type="image/png" sizes="32x32" href="{{ '/images/icons/favicon-32x32.png'|url }}">
     <link rel="icon" type="image/png" sizes="16x16" href="{{ '/images/icons/favicon-16x16.png'|url }}">
@@ -15,13 +19,12 @@
     <link rel="shortcut icon" href="{{ '/images/icons/favicon.ico'|url }}">
     <meta name="msapplication-TileColor" content="#da532c">
     <meta name="msapplication-config" content="{{ '/images/icons/browserconfig.xml'|url }}">
-    <meta name="theme-color" content="#e64f2d">
+    <meta name="theme-color" content="#e64f2d">{%
-    {% block expand_header %}{% endblock %}
+    block expand_header %}{% endblock %}
     <script src="{{ '/js/jquery.min.js'|url }}"></script>
   </head>
   <body class="{% if this._path == '/' %}landing {% endif %} is-preload">
     <div id="page-wrapper">
-
        <!-- Header -->
         <header id="header">
             <h1 id="logo">
@@ -152,14 +155,12 @@
               </ul>
             </nav>
           </header>
-
 <!-- Main -->
 {% block body %}{% endblock %}
-
        <!-- Footer -->
        <footer id="footer">
-         <ul class="icons">
+         <ul class="icons">{%
-           {% for label, icon, href in [
+         for label, icon, href in [
            ['Twitter', 'fab fa-twitter', "https://twitter.com/toolboxbodensee"],
            ['Mastodon', 'fab fa-mastodon', "https://chaos.social/@toolbox"],
            ['Facebook', 'fab fa-facebook', "https://www.facebook.com/toolboxbodensee/"],
@@ -170,13 +171,17 @@
            ['Telefon', 'fas fa-phone', "tel:+4975449667222"],
            ['News', 'fas fa-rss', "https://toolbox-bodensee.de/feed_blog.xml"]
          ] %}
-           <li><a href="{{ href }}" title="{{ label }}" target="_blank" rel="noopener" class="icon {{ icon }}"></a></li>
+           <li><a href="{{ href }}" title="{{ label }}" target="_blank" rel="noopener" class="icon {{ icon }}"></a></li>{%
-         {% endfor %}
+         endfor %}
         </ul>
         <ul class="copyright">
           <li>&copy;Copyright by Toolbox Bodensee e.V.</li>
-          <li><a href="{{ '/impressum/'|url }}">{% if bag('navigation', this.alt, 'Impressum') %}{{ bag('navigation', this.alt, 'Impressum') }}{% else %}Impressum{% endif %}</a></li>
+          <li><a href="{{ '/impressum/'|url }}">{% 
-          <li><a href="{{ '/datenschutz/'|url }}">{% if bag('navigation', this.alt, 'Datenschutz') %}{{ bag('navigation', this.alt, 'Datenschutz') }}{% else %}Datenschutzerklärung{% endif %}</a></li>
+                  if bag('navigation', this.alt, 'Impressum') %}{{ bag('navigation', this.alt, 'Impressum') }}{%
+                  else %}Impressum{% endif %}</a></li>
+          <li><a href="{{ '/datenschutz/'|url }}">{% 
+                  if bag('navigation', this.alt, 'Datenschutz') %}{{ bag('navigation', this.alt, 'Datenschutz') }}{% 
+                  else %}Datenschutzerklärung{% endif %}</a></li>
           <li>Design inspired by <a href="http://html5up.net">HTML5 UP</a> </li>
           <!-- CMS: Lektor | Angepasst durch L3D -->
           <!-- advertising: Grab your waffle from C3WOC! C3WOC ->Great waffles for everypony. https://c3woc.de/ -->

templates/page.html

@@ -1,5 +1,12 @@
 {% extends "layout.html" %}
 {% block title %}{{ this.title }}{% endblock %}
+{% block expand_description %}
+    <meta name="description" content="{% 
+        if this.teaser %}{{ this.teaser }}{% else %}{%
+            if bag('translate', this.alt, 'description') %}{{ bag('translate', this.alt, 'description') }}{% 
+            else %}{{ bag('translate', 'de', 'description') }}{% endif %}
+        {% endif %}" />
+{% endblock %}
 {% block body %}
 <div id="main" class="wrapper style1">
   <div class="container">

templates/presse.html

@@ -1,5 +1,12 @@
 {% extends "layout.html" %}
 {% block title %}{{ this.title }}{% endblock %}
+{% block expand_description %}
+    <meta name="description" content="{% 
+        if this.teaser %}{{ this.teaser }}{% else %}{%
+            if bag('translate', this.alt, 'description') %}{{ bag('translate', this.alt, 'description') }}{% 
+            else %}{{ bag('translate', 'de', 'description') }}{% endif %}
+        {% endif %}" />
+{% endblock %}
 {% block body %}
 <div id="main" class="wrapper style1">
   <div class="container">

templates/projekt-post.html

@@ -6,6 +6,13 @@
 <script src="{{ '/js/webcomponents.min.js'|url }}"></script/>
 <link rel="import" href="{{ '/youtube-embed.html'|url }}"> {% endif %}
 {% endblock %}
+{% block expand_description %}
+    <meta name="description" content="{% 
+        if this.teaser %}{{ this.teaser }}{% else %}{%
+            if bag('translate', this.alt, 'description') %}{{ bag('translate', this.alt, 'description') }}{% 
+            else %}{{ bag('translate', 'de', 'description') }}{% endif %}
+        {% endif %}" />
+{% endblock %}
 {% block title %}{{ this.title }}{% endblock %}
 {% block body %}          
   {{ render_blog_post(this) }}

templates/projekte.html

@@ -6,7 +6,7 @@
   <div class="container">
     <header class="major">
         <h2>{{ this.title }}</h2>
-        {{ this.description }}
+        <p>{{ this.description }}</p>
     </header>
     <div class="box alt">
       <div class="row uniform">
@@ -25,3 +25,11 @@
  </div>
 </section>
 {% endblock %}
+{% block expand_description %}
+    <meta name="description" content="{% 
+        if this.description %}{{ this.description }}{% else %}{%
+            if bag('translate', this.alt, 'description') %}{{ bag('translate', this.alt, 'description') }}{% 
+            else %}{{ bag('translate', 'de', 'description') }}{% endif %}
+        {% endif %}" />
+{% endblock %}
+

templates/vereinsheim.html

@@ -5,6 +5,13 @@
   <script src="{{ '/js/leaflet.js'|url }}" integrity="sha512-nMMmRyTVoLYqjP9hrbed9S+FzjZHW5gY1TWCHA5ckwXZBadntCNs8kEqAWdrb9O7rxbCaA4lKTIWjDXZxflOcA==" crossorigin=""></script>
   <link href="{{ '/css/lightgallery.css'|url }}" rel="stylesheet">
 {% endblock %}
+{% block expand_description %}
+    <meta name="description" content="{% 
+        if this.teaser %}{{ this.teaser }}{% else %}{%
+            if bag('translate', this.alt, 'description') %}{{ bag('translate', this.alt, 'description') }}{% 
+            else %}{{ bag('translate', 'de', 'description') }}{% endif %}
+        {% endif %}" />
+{% endblock %}
 {% block body %}
 <div id="main" class="wrapper style1">
   <div class="container">