include charset in html headers

[shellwiki] / themes / default.sh

diff --git a/themes/default.sh b/themes/default.sh
index eb3d537442c41f90e4202ad47029e186fb6f38da..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
@@ -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>
@@ -108,17 +108,21 @@ theme_editor(){
        $(for file in "$_EXEC/pages/${page%/:$LANGUAGE/}/#attachments"/* "$_DATA/pages/${page%/:$LANGUAGE/}/#attachments"/*; do
          [ "$file" = "$_EXEC/pages/${page%/:$LANGUAGE/}/#attachments/${file##*/}" \
                -a -f "$_DATA/pages/${page%/:$LANGUAGE/}/#attachments/${file##*/}" ] && continue
+         att="$(HTML "${file##*/}")"
+          url="$(printf %s\\n "${file##*/}" |sed 's;[\\<>];\\&;g' |HTML)"
+         name="$(printf %s\\n "${file##*/}" |sed 's;[]\\[];\\&;g' |HTML)"
          case ${file##*/} in
            \*) continue;;
            *.[pP][nN][gG]|*.[jJ][pP][gG]|*.[jJ][pP][eE][gG]|*.[gG][iI][fF])
              [ "$page" != "${page%/:$LANGUAGE/}" ] && p=../ || p=''
-             att="$(HTML "${file##*/}")"
-             printf '<p class=aimg><img src="%s%s">![](%s)</p><ul class=aimg><li>[%s]([attachment]/%s)</li><li>[![%s](%s)]([attachment]/%s)</li></ul>' \
-                    "$p" "$att" "$att" "$att" "$att" "$att" "$att" "$att"
+             printf '<p class=aimg><img src="%s%s">![](&lt;%s&gt;)</p><ul class=aimg>
+                       <li>[%s](&lt;[attachment]/%s&gt;)</li>
+                       <li>[![%s](&lt;%s&gt;)](&lt;[attachment]/%s&gt;)</li>
+                     </ul>' \
+                    "$p" "$att" "$url" "$name" "$url" "$name" "$url" "$url"
              ;;
            *)
-             att="$(HTML "${file##*/}")"
-             printf '<p class="adoc">[%s](%s)</p>' "$att" "$att"
+             printf '<p class="adoc">[%s](&lt;%s&gt;)</p>' "$name" "$url"
              ;;
          esac
        done)
@@ -133,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>
@@ -151,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">
@@ -200,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##*/}" \