Merge branch 'master' of git.plutz.net:serve0

[serve0] / widgets.sh

diff --git a/widgets.sh b/widgets.sh
index cd9dda30ca344037e5db60751e9c8a990eec9bfe..4b36b3534e8629c992c46a9309814131c37b1843 100644 (file)
--- a/widgets.sh
+++ b/widgets.sh
@@ -188,7 +188,7 @@ w_advsearch(){
             $n "${t:+checked}" $n $n
 
     f="|${f#\~}|"
-    printf '*\n%s\n' "$w_tagcategories" \
+    printf '*\n%s\n$\n' "$w_tagcategories" \
     | while read -r category; do
       lbid="cat_${n}_${category}"
 
@@ -217,6 +217,8 @@ w_advsearch(){
         # printf '[option %s value="%s"\n%s]' "$t" "$tag" "$d"
        printf '[label [checkbox "tag_%s" "%s" %s] %s]' "$n" "$tag" "$t" "$d"
       done
+      d="${f##*\$:}" d="${d%%\|*}"
+      [ "$category" = \$ ] && printf '[input name="tag_%i" value="%s"]' "$n" "$(HTML "$d")"
       printf '\n]'
     done
     printf ']'