X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=templates%2Ffilterdiag.html.sh;h=ec2dee565f2e20dea390ef8c451925857ea77480;hb=9a04c79ac8c1720047744db2338d08841e41cb42;hp=006c876bee5aa69d3d651de8b4e6987c10119036;hpb=3aace0c1bda8f5f2d5e52024d6643872c5655c6a;p=serve0

diff --git a/templates/filterdiag.html.sh b/templates/filterdiag.html.sh
index 006c876..ec2dee5 100755
--- a/templates/filterdiag.html.sh
+++ b/templates/filterdiag.html.sh
@@ -1,69 +1,96 @@
 #!/bin/zsh    
 
 cat <<FilterEnd
-  <div class="panel" id="search" style="display: block;">
-    <form action="index.cgi" method="get" accept-charset="UTF-8">
-      <input type="text" name="s" value="$search" placeholder="Search">
-      Order by:<select size="1" name="o">
-	<option>Name</option>
-	<option>Date</option>
-	<option>Length</option>
-      </select>
-      <input type="submit" name="submit" value="Find">
-      <a class="panel" href="?">Clear All</a>
-      <a class="panel" href="#" onclick="javascript:hide_block('search');show_block('advfilter');">Advanced</a>
-    <span style="float:right;">
-      <b>Page:</b> <a href="?i=$info&o=$order&p=$([ "$page" != 0 ] && echo $(($page - 1)) || echo 0)&f=$filter&s=$search#$anchor">&lt;&lt;</a>
-      <a href="?i=&o=$order&p=$page&f=$filter&s=$search#$anchor">$(($page + 1))</a>
-      <a href="?i=$info&o=$order&p=$(($page + 1))&f=$filter&s=$search#$anchor">&gt;&gt;</a>
-    </span>
-    </form>
-  </div>
+  <form class="panel" id="search" style="display: block;"
+        action="?" method="get" accept-charset="UTF-8">
+    <input type="text" name="s" value="$search" placeholder="Search">
+
+    <label for="o1" class="order">Order by:</label>
+    <select class="order" size="1" name="o" id="o1">
+      <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 advanced show" href="#" onclick="javascript:hide('search');show_block('advfilter');">Advanced</a>
 
+    <div class="pagination_nav">
+      <label>Page:</label>
+      <a href="?${page_prev}">&lt;&lt;</a>
+      <a href="?${page_this}">$(($page + 1))</a>
+      <a href="?${page_next}">&gt;&gt;</a>
+    </div>
+  </form>
 
-  <div class="panel" id="advfilter" style="display: none;">
+  <form class="panel" id="advfilter" style="display: none;"
+        action="?action=filter" method="post" accept-charset="UTF-8">
     <input disabled type="text" name="s" value="$search" placeholder="Search">
+    <label for="o2" class="order">Order by:</label>
+    <select disabled class="order" size="1" name="o" id="o2">
+      <option>Name</option>
+      <option>Date</option>
+      <option>Length</option>
+    </select>
     <input disabled type="submit" name="submit" value="Find">
-    <a class="panel" href="?">Clear All</a>
-    <a class="panel" href="#" onclick="javascript:hide_block('advfilter');$(for n in {1..9}; do echo "hide_inline('filter$n');"; done)show_block('search')">Hide</a>
+
+    <a class="panel clearsearch" href="?">Clear All</a>
+    <a class="panel advanced hide" href="#" 
+     onclick="javascript:hide('advfilter');$(for n in {1..9}; do echo "hide('filter$n');"; done)show_block('search')"
+    >Hide</a>
     <hr>
