Merge remote-tracking branch 'origin/main' into main

exampleSite/content/docs/shortcodes/index.de.md

@@ -92,7 +92,8 @@ Das Alert-Zeichen (`+` oder `-`) ist optional, um zu steuern, ob die Admonition
 > **GitHub-Typen:** `NOTE`, `TIP`, `IMPORTANT`, `WARNING`, `CAUTION`
 > **Obsidian-Typen:** `note`, `abstract`, `info`, `todo`, `tip`, `success`, `question`, `warning`, `failure`, `danger`, `bug`, `example`, `quote`
 
-<br/><br/><br/>
+> [!INFO]- Admonition anpassen
+> Siehe die [Anleitung zur Anpassung von Admonition](https://github.com/nunocoracao/blowfish/blob/main/layouts/_default/_markup/render-blockquote.html).
 
 ## Article
 

exampleSite/content/users/users.json

@@ -1097,5 +1097,14 @@
       "Personal Finance",
       "Calculators"
     ]
+  },
+  {
+    "title": "chius.cc",
+    "url": "https://chius.cc/",
+    "source": "https://github.com/chius-me/chius.cc",
+    "tags": [
+      "Personal site",
+      "Blog"
+    ]
   }
 ]

i18n/de.yaml

@@ -87,6 +87,23 @@ shortcode:
 recent:
   show_more: "Zeige Mehr"
 
+admonition:
+  abstract: "Kurzfassung"
+  bug: "Bug"
+  caution: "Vorsicht"
+  danger: "Gefahr"
+  example: "Beispiel"
+  failure: "Fehler"
+  important: "Wichtig"
+  info: "Info"
+  note: "Hinweis"
+  question: "Frage"
+  quote: "Zitat"
+  success: "Erfolg"
+  tip: "Tipp"
+  todo: "To-Do"
+  warning: "Warnung"
+
 cookie_notice:
   message_with_link: "Diese Website verwendet Cookies und ähnliche Technologien. Lesen Sie unsere Datenschutzerklärung"
   message: "Diese Website verwendet Cookies und ähnliche Technologien. Mit der Nutzung dieser Website akzeptierst du das."

layouts/partials/article-link/_shortcode.html

@@ -47,6 +47,9 @@
         {{ end }}
       {{ else }}
         {{ $featured = $p.Resources.Get . }}
+        {{ if not $featured }}
+          {{ $featured = resources.Get . }}
+        {{ end }}
       {{ end }}
     {{ end }}
 
@@ -89,7 +92,7 @@
         role="presentation"
         loading="lazy"
         decoding="async"
-        class="not-prose absolute inset-0 w-full h-full object-cover">
+        class="not-prose absolute inset-0 w-full h-full object-cover" />
     </div>
   {{ end }}
   <div class="{{ $cardContentClasses }}">

layouts/partials/article-link/card-related.html

@@ -21,6 +21,9 @@
       {{ end }}
     {{ else }}
       {{ $featured = $p.Resources.Get . }}
+      {{ if not $featured }}
+        {{ $featured = resources.Get . }}
+      {{ end }}
     {{ end }}
   {{ end }}
 
@@ -57,14 +60,16 @@
 <article
   class="article-link--related relative min-h-full min-w-full overflow-hidden rounded-lg border border-neutral-300 dark:border-neutral-600">
   {{ with $featuredURL }}
-    <div class="flex-none relative overflow-hidden thumbnail_card_related" style="--thumbnail-aspect-ratio: {{ $thumbnailAspectRatio }}">
+    <div
+      class="flex-none relative overflow-hidden thumbnail_card_related"
+      style="--thumbnail-aspect-ratio: {{ $thumbnailAspectRatio }}">
       <img
         src="{{ . }}"
         role="presentation"
         loading="lazy"
         decoding="async"
         fetchpriority="low"
-        class="not-prose absolute inset-0 w-full h-full object-cover">
+        class="not-prose absolute inset-0 w-full h-full object-cover" />
     </div>
   {{ end }}
   {{ if and .Draft .Site.Params.article.showDraftLabel }}

layouts/partials/article-link/card.html

@@ -24,6 +24,9 @@
         {{ end }}
       {{ else }}
         {{ $featured = $p.Resources.Get . }}
+        {{ if not $featured }}
+          {{ $featured = resources.Get . }}
+        {{ end }}
       {{ end }}
     {{ end }}
 
@@ -61,13 +64,15 @@
 <article
   class="article-link--card relative min-h-full min-w-full overflow-hidden rounded-lg border border-neutral-300 dark:border-neutral-600">
   {{ with $featuredURL }}
-    <div class="flex-none relative overflow-hidden thumbnail_card" style="--thumbnail-aspect-ratio: {{ $thumbnailAspectRatio }}">
+    <div
+      class="flex-none relative overflow-hidden thumbnail_card"
+      style="--thumbnail-aspect-ratio: {{ $thumbnailAspectRatio }}">
       <img
         src="{{ . }}"
         role="presentation"
         loading="lazy"
         decoding="async"
-        class="not-prose absolute inset-0 w-full h-full object-cover">
+        class="not-prose absolute inset-0 w-full h-full object-cover" />
     </div>
   {{ end }}
   {{ if and .Draft .Site.Params.article.showDraftLabel }}

layouts/partials/article-link/simple.html

@@ -40,6 +40,9 @@
         {{ end }}
       {{ else }}
         {{ $featured = $p.Resources.Get . }}
+        {{ if not $featured }}
+          {{ $featured = resources.Get . }}
+        {{ end }}
       {{ end }}
     {{ end }}
 
@@ -82,7 +85,7 @@
         role="presentation"
         loading="lazy"
         decoding="async"
-        class="not-prose absolute inset-0 w-full h-full object-cover">
+        class="not-prose absolute inset-0 w-full h-full object-cover" />
     </div>
   {{ end }}
   <div class="{{ $cardContentClasses }}">

layouts/partials/article-meta/basic.html

@@ -100,20 +100,26 @@
       {{ range $taxonomy, $terms := .Site.Taxonomies }}
         {{ if (gt (len ($context.GetTerms $taxonomy)) 0) }}
           {{ range $context.GetTerms $taxonomy }}
-            {{ if .Params.showCategories | default (.Site.Params.article.showCategories | default true) }}
-              {{ if (eq $taxonomy "categories") }}
+            {{ if (or (eq $taxonomy "authors") (eq $taxonomy "series"))}}
+              {{/* Ignore authors and series, since they are handled in other places */}}
+              {{ continue }}
+            {{ else if (eq $taxonomy "categories") }}
+              {{ if .Params.showCategories | default (.Site.Params.article.showCategories | default true) }}
                 <a class="relative mt-[0.5rem] me-2" href="{{ .RelPermalink }}">
                   {{ $useSecondaryColor := .Params.showCategoriesInSecondaryColor | default (.Site.Params.article.showCategoriesInSecondaryColor | default false) }}
                   {{ partial "badge.html" (dict "linkTitle" .LinkTitle "useSecondaryColor" $useSecondaryColor) }}
                 </a>
               {{ end }}
-            {{ end }}
-            {{ if .Params.showTags | default (.Site.Params.article.showTags | default true) }}
-              {{ if (eq $taxonomy "tags") }}
+            {{ else if (eq $taxonomy "tags") }}
+              {{ if .Params.showTags | default (.Site.Params.article.showTags | default true) }}
                 <a class="relative mt-[0.5rem] me-2" href="{{ .RelPermalink }}">
                   {{ partial "badge.html" .LinkTitle }}
                 </a>
               {{ end }}
+            {{ else }}
+              <a class="relative mt-[0.5rem] me-2" href="{{ .RelPermalink }}">
+                {{ partial "badge.html" .LinkTitle }}
+              </a>
             {{ end }}
           {{ end }}
         {{ end }}

layouts/partials/hero/background.html

@@ -12,6 +12,9 @@
     {{ end }}
   {{ else }}
     {{ $featured = page.Resources.Get . }}
+    {{ if not $featured }}
+      {{ $featured = resources.Get . }}
+    {{ end }}
   {{ end }}
 {{ end }}
 
@@ -78,7 +81,7 @@
       decoding="async"
       fetchpriority="high"
       class="absolute inset-0 w-full h-full object-cover"
-      {{ if $style }}style="{{ $style | safeCSS }}"{{ end }}>
+      {{ if $style }}style="{{ $style | safeCSS }}"{{ end }} />
     <div
       class="absolute inset-0 bg-gradient-to-t from-neutral dark:from-neutral-800 to-transparent mix-blend-normal"></div>
     <div

layouts/partials/hero/basic.html

@@ -12,6 +12,9 @@
     {{ end }}
   {{ else }}
     {{ $featured = page.Resources.Get . }}
