X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=themes%2Fdefault.sh;h=d13e849f72ece086e4fb9a456f2fbe2419ea5f3d;hb=ef53fdd21126a5b7d3df98a7cf7ea06deb36a255;hp=23b03f25552b86ba2e6e3fc03a2c46d322e4cbba;hpb=532b6743da019906f2f00575d246823c66ec35fd;p=shellwiki

diff --git a/themes/default.sh b/themes/default.sh
index 23b03f2..d13e849 100755
--- 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
@@ -83,12 +84,11 @@ theme_page(){
 }
 
 theme_editor(){
-  local page="$1" template="$2" title file att
-  title="$(HTML "${PAGE_TITLE:-"${page}"}")"
+  local page="$1" template="$2" file att
 
   [ "$template" ] && acl_read "$template" || template="$page"
 
-  theme_page - "Editor: $title" <<-EOF
+  theme_page - "$(_ Editor): ${PAGE_TITLE:-"${page}"}" <<-EOF
 	<input checked type=radio class=tab name=edithelp value=edtr id=editor><label for=editor>$(_ Editor)</label>
 	<input         type=radio class=tab name=edithelp value=help id=syntax><label for=syntax>$(_ Syntax)</label>
 	<input         type=radio class=tab name=edithelp value=att  id=attach><label for=attach>$(_ Attachments)</label>
@@ -137,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 - <<-EOF
+  theme_page - "$(_ Search results): ${words}" <<-EOF
 	<article>
 	  <h1>$([ "$words" ] && _ "Search results" || _ "Search" )</h1>
 	  <form class="search" method="GET">
-	    <input class="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>
@@ -155,11 +161,10 @@ theme_search(){
 }
 
 theme_attachments(){
-  local page="$1" title
-  title="${page%/}"; title="${title##*/}"
+  local page="$1"
 
   if acl_write "$page"; then
-    theme_page - "$(_ Attachments): $title" <<-EOF
+    theme_page - "$(_ Attachments): ${PAGE_TITLE:-"${page}"}" <<-EOF
 	<form class=upload method=POST enctype="multipart/form-data">
 	  <h2>$(_ Upload)</h2>
 	  <input type=hidden name=session_id value="$SESSION_ID">
@@ -204,7 +209,7 @@ theme_attachments(){
 	</form>
 	EOF
   else
-    theme_page - "$(_ Attachments): $title" <<-EOF
+    theme_page - "$(_ Attachments): ${PAGE_TITLE:-"${page}"}" <<-EOF
 	<ul class="attachment list">
 	$(for file in "$_EXEC/pages/$page/#attachments"/* "$_DATA/pages/$page/#attachments"/*; do
 	  [ "$file" = "$_EXEC/pages/$page/#attachments/${file##*/}" \