-    Up to <b>10</b> filter boxes will appear as you start selecting tags. You can select <b>multiple</b> tags in each box by holding down the <b>Ctrl</b>-key. Click the "<b>Filter!</b>" button when you are ready.
-    <form action="filter.cgi" method="post" accept-charset="UTF-8">
-    $(for n in {0..9}; do
-      hideall="$(sed -rn "s;^([^:]+):.*$;hide_inline('${n}_\\1')\\;;p" <<<"$taglist" |sort -u)hide_inline('${n}_none');"
-      echo "
-      <div id=\"filter$n\" $([ $n -gt 0 ] && echo 'style="display:none;"')><b>and</b><br>
-        <input type=\"radio\" name=\"type$n\" value=\"pos\" checked><b>Any</b><br>
-        <input type=\"radio\" name=\"type$n\" value=\"neg\"><b>None</b><br>
-        of the tags selected here:<br> Category:
-        <select name=\"category\" size=\"1\" onchange=\"${hideall}show_inline('${n}_'+this.options[this.options.selectedIndex].value)\">
-          <option>none</option>
-          $(sed -rn 's;^([^:]+):.*$;<option>\1</option>;p' <<<"$taglist" |sort -u)
-        </select><br>
-        <select name=\"filter\" size=\"12\" multiple id=\"${n}_none\" onchange=\"show_inline('filter$((1+$n))')\">
-           $(sed -rn 's;^([^:]+)$;<option>\1</option>;p' <<<"$taglist")
-        </select>
-        $(sed -rn 's;^([^:]+):.*$;\1;p' <<<"$taglist" |sort -u |while read cat; do echo "
-        <select name=\"cfilter\" size=\"12\" multiple id=\"${n}_$cat\" style=\"display:none;\" onchange=\"show_inline('filter$((1+$n))')\">
-           $(sed -rn "s;^$cat:(.*)$;<option>\\1</option>;p" <<<"$taglist")
-        </select>"
-        done)
-      </div>"
-    done)
-      <div>
-        Order by:<select size="1" name="o">
-          <option>Name</option>
-          <option>Date</option>
-	  <option>Length</option>
-        </select><br>
-        <input type="submit" value="Filter!">
-      </div>
-    </form>
 
-    <br/>
-    <h2>Most recent</h2>
-    $(uniq ${_DATA}/meta/recent |tail -n 10 |sed -r 's:^(.*)$:<a href="\1">\1</a><br/>:g')
-  </div>
+    <p class="help">Up to <strong>10</strong> filter boxes will appear as you start selecting tags. You can select <strong>multiple</strong> tags in each box by holding down the <strong>Ctrl</strong>-key. Click the "<strong>Filter!</strong>" button when you are ready.</p>
+
+  $(for n in {0..9}; do
+    hideall="$(echo "$taglist" |sed -rn "s;^([^:]+):.*$;hide('${n}_\\1')\\;;p" |sort -u)hide('${n}_none');"
+    echo "
+    <p class="filter" id=\"filter$n\" $([ $n -gt 0 ] && echo 'style="display:none;"')>
+      <span class=\"help conjunction\">and</span>
+      <label class=\"conjunction\"><input type=\"radio\" name=\"type$n\" value=\"pos\" checked>Any</label>
+      <label class=\"conjunction\"><input type=\"radio\" name=\"type$n\" value=\"neg\">None</label>
+      <span class=\"help\">of the tags selected here:</span>
+      <label for=\"category$n\" class=\"category\">Category:</label>
+      <select class=\"input category\" name=\"category$n\" size=\"1\" id=\"category$n\"
+              onchange=\"${hideall}show_block('${n}_'+this.options[this.options.selectedIndex].value)\">
+        <option>none</option>
+        $(echo "$taglist" |sed -rn 's;^([^:]+):.*$;<option>\1</option>;p' |sort -u)
+      </select>
+      <select class=\"input tagfilter\" name=\"cfilter${n}_\" size=\"12\" multiple id=\"${n}_none\"
+              onchange=\"show_iblock('filter$((1+$n))')\">
+         $(echo "$taglist" |sed -rn 's;^([^:]+)$;<option>\1</option>;p')
+      </select>
+      $(echo "$taglist" |sed -rn 's;^([^:]+):.*$;\1;p' |sort -u |while read cat; do echo "
+      <select class=\"input tagfilter\" name=\"cfilter${n}_\" size=\"12\" multiple id=\"${n}_$cat\" style=\"display:none;\"
+              onchange=\"show_iblock('filter$((1+$n))')\">
+         $(echo "$taglist" |sed -rn 's;^'"$cat"':(.*)$;<option>\1</option>;p')
+      </select>"
+      done)
+    </p>"
+  done)
+
+    <p class="filter final">
+      <label for="o3" class="order">Order by:</label>
+      <select class="edit order" size="1" name="o" id="o3">
+        <option>Name</option>
+        <option>Date</option>
+        <option>Length</option>
+      </select>
+      <input type="submit" value="Filter!">
+    </p>
+
+    <p class="quicklinks">
+      <label class="quicklinks">Most recent</label>
+      $(output=''
+        tac ${_DATA}/meta/recent |while [ "$(echo "$output" |wc -l)" -lt 10 ] && read line; do
+          line="<a href="$line">$line</a>"
+          echo "$output" |grep -qF "$line" || output="$output$line\n"
+        done
+        echo $output
+      )
+    </p>
+  </form>
 FilterEnd
 
 # vi:set filetype=html: