From f5cd789874aa0c8ad6f09b93f5963654f744ddeb Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Thu, 25 Jan 2024 12:03:45 +0100
Subject: [PATCH] refacto truncate content
---
layouts/partials/GetTruncateContent | 2 +-
layouts/partials/blocks/templates/pages.html | 12 ++++--------
.../partials/blocks/templates/pages/alternate.html | 12 ++++--------
layouts/partials/blocks/templates/pages/cards.html | 12 ++++--------
layouts/partials/blocks/templates/pages/grid.html | 12 ++++--------
layouts/partials/blocks/templates/pages/large.html | 12 ++++--------
.../partials/blocks/templates/posts/highlight.html | 12 ++++--------
layouts/partials/blocks/templates/posts/large.html | 12 ++++--------
layouts/partials/events/event.html | 12 ++++--------
layouts/partials/posts/post.html | 12 ++++--------
10 files changed, 37 insertions(+), 73 deletions(-)
diff --git a/layouts/partials/GetTruncateContent b/layouts/partials/GetTruncateContent
index 23bd565a..ab6ddc10 100644
--- a/layouts/partials/GetTruncateContent
+++ b/layouts/partials/GetTruncateContent
@@ -6,4 +6,4 @@
{{ $text = chomp (truncate $length "…" (safeHTML (plainify $text))) }}
{{ end }}
-{{ return $text }}
\ No newline at end of file
+{{ return (partial "PrepareText" $text) }}
\ No newline at end of file
diff --git a/layouts/partials/blocks/templates/pages.html b/layouts/partials/blocks/templates/pages.html
index 226dd0e9..64394a08 100644
--- a/layouts/partials/blocks/templates/pages.html
+++ b/layouts/partials/blocks/templates/pages.html
@@ -25,14 +25,10 @@
{{- $page_class = printf "block-page-%s" .Params.bodyclass }}
{{ end }}
{{ if $show_main_description }}
- {{ if site.Params.pages.index.truncate_description }}
- {{- $main_description = partial "GetTruncateContent" ( dict
- "text" .Params.summary
- "length" site.Params.pages.index.truncate_description
- ) -}}
- {{ else }}
- {{- $main_description = partial "PrepareText" .Params.summary -}}
- {{ end }}
+ {{- $main_description = partial "GetTruncateContent" ( dict
+ "text" .Params.summary
+ "length" site.Params.pages.index.truncate_description
+ ) -}}
{{ end }}
{{ end -}}
diff --git a/layouts/partials/blocks/templates/pages/alternate.html b/layouts/partials/blocks/templates/pages/alternate.html
index 9b145d88..90ceabd1 100644
--- a/layouts/partials/blocks/templates/pages/alternate.html
+++ b/layouts/partials/blocks/templates/pages/alternate.html
@@ -24,14 +24,10 @@
{{ $heading_tag.close }}
{{ if and $show_descriptions .Params.summary }}
- {{ if site.Params.pages.index.truncate_description }}
- <p>{{ partial "GetTruncateContent" ( dict
- "text" .Params.summary
- "length" site.Params.pages.index.truncate_description
- ) }}</p>
- {{ else }}
- <p>{{ partial "PrepareText" .Params.summary }}</p>
- {{ end }}
+ <p>{{ partial "GetTruncateContent" ( dict
+ "text" .Params.summary
+ "length" site.Params.pages.index.truncate_description
+ ) }}</p>
{{ end }}
{{ if $show_images }}
diff --git a/layouts/partials/blocks/templates/pages/cards.html b/layouts/partials/blocks/templates/pages/cards.html
index 125e566d..5689e6e3 100644
--- a/layouts/partials/blocks/templates/pages/cards.html
+++ b/layouts/partials/blocks/templates/pages/cards.html
@@ -17,14 +17,10 @@
{{ $heading_tag.close }}
{{ if and $show_descriptions .Params.summary }}
- {{ if site.Params.pages.index.truncate_description }}
- <p>{{ partial "GetTruncateContent" ( dict
- "text" .Params.summary
- "length" site.Params.pages.index.truncate_description
- ) }}</p>
- {{ else }}
- <p>{{ partial "PrepareText" .Params.summary }}</p>
- {{ end }}
+ <p>{{ partial "GetTruncateContent" ( dict
+ "text" .Params.summary
+ "length" site.Params.pages.index.truncate_description
+ ) }}</p>
{{ end }}
<p class="more meta" aria-hidden="true">{{- i18n "commons.more" -}}</p>
diff --git a/layouts/partials/blocks/templates/pages/grid.html b/layouts/partials/blocks/templates/pages/grid.html
index 67a4af74..68b8aa8c 100644
--- a/layouts/partials/blocks/templates/pages/grid.html
+++ b/layouts/partials/blocks/templates/pages/grid.html
@@ -26,14 +26,10 @@
{{ $heading_tag.close }}
{{ if and $show_descriptions .Params.summary }}
- {{ if site.Params.pages.index.truncate_description }}
- <p>{{ partial "GetTruncateContent" ( dict
- "text" .Params.summary
- "length" site.Params.pages.index.truncate_description
- ) }}</p>
- {{ else }}
- <p>{{ partial "PrepareText" .Params.summary }}</p>
- {{ end }}
+ <p>{{ partial "GetTruncateContent" ( dict
+ "text" .Params.summary
+ "length" site.Params.pages.index.truncate_description
+ ) }}</p>
{{ end }}
{{ if $show_images }}
{{- partial "pages/page-media.html" . -}}
diff --git a/layouts/partials/blocks/templates/pages/large.html b/layouts/partials/blocks/templates/pages/large.html
index 112a8bac..890680f8 100644
--- a/layouts/partials/blocks/templates/pages/large.html
+++ b/layouts/partials/blocks/templates/pages/large.html
@@ -18,14 +18,10 @@
{{ $heading_tag.close }}
{{ if and $show_descriptions .Params.summary }}
- {{ if site.Params.pages.index.truncate_description }}
- <p>{{ partial "GetTruncateContent" ( dict
- "text" .Params.summary
- "length" site.Params.pages.index.truncate_description
- ) }}</p>
- {{ else }}
- <p>{{ partial "PrepareText" .Params.summary }}</p>
- {{ end }}
+ <p>{{ partial "GetTruncateContent" ( dict
+ "text" .Params.summary
+ "length" site.Params.pages.index.truncate_description
+ ) }}</p>
{{ end }}
<p class="more meta" aria-hidden="true">{{- i18n "commons.more" -}}</p>
</div>
diff --git a/layouts/partials/blocks/templates/posts/highlight.html b/layouts/partials/blocks/templates/posts/highlight.html
index cadbf215..ee6b189e 100644
--- a/layouts/partials/blocks/templates/posts/highlight.html
+++ b/layouts/partials/blocks/templates/posts/highlight.html
@@ -34,14 +34,10 @@
{{ end }}
{{ if site.Params.posts.index.show_description }}
{{- if (partial "GetTextFromHTML" .Params.summary) -}}
- {{ if site.Params.posts.index.truncate_description }}
- <p itemprop="articleBody">{{ partial "GetTruncateContent" ( dict
- "text" .Params.summary
- "length" site.Params.posts.index.truncate_description
- ) }}</p>
- {{ else }}
- <p itemprop="articleBody">{{ partial "PrepareText" .Params.summary }}</p>
- {{ end }}
+ <p itemprop="articleBody">{{ partial "GetTruncateContent" ( dict
+ "text" .Params.summary
+ "length" site.Params.posts.index.truncate_description
+ ) }}</p>
{{- end -}}
{{- end -}}
diff --git a/layouts/partials/blocks/templates/posts/large.html b/layouts/partials/blocks/templates/posts/large.html
index 00595f82..d0b66bde 100644
--- a/layouts/partials/blocks/templates/posts/large.html
+++ b/layouts/partials/blocks/templates/posts/large.html
@@ -36,14 +36,10 @@
{{ if site.Params.posts.index.show_description }}
{{- if (partial "GetTextFromHTML" .Params.summary) -}}
- {{ if site.Params.posts.index.truncate_description }}
- <p itemprop="articleBody">{{ partial "GetTruncateContent" ( dict
- "text" .Params.summary
- "length" site.Params.posts.index.truncate_description
- ) }}</p>
- {{ else }}
- <p itemprop="articleBody">{{ partial "PrepareText" .Params.summary }}</p>
- {{ end }}
+ <p itemprop="articleBody">{{ partial "GetTruncateContent" ( dict
+ "text" .Params.summary
+ "length" site.Params.posts.index.truncate_description
+ ) }}</p>
{{- end -}}
{{- end -}}
<p class="more meta" aria-hidden="true">{{- i18n "commons.more" -}}</p>
diff --git a/layouts/partials/events/event.html b/layouts/partials/events/event.html
index 194a1dc2..633b9adc 100644
--- a/layouts/partials/events/event.html
+++ b/layouts/partials/events/event.html
@@ -57,14 +57,10 @@
{{- if (partial "GetTextFromHTML" .Params.summary) -}}
<div class="event-description">
<p itemprop="description">
- {{ if site.Params.events.index.truncate_description }}
- {{ partial "GetTruncateContent" ( dict
- "text" .Params.summary
- "length" site.Params.events.index.truncate_description
- ) }}
- {{ else }}
- {{ partial "PrepareText" .Params.summary }}
- {{ end }}
+ {{ partial "GetTruncateContent" ( dict
+ "text" .Params.summary
+ "length" site.Params.events.index.truncate_description
+ ) }}
</p>
</div>
{{- end -}}
diff --git a/layouts/partials/posts/post.html b/layouts/partials/posts/post.html
index d0b1d717..0ee9eb49 100644
--- a/layouts/partials/posts/post.html
+++ b/layouts/partials/posts/post.html
@@ -28,14 +28,10 @@
{{ if site.Params.posts.index.show_description }}
{{- if (partial "GetTextFromHTML" .Params.summary) -}}
- {{ if site.Params.posts.index.truncate_description }}
- <p itemprop="articleBody">{{ partial "GetTruncateContent" ( dict
- "text" .Params.summary
- "length" site.Params.posts.index.truncate_description
- ) }}</p>
- {{ else }}
- <p itemprop="articleBody">{{ partial "PrepareText" .Params.summary }}</p>
- {{ end }}
+ <p itemprop="articleBody">{{ partial "GetTruncateContent" ( dict
+ "text" .Params.summary
+ "length" site.Params.posts.index.truncate_description
+ ) }}</p>
{{- end -}}
{{- end -}}
--
GitLab