separate quicklinks page

svn path=/trunk/; revision=118

diff --git a/pages/list.sh b/pages/list.sh
index fc4ff66ceab3d8508be5deabc876b4661f4773f2..2c4b1f18ee2dd6ecbf58aefd41b0496d2f3328cb 100755 (executable)
--- a/pages/list.sh
+++ b/pages/list.sh
@@ -39,19 +39,6 @@ else
   TITLE="List by $order"
 fi
 
-quicklinks(){
-  output=''
-  tac ${_DATA}/meta/recent \
-  | while [ "$(printf %s "$output" |wc -l)" -lt 30 ] && read line; do
-    printf %s "$output" |grep -qF "$line" || output="$output$line$LF"
-  done 
-  printf %s "$output" |while read line; do
-    linef=$(printf %s "$line" |sed -r 's;^.*(\?|&)f=([^&]+)&?.*$;\2;g')
-    lineo=$(printf %s "$line" |sed -r 's;^.*(\?|&)o=([^&]+)&?.*$;\2;g')
-    printf '<input type="checkbox"><a href="%s">by %s: %s</a>' "$line" "${lineo}" "$(present_filter "$linef")"
-  done
-}
-
 category_selected(){
   cat="${1}:"
   filter="$2"

diff --git a/pages/quicklinks.sh b/pages/quicklinks.sh
new file mode 100755 (executable)
index 0000000..2172919
--- /dev/null
+++ b/pages/quicklinks.sh
@@ -0,0 +1,58 @@
+#!/bin/zsh
+
+# Copyright 2014 - 2016 Paul Hänsch
+#
+# This file is part of Serve0.
+# 
+# Serve0 is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# Serve0 is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with Serve0.  If not, see <http://www.gnu.org/licenses/>. 
+
+. $_EXEC/pages/common.sh
+
+LF='
+'
+filters="${_GET[f]}"
+debug "FILTERS: $filters"
+
+present_filter(){
+  printf %s\\n "$*" \
+  | sed -r 's;(^|!|\^|\|)([^!\^\|:]+:);\1;g;s;\^;\n;g' \
+  | sort -r \
+  | sed -r '$q;s;$; \&amp\; ;g'
+}
+
+quicklinks(){
+  output=''
+  tac ${_DATA}/meta/recent \
+  | while [ "$(printf %s "$output" |wc -l)" -lt 30 ] && read line; do
+    printf %s "$output" |grep -qF "$line" || output="$output$line$LF"
+  done 
+  printf %s "$output" |while read line; do
+    linef=$(printf %s "$line" |sed -r 's;^.*(\?|&)f=([^&]+)&?.*$;\2;g')
+    lineo=$(printf %s "$line" |sed -r 's;^.*(\?|&)o=([^&]+)&?.*$;\2;g')
+    printf '<input type="checkbox"><a target="blank" href="%s">by %s: %s</a>' \
+           "$line" "${lineo}" "$(present_filter "$linef")"
+  done
+}
+
+category_selected(){
+  cat="${1}:"
+  filter="$2"
+  [ "$cat" = "none:" ] && cat=''
+
+  printf %s "$taglist" \
+  | sed -r 's;^('"$filter"')$;1 &;;t;s;^;0 ;' \
+  | sed -rn 's;^(0|1) '"$cat"'([^:]+)$;\1 \2;p' \
+  | sed 's;^0 ;<option>;;s;^1 ;<option selected>;;s;$;</option>;'
+}
+

diff --git a/static/common.css b/static/common.css
index 96f15beaa3c4bb12b53f81e65b34128e89851a7d..370be05e269a984de7c65422b5cbcfa61c7e776f 100644 (file)
--- a/static/common.css
+++ b/static/common.css
@@ -248,19 +248,18 @@ div.panel {
 }
 
 #advfilter .quicklinks {width: 100%;}
-#advfilter .quicklinks :first-child {width: 100%;}
-#advfilter .quicklinks input { display: none; }
-#advfilter .quicklinks a {
-  display: none;
+
+.quicklinks :first-child {width: 100%;}
+.quicklinks input { display: block; }
+.quicklinks a {
+  display: block;
   word-wrap: break-word;
   margin-left: 10%;
   margin-bottom: .75em;
   margin-top: -1.5em;
 }
-#advfilter .quicklinks:hover input,
-#advfilter .quicklinks:hover a {display: block;}
-#advfilter .quicklinks input:checked,
-#advfilter .quicklinks input:checked + a { display: none;}
+.quicklinks input:checked,
+.quicklinks input:checked + a { display: none;}
 
 /* == Thumblist == */
 

diff --git a/templates/advfilter.html.sh b/templates/advfilter.html.sh
index 7fac882896e85461f1c127d2ebfcebfe7096bb3e..c4f14ccadf6739aafa2f03804667394b03042297 100755 (executable)
--- a/templates/advfilter.html.sh
+++ b/templates/advfilter.html.sh
@@ -75,10 +75,7 @@ cat <<EOF
       <input type="submit" value="Filter!">
     </p>
 
-    <p class="quicklinks">
-      <label class="quicklinks">Most recent</label>
-      $(quicklinks)
-    </p>
+    <a class="quicklinks" href="?p=quicklinks">Most recent</a>
   </form>
 EOF
 

diff --git a/templates/quicklinks.html.sh b/templates/quicklinks.html.sh
new file mode 100755 (executable)
index 0000000..345049b
--- /dev/null
+++ b/templates/quicklinks.html.sh
@@ -0,0 +1,51 @@
+# Copyright 2014 - 2016 Paul Hänsch
+#
+# This file is part of Serve0
+# 
+# Serve0 is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# Serve0 is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with Serve0  If not, see <http://www.gnu.org/licenses/>. 
+
+cat <<EOF
+  <form class="panel" id="search" action="?" method="get" accept-charset="UTF-8">
+    <input type="text" name="s" value="$search" placeholder="Search">
+
+    <select class="order" size="1" name="o" id="o1">
+      <option class="label" selected disabled>Order by</option>
+      <option>Name</option>
+      <option>Date</option>
+      <option>Length</option>
+    </select>
+    <!-- input type="submit" name="submit" value="Find" -->
+
+    <a class="panel clearsearch" href="?">Clear All</a>
+    <a class="panel toggle" href="#advfilter">Advanced</a>
+    <a class="panel toggle" href="#playctl">Player</a>
+  </form>
+
+  $(. $_EXEC/templates/playpanel.html.sh)
+
+  <p class="quicklinks">
+    <label class="quicklinks">Most recent</label>
+    $(quicklinks)
+  </p>
+
+  <div class="panel" id="foot">
+    <a class="panel toggle" href="#preferences">Preferences</a>
+    <a class="panel treeview" href="?p=tree">Browse Folders</a>
+  </div>
+
+  $(. $_EXEC/templates/preferences.html.sh)
+  $(. $_EXEC/templates/advfilter.html.sh)
+EOF
+
+# vi:set filetype=html: