X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;ds=sidebyside;f=templates%2Flist.html.sh;h=144ad0e69f0a1d81620df98b2998a3d6afedda7e;hb=5b28c95408ac219fa5abf790eda7c937542d4e7d;hp=4f860ec136de2a955a1f6f895acd1145af8317b6;hpb=563bd9812b0eb73ae4e49de012e0f67ed836faaf;p=serve0

diff --git a/templates/list.html.sh b/templates/list.html.sh
index 4f860ec..144ad0e 100755
--- a/templates/list.html.sh
+++ b/templates/list.html.sh
@@ -1,4 +1,4 @@
-# Copyright 2014, 2015 Paul Hänsch
+# Copyright 2014 - 2017 Paul Hänsch
 #
 # This file is part of Serve0
 # 
@@ -16,72 +16,75 @@
 # along with Serve0  If not, see <http://www.gnu.org/licenses/>. 
 
 cat <<EOF
-  <form class="panel" id="search" style="display: block;"
-        action="?" method="get" accept-charset="UTF-8">
+
+  <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">
 
-    <label for="o1" class="order">Order by:</label>
     <select class="order" size="1" name="o" id="o1">
+      <option class="label" selected disabled>Order by</option>
       <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="?page=filter">Advanced</a>
+    <!-- input type="submit" name="submit" value="Find" -->
 
-    <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>
+    <a class="panel clearsearch" href="?">Clear</a>
   </form>
 
-  <form action="?action=multitag&${page_this}" method="post" accept-charset="UTF-8">
+  <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>
+
+  <form action="?action=multitag" method="post" accept-charset="UTF-8">
+    <input type="hidden" name="page" value="?$(attribsafe "${page_this}")">
+
     <ul id="thumblist">
-      $(thumblist)
+EOF
+
+  thumblist
+
+  pages="$(
+  seq 1 $(pagecount) \
+  | while read pn; do
+    plink="$(($pn * $pagesize - $pagesize + 1))"
+    
+    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
     </ul>
-    <div class="panel footer" id="foot">
-      <a class="panel tagger show" href="#foot" onclick="javascript:hide('foot');show_block('tagger');">Add Tags</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>
-    </div>
+    $(. $_EXEC/templates/tagger.html.sh)
+  </form>
 
-    <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="panel" id="foot">
+    <a class="panel toggle" href="#tagger">Add Tags</a>
+    <a class="panel toggle" href="#">⇧</a>
+
+    <div class="pagination_nav">
+      <label>Page:</label>
+      ${pages}
     </div>
-  </form>
+  </div>
+
 EOF
 
 # vi:set filetype=html: