style rewrite

[serve0] / widgets.sh

diff --git a/widgets.sh b/widgets.sh
index fc6818e206748cb2c933e409e35afc52b0c14bbe..cd9dda30ca344037e5db60751e9c8a990eec9bfe 100644 (file)
--- a/widgets.sh
+++ b/widgets.sh
@@ -98,7 +98,7 @@ w_bookmarks(){
             [a .link target=blank href="/?o=Date&s=%s&f=%s" by Date]
             [a .link target=blank href="/?o=Length&s=%s&f=%s" by Length]
             [a .link target=blank href="/?o=Group&s=%s&f=%s" by Group]
-            [br]' \
+            ' \
             "$(HTML "$name" |sed 's;&#44\;;&[wbr];g;')" \
             "$search" "$filter" \
             "$search" "$filter" \
@@ -119,6 +119,7 @@ w_search(){
       [option value=Group %s Group]
     ]
     [input name=s placeholder=Search value="%s"]
+    [a #t_avsearch href="#advsearch" Advanced]
   ]
   ' \
   "$w_coname" "$w_codate" "$w_colength" "$w_cogroup" \
@@ -167,8 +168,8 @@ w_advsearch(){
   filter="$(HTML "${FILTER}^")"
 
   printf '[form #advsearch action=./?a=advsearch method=POST
-            [a href="#" Hide]
-            [p .help Select multiple tags from each category by holding down the [strong Ctrl] key on your keyboard.[br]
+            [a href="#" X]
+            [p .help Select multiple tags from each category by holding down the [strong Ctrl] key on your keyboard.
             Refine the search further by setting additional search tags using the [strong "+and"] button.]'
 
   for n in 1 2 3 4 5 6 7 8 9 10; do
@@ -196,9 +197,12 @@ w_advsearch(){
       [ "$category" != '*' -a ! "${f%%|${category}:*}" ] && t=checked
       [ "$category" != '*' -a ! "${f%%|-${category}:*}" ] && t=checked
 
+      # printf '[radio "cat_%i" "%s" .cat %s id="%s"][label for="%s" %s]
+      #         [select name=tag_%s size=10 multiple' \
+      #         $n "$category" "$t" "$lbid" "$lbid" "$category" $n
       printf '[radio "cat_%i" "%s" .cat %s id="%s"][label for="%s" %s]
-              [select name=tag_%s size=10 multiple' \
-              $n "$category" "$t" "$lbid" "$lbid" "$category" $n
+              [div .catselect\n' \
+              $n "$category" "$t" "$lbid" "$lbid" "$category"
 
       printf '%s\n' "$w_tags" \
       | { [ "$category" = '*' ] && grep -avF ':' || grep -awF "${category}"; } \
@@ -210,7 +214,8 @@ w_advsearch(){
         [ "$tag" ] || continue
         t=''; [ ! "${f%%*|${tag}|*}" ] && t=checked
         d="${tag#-}"; d="${d#*:}"
-        printf '[option %s value="%s"\n%s]' "$t" "$tag" "$d"
+        # printf '[option %s value="%s"\n%s]' "$t" "$tag" "$d"
+       printf '[label [checkbox "tag_%s" "%s" %s] %s]' "$n" "$tag" "$t" "$d"
       done
       printf '\n]'
     done
@@ -232,7 +237,7 @@ w_advsearch(){
 w_delete(){
   printf '[a href="#multitag" Add Tags / Remove Tags]
           [div #multitag [input type="hidden" name="ref" value="%s"]
-          [a href="#" Hide][br]
+          [a href="#" X]
           [fieldset [legend New:]
           [submit "op" "filedelete" Delete Files]
           ]]' "$w_refuri"
@@ -242,12 +247,13 @@ w_tagging(){
   local tag category d
   printf '[a href="#multitag" Add Tags / Remove Tags]
           [div #multitag [input type="hidden" name="ref" value="%s"]' "$w_refuri"
-  printf '[a href="#" Hide][br]'
+  printf '[a href="#" X]'
 
   printf 'Tags\n%s\n' "$w_tagcategories" \
   | while read -r category; do
     [ "$category" ] || continue
-    printf '[fieldset [legend %s:][select name=tag size=4 multiple\n' "$category"
+    # printf '[fieldset [legend %s:][select name=tag size=4 multiple\n' "$category"
+    printf '[fieldset [legend %s:][div .tagselect\n' "$category"
     printf %s "$w_tags" \
     | { [ "$category" = 'Tags' ] && grep -avF ':' || grep -awF "${category}"; } \
     | { for n in 1 2 3 4 5 6 7 8 9 0; do
@@ -257,7 +263,8 @@ w_tagging(){
     } | while read -r tag; do
       [ "$tag" ] || continue
       d="${tag#-}"; d="${d#*:}"
-      printf '[option value="%s"\n%s]' "$tag" "$d"
+      # printf '[option value="%s"\n%s]' "$tag" "$d"
+      printf '[label [checkbox "tag" "%s"] %s]\n' "$tag" "$d"
     done
     printf ']]'
   done