From f4348298b5264a37d9d67cb5e44fafa4abf021f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Weber?= <mail@soeren-weber.de>
Date: Tue, 15 Oct 2024 15:43:00 +0200
Subject: [PATCH] search: search page not generated with renderer.unsafe=false
 #929

---
 content/_relearn/searchpage/_content.gotmpl     |  3 ++-
 .../views/article.html}                         | 17 ++++++++++++-----
 layouts/partials/version.txt                    |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)
 rename layouts/{shortcodes/_relearn_searchform.html => _relearn_searchform/views/article.html} (64%)

diff --git a/content/_relearn/searchpage/_content.gotmpl b/content/_relearn/searchpage/_content.gotmpl
index 7314b8a169..9108b5af73 100644
--- a/content/_relearn/searchpage/_content.gotmpl
+++ b/content/_relearn/searchpage/_content.gotmpl
@@ -3,7 +3,7 @@
 	{{- $url := trim (or .Site.Params.searchPageURL "search") "/"  }}
 	{{- $content := dict
 		"mediaType" "text/markdown"
-		"value" "{{% _relearn_searchform %}}"
+		"value" ""
 	}}
 	{{- $page := dict
 		"content" $content
@@ -11,6 +11,7 @@
 		"outputs" (slice "html")
 		"path" "_relearn_searchpage"
 		"title" (T "Search")
+		"type" "_relearn_searchform"
 		"url" $url
 	}}
 	{{- .AddPage $page }}
diff --git a/layouts/shortcodes/_relearn_searchform.html b/layouts/_relearn_searchform/views/article.html
similarity index 64%
rename from layouts/shortcodes/_relearn_searchform.html
rename to layouts/_relearn_searchform/views/article.html
index d1d7f08c8a..f37e040cdb 100644
--- a/layouts/shortcodes/_relearn_searchform.html
+++ b/layouts/_relearn_searchform/views/article.html
@@ -1,14 +1,17 @@
-{{/*
-This is an internal shortcode used for the dedicated search page;
-it is undocumented and not meant to be used in your content files!
-*/ -}}
+
+<article class="default">
+  <header class="headline">
+    {{- partial "content-header.html" . }}
+  </header>
+{{ partial "heading-pre.html" . }}{{ partial "heading.html" . }}{{ partial "heading-post.html" . }}
+
 <search>
   <form action="javascript:triggerSearch()">
     <div class="searchform">
       <label class="a11y-only" for="R-search-by-detail">{{ T "Search" }}</label>
       <input data-search-input id="R-search-by-detail" class="search-by" name="search-by" type="search" placeholder="{{ T "Search-placeholder" }}">
       {{- partial "shortcodes/button.html" (dict
-        "page" .Page
+        "page" .
         "type" "submit"
         "style" "secondary"
         "icon" "search"
@@ -22,3 +25,7 @@ it is undocumented and not meant to be used in your content files!
 <hr>
 <div id="R-searchresults">
 </div>
+  <footer class="footline">
+    {{- partial "content-footer.html" . }}
+  </footer>
+</article>
\ No newline at end of file
diff --git a/layouts/partials/version.txt b/layouts/partials/version.txt
index 980b02394d..82c3e52dfa 100644
--- a/layouts/partials/version.txt
+++ b/layouts/partials/version.txt
@@ -1 +1 @@
-7.0.0+007cc20686f04ca1f911975f20f097175dd72a7f
\ No newline at end of file
+7.0.0+68d562d0dbc7583b0ea01cec5f4e14be44c997df
\ No newline at end of file