include shortcuts to bookmarks into filter list

[serve0] / widgets.sh

diff --git a/widgets.sh b/widgets.sh
index 243d3a587e3de9737a6a04a52c6e908f41b14bcb..3de96f6c299351b9889439f5aacf54013a7c089e 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")"
@@ -158,6 +158,7 @@ w_index(){
 
 w_advsearch(){
   local n lbid tag category filter f t d
+  local bm="$_DATA/.index/bookmarks" name='' search=''
   filter="$(HTML "${FILTER}^")"
 
   printf '[form #advsearch action=./?a=advsearch method=POST
@@ -216,6 +217,18 @@ w_advsearch(){
     printf ']'
   done
 
+  printf '[fieldset and Bookmark:'
+  sort "$bm" |while read -r name search filter; do
+    search="${search#search=}" filter="${filter#filter=}" filter="${filter%${CR}}"
+    [ "$search" = "${w_str_s}" -a "$filter" = "${w_str_f}" ] && continue
+
+    name="$(UNSTRING "$name")";
+    search="$(UNSTRING "${search}" |URL)";
+    filter="$(UNSTRING "${filter}" |URL)";
+    printf '[label [checkbox "bookmark" "%s"] %s]' "$filter${search:+^\$:}${search}" "$name"
+  done
+  printf ']'
+
   printf \
    '[fieldset .submit [select name=order
       [option disabled=disabled Order By]
@@ -265,9 +278,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
 }