theme: make migration easier #891

content.html is meant to be overloaded by the user and it should just work so every logic needs to be put somewhere else
McShelby · Oct 11, 2024 · 4adf990 · 4adf990
1 parent 8692fc4
commit 4adf990
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/layouts/_default/views/article.html b/layouts/_default/views/article.html
@@ -5,7 +5,7 @@
             </header>
 {{ partial "heading-pre.html" . }}{{ partial "heading.html" . }}{{ partial "heading-post.html" . }}
 
-{{ partial "content.html" . | safeHTML }}
+{{ partial "article-content.html" . }}
             <footer class="footline">
               {{- partial "content-footer.html" . }}
             </footer>

diff --git a/layouts/chapter/views/article.html b/layouts/chapter/views/article.html
@@ -6,7 +6,7 @@
 {{ partial "heading-pre.html" . }}<div class="article-subheading">{{ T "Chapter" .Params.Weight }}</div>
 {{ partial "heading.html" . }}{{ partial "heading-post.html" . }}
 
-{{ partial "content.html" . | safeHTML }}
+{{ partial "article-content.html" . }}
             <footer class="footline">
               {{- partial "content-footer.html" . }}
             </footer>

diff --git a/layouts/home/views/article.html b/layouts/home/views/article.html
@@ -5,7 +5,7 @@
             </header>
 {{ partial "heading-pre.html" . }}{{ partial "heading.html" . }}{{ partial "heading-post.html" . }}
 
-{{ partial "content.html" . | safeHTML }}
+{{ partial "article-content.html" . }}
             <footer class="footline">
               {{- partial "content-footer.html" . }}
             </footer>

diff --git a/layouts/partials/article-content.html b/layouts/partials/article-content.html
@@ -0,0 +1,4 @@
+{{/* the following check avoids to print out content of headless bundles if called from nestedContent.gotmpl */}}
+{{- if .RelPermalink }}
+{{- partial "content.html" . | safeHTML }}
+{{- end }}
diff --git a/layouts/partials/content.html b/layouts/partials/content.html
@@ -1,4 +1 @@
-{{- /* the following check avoids to print out content of headless bundles if called from nested-content.html */}}
-{{- if partial "permalink.gotmpl" (dict "to" .) }}
-	{{- .Content }}
-{{- end }}
+{{ .Content }}