conjunction links in bookmarks

diff --git a/style.css b/style.css
index 17b88e4c5500399e16f9d88b2a70145c79eac357..79ddfe81e46ca885862212b56571779851331291 100644 (file)
--- a/style.css
+++ b/style.css
@@ -140,13 +140,23 @@ body {
 }
 
 #bookmarks label {
-  display: block;
+  display: inline;
   font-weight: bold;
   font-size: 1.125em;
   margin-left: 0;
   margin-top: .75em;
   word-break: break-word;
 }
+#bookmarks label:before,
+#bookmarks a.conjunct:after {
+  content: '\0a';
+  white-space: pre;
+}
+#bookmarks label:before {
+  line-height: 2.5em;
+  vertical-align: top;
+}
+
 
 /* ====== ADVSEARCH / FILTER PANEL ====== */
 

diff --git a/widgets.sh b/widgets.sh
index 3efb79bb63a77acc3fb936a1d03b2734dfa15dcc..081d20eba8db03c0f8aa7b3a00497116beeddf05 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