X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=templates%2Fadvfilter.html.sh;h=3f8c6207bde7e153719e3a7a7bd5e8716bfd2abd;hb=c59fd5a4946c4d13fc1692e4561878a9bb2b3e17;hp=ce7d6ce365e4977b431f173cd53fb36ac7b94e80;hpb=d0b44dc7ebbb28086c66506cbf40b8df32163796;p=serve0

diff --git a/templates/advfilter.html.sh b/templates/advfilter.html.sh
index ce7d6ce..3f8c620 100755
--- a/templates/advfilter.html.sh
+++ b/templates/advfilter.html.sh
@@ -1,4 +1,4 @@
-# Copyright 2014,2015 Paul Hänsch
+# Copyright 2014 - 2016 Paul Hänsch
 #
 # This file is part of Serve0
 # 
@@ -18,13 +18,13 @@
 category_tabs(){
   for cat in "$@"; do
   cat <<EOF
-    <div class="tab">
-    <input class="tabhandle" type="radio" name="category$n" id="cat${n}_$cat" value="$cat" $([ "$cat" = "$fcat" ] && echo checked)>
+  <div class="tab">
+    <input class="tabhandle" type="radio" name="category$n" id="cat${n}_$cat" value="$cat" $([ "$cat" = "$fcat" ] && printf checked)>
     <label class="category tabhandle" for="cat${n}_$cat">$([ "$cat" = none ] && printf %s general || printf %s "$cat")</label>
     <select class="category tabcontent" class="input tagfilter" name="cfilter${n}_" size="12" multiple>
       $(category_selected "$cat" "$filter")
     </select>
-    </div>
+  </div>
 EOF
   done
 }
@@ -40,9 +40,9 @@ filterbox(){
     debug "fneg: $fneg	fcat: $fcat	filter: $filter"
     
     cat <<-EOF
-	<input class="tabhandle" type="checkbox" id="filter$n" $([ $n = 0 -o -n "$filter" ] && echo checked) >
+	<input class="tabhandle" type="checkbox" id="filter$n" $([ $n = 0 -o -n "$filter" ] && printf checked) >
 	<label class="tabhandle filter" for="filter$n">+ and</label>
-	<div class="tabcontent filter">
+	<fieldset class="tabcontent filter">
 	  <input type="radio" name="type$n" value="pos" id="pos$n" ${fneg:-checked} ><label for="pos$n" class="conjunction">Any</label>
 	  <input type="radio" name="type$n" value="neg" id="neg$n" ${fneg:+checked} ><label for="neg$n" class="conjunction">None</label>
 	  <span class="help">of the items selected here:</span>
@@ -51,44 +51,30 @@ filterbox(){
 	  <div class="category tabcontainer">
 	    $(category_tabs $(list_categories) )
 	  </div>
-	</div>
+	</fieldset>
 	EOF
   done
 }
 
 cat <<EOF
-  <form class="panel" id="advfilter"
+  <form class="panel switchable top" id="advfilter"
         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 clearsearch" href="?">Clear All</a>
-    <a class="panel advanced hide" href="#">Hide</a>
-    <hr>
+    <a class="panel toggle" href="#">Hide</a>
+    <a class="panel" href="?p=quicklinks">Most recent</a>
 
     <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>
     $(filterbox {0..9})
 
-    <p class="filter final">
+    <fieldset class="filter final">
       <label for="o3" class="order">Order by:</label>
       <select class="edit order" size="1" name="o" id="o3">
-        <option $([ "${_GET[o]}" = Name ] && echo selected) >Name</option>
-        <option $([ "${_GET[o]}" = Date ] && echo selected) >Date</option>
-        <option $([ "${_GET[o]}" = Length ] && echo selected) >Length</option>
+        <option $([ "${_GET[o]}" = Name ] && printf selected) >Name</option>
+        <option $([ "${_GET[o]}" = Date ] && printf selected) >Date</option>
+        <option $([ "${_GET[o]}" = Length ] && printf selected) >Length</option>
       </select>
       <input type="submit" value="Filter!">
-    </p>
-
-    <p class="quicklinks">
-      <label class="quicklinks">Most recent</label>
-      $(quicklinks)
-    </p>
+    </fieldset>
   </form>
 EOF