Merge commit 'b931bbd0c30907b9cc956d3707b26b449bf41f76'

[serve0] / widgets.sh

diff --git a/widgets.sh b/widgets.sh
index 243d3a587e3de9737a6a04a52c6e908f41b14bcb..35058cba7374387a59553164337e3cff7425cc08 100755 (executable)
--- a/widgets.sh
+++ b/widgets.sh
@@ -94,12 +94,13 @@ w_bookmarks(){
     search="$(UNSTRING "${search}" |URL)";
     filter="$(UNSTRING "${filter}" |URL)";
     printf '
-      [label .link . %s]
+      [label .link . %s][a .conjunct href="?o=%s&s=%s&f=%s" . +]
       [a .link target=blank href="/?o=Name&s=%s&f=%s" by Name]
       [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]
     ' "$(HTML "$name" |sed 's;&#44\;;&[wbr];g;')" \
+      "$ORDER" "${SEARCH:+${SEARCH}} $search" "${FILTER:+${FILTER}^}$filter" \
       "$search" "$filter"  "$search" "$filter" \
       "$search" "$filter"  "$search" "$filter"
   done
@@ -115,8 +116,7 @@ w_search(){
         [option value=Date %s Date]
         [option value=Length %s Length]
         [option value=Group %s Group]
-      ]
-      [input name=s placeholder=Search value="%s"]
+     ][input type="search" name=s placeholder=Search value="%s"][button .search type=submit Search]
       [a #t_avsearch href="#advsearch" Advanced]
     ]' "$w_coname" "$w_codate" "$w_colength" "$w_cogroup" \
        "$(HTML "$SEARCH")"
@@ -265,9 +265,9 @@ w_tagging(){
   [ "$w_tags" ] && printf ']]'
 
   cat <<-EOF
-         [fieldset [legend New:][textarea name=newtag\n]
+         [fieldset [legend New:][textarea name=newtag]
          [label [checkbox "makegroup" "true"] Join selected into group]
-         [submit "op" "del" Remove Tags][submit "op" "add" Add Tags]
+         [submit "op" "del" Remove][submit "op" "flip" Flip][submit "op" "add" Add]
        ]]
        EOF
 }