X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;ds=sidebyside;f=templates%2Ffilter.html.sh;fp=templates%2Ffilterdiag.html.sh;h=70ee4b4169474683c75cb698168fd37c364d2379;hb=563bd9812b0eb73ae4e49de012e0f67ed836faaf;hp=ec2dee565f2e20dea390ef8c451925857ea77480;hpb=69498b6a3a0520ffaf13b7ebc5a034b01f50b535;p=serve0

diff --git a/templates/filterdiag.html.sh b/templates/filter.html.sh
similarity index 73%
rename from templates/filterdiag.html.sh
rename to templates/filter.html.sh
index ec2dee5..70ee4b4 100755
--- a/templates/filterdiag.html.sh
+++ b/templates/filter.html.sh
@@ -1,30 +1,22 @@
-#!/bin/zsh    
+# Copyright 2014 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 <<FilterEnd
-  <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>
-
-  <form class="panel" id="advfilter" style="display: none;"
+cat <<EOF
+  <form class="panel" 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>
@@ -36,9 +28,7 @@ cat <<FilterEnd
     <input disabled type="submit" name="submit" value="Find">
 
     <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>
+    <a class="panel advanced hide" href="?page=list">Hide</a>
     <hr>
 
     <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>
@@ -91,7 +81,21 @@ cat <<FilterEnd
       )
     </p>
   </form>
-FilterEnd
 
-# vi:set filetype=html:
+  <form>
+    <ul id="thumblist">
+      $(thumblist)
+    </ul>
 
+    <div class="panel footer" id="foot">
+      <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>
+  </form>
+EOF
+
+# vi:set filetype=html: