X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=templates%2Flist.html.sh;h=a03c4dac673332f0525b622e91491fdc224ade1f;hb=b6d914a4ee1b64a318b17207b92d791af5c8d658;hp=eed4fef9312fc42868d48cd505a5713f17646020;hpb=91b7ecbc9eff99427974cebdd96ad0bef1c76929;p=serve0

diff --git a/templates/list.html.sh b/templates/list.html.sh
index eed4fef..a03c4da 100755
--- a/templates/list.html.sh
+++ b/templates/list.html.sh
@@ -29,12 +29,12 @@ 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>
       <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>
@@ -43,44 +43,23 @@ cat <<EOF
     <ul id="thumblist">
       $(thumblist)
     </ul>
-
-    <div class="panel footer" id="tagger">
-      <a class="panel tagger hide" href="#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>
+    $(. $_EXEC/templates/tagger.html.sh)
   </form>
 
   <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: