make search fields type=search

[shellwiki] / themes / default.sh

diff --git a/themes/default.sh b/themes/default.sh
index 85febeef60e7274563a2e62c0d59698e7088bb12..5979f207895e2f9586abd29947902f160a93d0b9 100755 (executable)
--- a/themes/default.sh
+++ b/themes/default.sh
@@ -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)
@@ -131,6 +135,25 @@ theme_editor(){
 
 theme_revisions(){ theme_page "$@"; }
 
+theme_search(){
+  local words="$*"
+  # STDIN: read result pages line by line
+
+  theme_page - <<-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>
+         </form>
+         <ol class="searchresults">
+           $( while read p; do
+             printf '<li><a href="%s">%s</a></li>' "$(URL "$p")" "$(HTML "$p")"
+           done)
+         </ol>
+       </article>
+       EOF
+}
+
 theme_attachments(){
   local page="$1" title
   title="${page%/}"; title="${title##*/}"