include charset in html headers

[shellwiki] / themes / default.sh

diff --git a/themes/default.sh b/themes/default.sh
index 5b2f1edd55a261ec566e37820c122af0d8a08313..d13e849f72ece086e4fb9a456f2fbe2419ea5f3d 100755 (executable)
--- a/themes/default.sh
+++ b/themes/default.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2022 - 2023 Paul Hänsch
+# Copyright 2022 - 2024 Paul Hänsch
 # 
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -19,6 +19,7 @@
 theme_head(){
   local IFS="$BR"
   printf '
+  <meta charset="utf-8">
   <meta name="viewport" content="width=device-width">
   '
   for css in "$_BASE/%5B.%5D/cgilite/common.css" "$_BASE/%5B.%5D/themes/default.css" $PAGE_CSS; do
@@ -136,17 +137,23 @@ theme_revisions(){ theme_page "$@"; }
 
 theme_search(){
   local words="$*"
-  # STDIN: read result pages line by line
+  # STDIN: [STRING page][TAB][STRING teaser]
 
   theme_page - "$(_ Search results): ${words}" <<-EOF
        <article>
          <h1>$([ "$words" ] && _ "Search results" || _ "Search" )</h1>
          <form class="search" method="GET">
-           <input type="search" name="q" value="$(HTML $words)"><button class="search" type="submit">$(_ Search)</button>
+           <input type="search" name="q" value="$(GET q |HTML)"><button class="search" type="submit">$(_ Search)</button>
          </form>
          <ol class="searchresults">
-           $( while read p; do
-             printf '<li><a href="%s">%s</a></li>' "$(URL "$p")" "$(HTML "$p")"
+           $(while read -r p t; do
+             path="$(UNSTRING "$p")" pfrag="${path%/}" title=''
+              while [ "$pfrag" ]; do
+                title="$(page_title "$pfrag")/$title"
+                pfrag="${pfrag%/*}"
+              done
+             printf '<li><a href="%s">%s</a><p>%s</p></li>' \
+                "$(URL "$path")" "$(HTML "/$title")" "$(UNSTRING "$t" |HTML)"
            done)
          </ol>
        </article>