merged filter and list page

[serve0] / templates / list.html.sh

diff --git a/templates/list.html.sh b/templates/list.html.sh
index 684cb7432b145ed55859c85273881e7de3968fc3..ca875df4c0342a1c6576b29d740e7a17ecc61cd4 100755 (executable)
--- a/templates/list.html.sh
+++ b/templates/list.html.sh
@@ -29,7 +29,7 @@ cat <<EOF
     <input type="submit" name="submit" value="Find">
 
     <a class="panel clearsearch" href="?">Clear All</a>
-    <a class="panel advanced show" href="?p=filter&${page_this}">Advanced</a>
+    <a class="panel advanced show" href="#advfilter">Advanced</a>
 
     <div class="pagination_nav">
       <label>Page:</label>
@@ -39,49 +39,25 @@ cat <<EOF
     </div>
   </form>
 
+  $(. $_EXEC/templates/advfilter.html.sh)
+
   <form action="?action=multitag&${page_this}" method="post" accept-charset="UTF-8">
     <ul id="thumblist">
       $(thumblist)
     </ul>
-    <div class="panel footer" id="foot">
-      <a class="panel tagger show" href="#foot" onclick="javascript:hide('foot');show_block('tagger');">Add Tags</a>
+    $($_EXEC/templates/tagger.html.sh)
+  </form>
 
-      <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>
-    </div>
+  <div class="panel footer" id="foot">
+    <a class="panel tagger show" href="#tagger">Add Tags</a>
 
-    <div class="panel footer" id="tagger" style="display: none;">
-      <a class="panel tagger hide" href="#"
-       onclick="javascript:hide('tagger');$(for n in $(seq 1 4); do echo "hide('filter$n');"; done)show_block('foot')"
-      >Hide</a>
-      <hr>
-      <p class="help">Add selectetd tags to selected videos.</p>
-      <p class="newtag">
-        <label class="category">None:</label>
-        <select name="ctag" size="12" multiple id="${n}_none">
-         $(echo "$taglist" |sed -rn 's;^([^:]+)$;<option value="\1">\1</option>;p')
-        </select>
-      </p>
-      $(echo "$taglist" |sed -rn 's;^([^:]+):.*$;\1;p' |sort -u |while read cat; do echo "
-      <p class=\"newtag\">
-        <label class=\"category\">${cat}:</label>
-        <input type=\"hidden\" name=\"category\" value=\"$cat\">
-        <select name=\"ctag\" size=\"12\" multiple id=\"${n}_$cat\">
-         $(echo "$taglist" |sed -rn "s;^${cat}:(.*)$;<option value=\"${cat}:\\1\">\\1</option>;p")
-        </select>
-      </p>"
-      done)
-      <p class="newtag additional">
-        <label class="additional">Additional Tags (one per line):</label>
-        <textarea name="tags" rows="2"></textarea>
-      </p>
-      <input type="submit" value="Add Tags!">
+    <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>
 EOF
 
 # vi:set filetype=html: