X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=templates%2Flist.html.sh;h=28ce6c503e3bc12a3befc9150ecd8ffaa8dbbcd8;hb=9554fea689ec1519a572888aae9dc37ae140cd57;hp=859878d7c8bb9b45be681ec2fbc690494777bf2b;hpb=ae511b015a59ba72086e6d232c74d5845b71cbb8;p=serve0

diff --git a/templates/list.html.sh b/templates/list.html.sh
index 859878d..28ce6c5 100755
--- a/templates/list.html.sh
+++ b/templates/list.html.sh
@@ -16,6 +16,8 @@
 # along with Serve0  If not, see <http://www.gnu.org/licenses/>. 
 
 cat <<EOF
+
+  <input type=radio name=topmenu id=btn_search checked><label for=btn_search>Search</label>
   <form class="panel" id="search" action="?" method="get" accept-charset="UTF-8">
     <input type="text" name="s" value="$search" placeholder="Search">
 
@@ -27,29 +29,50 @@ cat <<EOF
     </select>
     <!-- input type="submit" name="submit" value="Find" -->
 
-    <a class="panel clearsearch" href="?">Clear All</a>
-    <a class="panel toggle" href="#advfilter">Advanced</a>
+    <a class="panel clearsearch" href="?">Clear</a>
+  </form>
+
+  <input type=radio name=topmenu id=btn_advfilter><label for=btn_advfilter>Advanced</label>
+  $(. $_EXEC/templates/advfilter.html.sh)
+
+  <input type=radio name=topmenu id=btn_preferences><label for=btn_preferences>Preferences</label>
+  $(. $_EXEC/templates/preferences.html.sh)
+
+  <input type=radio name=topmenu id=btn_morelinks><label for=btn_morelinks>{+}</label>
+  <div class="panel switchable top" id="morelinks">
+    <a class="panel toggle" href="#">Hide</a>
+
+    <a class="panel treeview" href="?p=browse">Browse Folders</a>
     <a class="panel" href="?p=playctl">Player</a>
+  </div>
 
-    <div class="pagination_nav">
-      <label>Page:</label>
+  <form action="?action=multitag" method="post" accept-charset="UTF-8">
+    <input type="hidden" name="page" value="?$(attribsafe "${page_this}")">
+    <input type="hidden" name="o" value="${order}">
+    <input type="hidden" name="s" value="${search}">
+    <input type="hidden" name="f" value="${filter}">
+    <input type="hidden" name="pn" value="${page}">
+
+    <ul id="thumblist">
 EOF
 
+  thumblist
+
+  pages="$(
   seq 1 $(pagecount) \
   | while read pn; do
     plink="$(($pn * $pagesize - $pagesize + 1))"
-    printf '<a %s href="?%spn=%s">%s</a>\n' "$([ $plink = $page ] && printf class=current)" "$page_link" "$plink" "$pn"
+    
+    case "$plink" in
+      $(($page - $pagesize))) class=previous;;
+      $page) class=current;;
+      $(($page + $pagesize))) class=next;;
+      * ) class='';;
+    esac
+  
+    printf '<a class="%s" href="?%spn=%s">%s</a>\n' "$class" "$page_link" "$plink" "$pn"
   done
-      
-cat <<EOF
-    </div>
-  </form>
-
-  <form action="?action=multitag&${page_this}" method="post" accept-charset="UTF-8">
-    <ul id="thumblist">
-EOF
-
-  thumblist
+  )"
 
 cat <<EOF
     </ul>
@@ -58,22 +81,14 @@ cat <<EOF
 
   <div class="panel" id="foot">
     <a class="panel toggle" href="#tagger">Add Tags</a>
-    <a class="panel toggle" href="#preferences">Preferences</a>
-    <a class="panel treeview" href="?p=tree">Browse Folders</a>
+    <a class="panel toggle" href="#">⇧</a>
 
     <div class="pagination_nav">
       <label>Page:</label>
-      $(seq 1 $(pagecount) \
-        | while read pn; do
-          plink="$(($pn * $pagesize - $pagesize + 1))"
-          printf '<a %s href="?%spn=%s">%s</a>\n' "$([ $plink = $page ] && printf class=current)" "$page_link" "$plink" "$pn"
-        done
-       )
+      ${pages}
     </div>
   </div>
 
-  $(. $_EXEC/templates/preferences.html.sh)
-  $(. $_EXEC/templates/advfilter.html.sh)
 EOF
 
 # vi:set filetype=html: