From 89715c7937fcd77e712b7c62fec14c6a74396dfe Mon Sep 17 00:00:00 2001
From: Dominika Liberda <dominika@sakamoto.pl>
Date: Tue, 2 Mar 2021 17:45:29 +0100
Subject: [PATCH] * fixes search template

---
 templates/header.shs                    | 4 +++-
 templates/themes/default/elements/top.t | 2 +-
 templates/themes/default/search.t       | 3 ---
 webroot/search.shs                      | 3 ---
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/templates/header.shs b/templates/header.shs
index aad04b3..fbd764c 100644
--- a/templates/header.shs
+++ b/templates/header.shs
@@ -11,4 +11,6 @@ else
 	echo "Logged in as ${cookies[username]} | <a href='/logout.shs'>Log out</a> | <a href='/feed.shs'>Your feed</a> | <a href='/fav.shs'>Your favourites</a>"
 fi
 
-render _ "${cfg[namespace]}/templates/themes/${cfg[template]}/elements/top.t"
+strings[query_nice]="$query_nice"
+
+render strings "${cfg[namespace]}/templates/themes/${cfg[template]}/elements/top.t"
diff --git a/templates/themes/default/elements/top.t b/templates/themes/default/elements/top.t
index c361eae..822c4f7 100644
--- a/templates/themes/default/elements/top.t
+++ b/templates/themes/default/elements/top.t
@@ -1,4 +1,4 @@
 <form action='/search.shs'>
-	<input name='q' type='text'>
+	<input name='q' type='text' value='{{.query_nice}}'>
 	<input type='submit' value='Search'>
 </form>
diff --git a/templates/themes/default/search.t b/templates/themes/default/search.t
index 2b014ad..ac48342 100644
--- a/templates/themes/default/search.t
+++ b/templates/themes/default/search.t
@@ -1,4 +1 @@
-{{.search}}
-<input type='submit' value='Search'>
-</form><br>
 {{.results}}
diff --git a/webroot/search.shs b/webroot/search.shs
index 73e9ba6..098d06e 100755
--- a/webroot/search.shs
+++ b/webroot/search.shs
@@ -10,9 +10,6 @@ fi
 if [[ "${get_data[q]}" ]]; then
 	query="${get_data[q]}"
 	query_nice=$(sed -s 's/+/ /g' <<< "${get_data[q]}")
-	strings[search]="<form action='/search.shs'><input name='q' type='text' value='$(html_encode "$query_nice")'>"
-else
-	strings[search]="<form action='/search.shs'><input name='q' type='text'>"
 fi
 
 if [[ "${get_data[q]}" ]]; then