+    {{ if not $featured }}
+      {{ $featured = resources.Get . }}
+    {{ end }}
   {{ end }}
 {{ end }}
 
@@ -58,6 +61,6 @@
       decoding="async"
       fetchpriority="high"
       class="w-full h-full nozoom object-cover"
-      {{ if $style }}style="{{ $style | safeCSS }}"{{ end }}>
+      {{ if $style }}style="{{ $style | safeCSS }}"{{ end }} />
   </div>
 {{ end }}

layouts/partials/hero/big.html

@@ -12,6 +12,9 @@
     {{ end }}
   {{ else }}
     {{ $featured = page.Resources.Get . }}
+    {{ if not $featured }}
+      {{ $featured = resources.Get . }}
+    {{ end }}
   {{ end }}
 {{ end }}
 
@@ -66,7 +69,7 @@
       decoding="async"
       fetchpriority="high"
       class="w-full rounded-lg single_hero_round nozoom"
-      {{ if $style }}style="{{ $style | safeCSS }}"{{ end }}>
+      {{ if $style }}style="{{ $style | safeCSS }}"{{ end }} />
     {{ if $caption }}
       <figcaption class="text-sm text-neutral-700 dark:text-neutral-400 hover:underline text-center">
         {{ $caption | markdownify }}

layouts/partials/hero/thumbAndBackground.html

@@ -46,6 +46,9 @@
     {{ end }}
   {{ else }}
     {{ $featured = page.Resources.Get . }}
+    {{ if not $featured }}
+      {{ $featured = resources.Get . }}
+    {{ end }}
   {{ end }}
 {{ end }}
 
@@ -94,7 +97,7 @@
       decoding="async"
       fetchpriority="high"
       class="w-full h-full nozoom object-cover"
-      {{ with $.Params.imagePositionFeature }}style="object-position: {{ . }};"{{ end }}>
+      {{ with $.Params.imagePositionFeature }}style="object-position: {{ . }};"{{ end }} />
   </div>
 {{ end }}
 
@@ -114,7 +117,7 @@
       decoding="async"
       fetchpriority="high"
       class="absolute inset-0 h-full w-full object-cover"
-      {{ if $style }}style="{{ $style | safeCSS }}"{{ end }}>
+      {{ if $style }}style="{{ $style | safeCSS }}"{{ end }} />
   {{ end }}
   <div
     class="from-neutral absolute inset-0 bg-gradient-to-t to-transparent mix-blend-normal dark:from-neutral-800"></div>

layouts/partials/term-link/card.html

@@ -5,11 +5,15 @@
 {{ $thumbnailAspectRatio := site.Params.thumbnailAspectRatio | default "1.5" }}
 {{ $thumbnailAspectRatio = replaceRE "[^0-9.]" "" $thumbnailAspectRatio }}
 {{ if eq $thumbnailAspectRatio "" }}{{ $thumbnailAspectRatio = "1.5" }}{{ end }}
+{{ $p := .Page }}
 {{ with .Page.Params.featureimage }}
   {{ if or (strings.HasPrefix . "http:") (strings.HasPrefix . "https:") }}
     {{ $featured = resources.GetRemote . }}
   {{ else }}
-    {{ $featured = page.Resources.Get . }}
+    {{ $featured = $p.Resources.Get . }}
+    {{ if not $featured }}
+      {{ $featured = resources.Get . }}
+    {{ end }}
   {{ end }}
 {{ end }}
 
@@ -31,14 +35,16 @@
 <div class="min-w-full">
   <div class="border-neutral-200 dark:border-neutral-700 border-2 rounded overflow-hidden shadow-2xl relative">
     {{ with $featuredURL }}
-      <figure class="not-prose flex-none relative overflow-hidden thumbnail_card" style="--thumbnail-aspect-ratio: {{ $thumbnailAspectRatio }}">
+      <figure
+        class="not-prose flex-none relative overflow-hidden thumbnail_card"
+        style="--thumbnail-aspect-ratio: {{ $thumbnailAspectRatio }}">
         <img
           src="{{ . }}"
           alt="{{ $.Page.Title }}"
           loading="lazy"
           decoding="async"
           fetchpriority="low"
-          class="not-prose absolute inset-0 w-full h-full object-cover">
+          class="not-prose absolute inset-0 w-full h-full object-cover" />
       </figure>
     {{ end }}
     {{ if site.Params.taxonomy.showTermCount | default true }}