cleaner filter builder

[serve0] / templates / list.html.sh

diff --git a/templates/list.html.sh b/templates/list.html.sh
index a4e50bb2a274b2fb67158021c411e748844dbef3..a03c4dac673332f0525b622e91491fdc224ade1f 100755 (executable)
--- a/templates/list.html.sh
+++ b/templates/list.html.sh
@@ -34,13 +34,11 @@ cat <<EOF
     <div class="pagination_nav">
       <label>Page:</label>
       <a href="?${page_prev}">&lt;&lt;</a>
-      <a href="?${page_this}">$(($page + 1))</a>
+      <a href="?${page_this}">$(($page / $pagesize + 1))</a>
       <a href="?${page_next}">&gt;&gt;</a>
     </div>
   </form>
 
-  $(. $_EXEC/templates/advfilter.html.sh)
-
   <form action="?action=multitag&${page_this}" method="post" accept-charset="UTF-8">
     <ul id="thumblist">
       $(thumblist)
@@ -50,14 +48,18 @@ cat <<EOF
 
   <div class="panel footer" id="foot">
     <a class="panel tagger show" href="#tagger">Add Tags</a>
+    <a class="panel tagger show" href="#preferences">Preferences</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_this}">$(($page / $pagesize + 1))</a>
       <a href="?${page_next}">&gt;&gt;</a>
     </div>
   </div>
+
+  $(. $_EXEC/templates/preferences.html.sh)
+  $(. $_EXEC/templates/advfilter.html.sh)
 EOF
 
 # vi:set filetype=html: