From 86f38b2137612626ab435125bd8701651f1dcc96 Mon Sep 17 00:00:00 2001
From: Denys Konovalov <kontakt@denyskon.de>
Date: Mon, 19 Jun 2023 20:30:02 +0200
Subject: [PATCH] fix ausblick, move data out of language

---
 data/{de => }/ausblick.yml         |  0
 data/{de => }/categories.yml       |  0
 data/{de => }/homepage.yml         |  0
 data/{de => }/months.yml           |  0
 data/{de => }/transliterations.yml |  0
 layouts/about/list.html            |  2 --
 layouts/index.html                 | 20 ++++++++++++--------
 layouts/partials/blog-sidebar.html |  3 +--
 layouts/partials/header.html       |  2 +-
 layouts/partials/info.html         |  4 +---
 10 files changed, 15 insertions(+), 16 deletions(-)
 rename data/{de => }/ausblick.yml (100%)
 rename data/{de => }/categories.yml (100%)
 rename data/{de => }/homepage.yml (100%)
 rename data/{de => }/months.yml (100%)
 rename data/{de => }/transliterations.yml (100%)

diff --git a/data/de/ausblick.yml b/data/ausblick.yml
similarity index 100%
rename from data/de/ausblick.yml
rename to data/ausblick.yml
diff --git a/data/de/categories.yml b/data/categories.yml
similarity index 100%
rename from data/de/categories.yml
rename to data/categories.yml
diff --git a/data/de/homepage.yml b/data/homepage.yml
similarity index 100%
rename from data/de/homepage.yml
rename to data/homepage.yml
diff --git a/data/de/months.yml b/data/months.yml
similarity index 100%
rename from data/de/months.yml
rename to data/months.yml
diff --git a/data/de/transliterations.yml b/data/transliterations.yml
similarity index 100%
rename from data/de/transliterations.yml
rename to data/transliterations.yml
diff --git a/layouts/about/list.html b/layouts/about/list.html
index 78aa929d..f132e77d 100644
--- a/layouts/about/list.html
+++ b/layouts/about/list.html
@@ -1,7 +1,5 @@
 {{ define "main" }}
 
-{{ $data := index .Site.Data .Site.Language.Lang }}
-
 <section class="section">
   <div class="container">
     <div class="row">
diff --git a/layouts/index.html b/layouts/index.html
index 891d366c..613fd276 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 
-{{ $data := index .Site.Data .Site.Language.Lang }}
+{{ $data := .Site.Data }}
 
 {{ if $data.homepage.slider.enable }}
 {{ with $data.homepage.slider }}
@@ -30,7 +30,7 @@
       display: none;
     }
   </style>
-  <section class="hero-section overlay bg-cover" style="background-image: url({{ $data.homepage.slider.bg_image | absURL }});">
+  <section class="hero-section overlay bg-cover" style="background-image: url('{{ $data.homepage.slider.bg_image | absURL }}');">
     <div class="container">
       <div class="hero-slider">
           <div class="row">
@@ -114,17 +114,19 @@
       </div>
     </div>
     <div class="row justify-content-center">
+      {{ if $data.ausblick.enable }}
+      {{ with $data.ausblick }}
       <div class="col-lg-4 col-sm-6 mb-4 mb-lg-0 d-flex align-items-stretch">
         <div class="card border-info rounded-0 hover-shadow mb-4">
           <span class="position-absolute top-0 start-0 ms-5 translate-middle p-2 text-bg-info border border-light rounded-pill">
             <i class="mdi mdi-pin me-2">Angeheftet</i>
           </span>        
-          <img class="card-img-top rounded-0" src="{{ $data.ausblick.image | relURL }}" alt="{{ $data.ausblick.title }}" onclick="$('#{{ md5 $data.ausblick.title }}').modal('show');">
+          <img class="card-img-top rounded-0" src="{{ .image | relURL }}" alt="{{ .title }}" onclick="$('#{{ md5 .title }}').modal('show');">
           <div class="card-body d-flex flex-column">
             <div class="row mb-2">
               <div class="col-12">
                 <i class="mdi mdi-fountain-pen-tip me-2"></i>
-                {{ range $index, $elements := where (where .Site.RegularPages "Type" "author") "File.BaseFileName" "in" $data.ausblick.author  }}
+                {{ range $index, $elements := where (where .Site.RegularPages "Type" "author") "File.BaseFileName" "in" .author  }}
                   {{ if ne $index 0 }}, {{ end }}
                   {{ if .Params.simplified }}
                     {{ .Title }}
@@ -134,14 +136,16 @@
                 {{ end }}
               </div>
             </div>
-            <h4 class="card-title text-truncate" onclick="$('#{{ md5 $data.ausblick.title }}').modal('show');">{{ $data.ausblick.title }}</h4>
-            <p class="card-text" onclick="$('#{{ md5 $data.ausblick.title }}').modal('show');">{{ $data.ausblick.content | truncate 100 }}</p>
-            <button type="button" class="btn btn-primary btn-sm mt-auto align-self-start" onclick="$('#{{ md5 $data.ausblick.title }}').modal('show');">{{
+            <h4 class="card-title text-truncate" onclick="$('#{{ md5 .title }}').modal('show');">{{ .title }}</h4>
+            <p class="card-text" onclick="$('#{{ md5 .title }}').modal('show');">{{ .content | truncate 100 }}</p>
+            <button type="button" class="btn btn-primary btn-sm mt-auto align-self-start" onclick="$('#{{ md5 .title }}').modal('show');">{{
               i18n "show_more"}}</button>
           </div>
         </div>
       </div>
-      {{ range first (int $data.homepage.blog.number) (where .Site.RegularPages "Type" "post")}}
+      {{ end }}
+      {{ end }}
+      {{ range first (cond $data.ausblick.enable (int $data.homepage.blog.number) (add $data.homepage.blog.number 1)) (where .Site.RegularPages "Type" "post")}}
       <div class="col-lg-4 col-sm-6 mb-4 mb-lg-0 d-flex align-items-stretch">
         {{ .Render "card" }}
       </div>
diff --git a/layouts/partials/blog-sidebar.html b/layouts/partials/blog-sidebar.html
index d3c0fbaf..c94c9b26 100644
--- a/layouts/partials/blog-sidebar.html
+++ b/layouts/partials/blog-sidebar.html
@@ -1,8 +1,7 @@
 <aside class="col-lg-4 order-4 order-lg-2" data-pagefind-ignore="all">
   <div class="bg-white mb-4">
     <h4 class="mb-4">{{ i18n "categories" }}</h4>
-    {{ $data := index .Site.Data .Site.Language.Lang }}
-    {{ $transliterations := $data.transliterations.transliterations }}
+    {{ $transliterations := .Site.Data.transliterations.transliterations }}
     {{- if isset .Site.Taxonomies "categories" }}
     {{- if not (eq (len .Site.Taxonomies.categories) 0) }}
     <ul class="list-inline tag-list">
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 7c8d24e0..6bcd075c 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -102,7 +102,7 @@
   </noscript>
 </header>
 
-{{ $top_banner := (index .Site.Data .Site.Language.Lang).homepage.top_banner }}
+{{ $top_banner := .Site.Data.homepage.top_banner }}
   {{ if and $top_banner.enable }}
   {{ if or (not $top_banner.temporarily.enable) (and $top_banner.temporarily.enable (and (le ($top_banner.temporarily.start_date | time.AsTime).Unix now.Unix ) (ge ($top_banner.temporarily.end_date | time.AsTime).Unix now.Unix))) }}
   {{ with $top_banner }}
diff --git a/layouts/partials/info.html b/layouts/partials/info.html
index a017edc3..a55086d9 100644
--- a/layouts/partials/info.html
+++ b/layouts/partials/info.html
@@ -1,6 +1,4 @@
-{{ $data := index .Site.Data .Site.Language.Lang }}
-
-{{ with $data.homepage.info }}
+{{ with .Site.Data.homepage.info }}
 <section class="section bg-cover" data-background="{{ .bg_image | absURL }}">
   <div class="container">
     <div class="row">