X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=templates%2Fview.html.sh;h=8c22d6a6983fa61442b8883ae9e002b6114b210b;hb=e542e0a34e796df05efa42cdb091ba4032836bdd;hp=8df1b5695061f02e9956dc00f6748bb8393ef7de;hpb=12c83ad8f3ac1a3178ced9dbd82c3b6e078a06b9;p=serve0

diff --git a/templates/view.html.sh b/templates/view.html.sh
index 8df1b56..8c22d6a 100755
--- a/templates/view.html.sh
+++ b/templates/view.html.sh
@@ -16,28 +16,33 @@
 # 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">
+  <!-- input type="submit" name="submit" value="Find" -->
 
-  <a class="panel clearsearch" href="?">Clear All</a>
-  <a class="panel" href="${info:+?p=list&amp;${page_this}#$(urlsave $info)}${info:-?p=tree&amp;d=${directory}&amp;${page_this}}">Dismiss</a>
-
-  <div class="pagination_nav">
-    <label>Page:</label>
-    <a href="?p=view&amp;${page_prev}">&lt;&lt;</a>
-    <a href="?p=view&amp;${page_this}">$(($page + 1))</a>
-    <a href="?p=view&amp;${page_next}">&gt;&gt;</a>
-  </div>
+  <a class="panel" href="${info:+?p=list&amp;${page_this}}${directory:+?p=tree&amp;d=${directory}&amp;${page_this}}#$(urlsafe $info)">Dismiss</a>
 </form>
 
+<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 listview" href="?p=list">Index view</a>
+  <a class="panel treeview" href="?p=tree">Browse Folders</a>
+</div>
+
+
 <div id="videoview">
   <h1>$info</h1>
 
@@ -46,58 +51,51 @@ cat <<EOF
     <source src="$video" type='video/mp4; codecs="avc1.4D401E, mp3"'>"
   </video>
 
-  <span class="info length">$(($length / 60)):$(($length % 60)) min</span>
+  <span class="info length">$(printf "%d:%02d min" $(($length / 60)) $(($length % 60)) )</span>
   <span class="info width" >Width: $width</span>
   <span class="info height">Height: $height</span><br>
   
   $(printf %s\\n "$tags" |sed -r 's:\|*([^|]+)\|*:<span class="info tag">\1</span> :g')
   ${description:+<span class="info description">$(printf %s "$description" |_wiki)</span>}
+</div>
 
-  <form class="panel" id="tagger" action="?action=meta&${page_this}" method="post" accept-charset="UTF-8">
-    <input type="hidden" name="length" value="$length">
-    <input type="hidden" name="width" value="$width">
-    <input type="hidden" name="height" value="$height">
-
-    $(
-    for cat in $(list_categories); do
-      printf '<p class="newtag"><label class="category">%s:</label><select name="tag" size="12" multiple>' "${cat}"
-      catt="${cat}:"
-      [ "$catt" = "none:" ] && catt=''
-      
-      printf %s "$taglist_set" |egrep '^'"$catt"'[^:]+$' |while read line; do
-        printf '<option %s value="%s">%s</option>' \
-               "$(egrep -q "(^|.*\|)$line(\|.*|$)" "$meta" && printf selected)" \
-               "$line" "${line#*:}"
-      done
-      printf '</select></p>'
+<form class="panel switchable bottom" id="tagger" action="?action=meta&${page_this}" method="post" accept-charset="UTF-8">
+  <input type="hidden" name="referrer" value="$(attribsafe "${REQUEST_URI}")">
+  <input type="hidden" name="length" value="$length">
+  <input type="hidden" name="width" value="$width">
+  <input type="hidden" name="height" value="$height">
+
+  $(
+  for cat in $(list_categories); do
+    printf '<fieldset class="newtag"><label class="category">%s:</label><select name="tag" size="12" multiple>' "${cat}"
+    catt="${cat}:"
+    [ "$catt" = "none:" ] && catt=''
+    
+    printf %s "$taglist_set" |egrep '^'"$catt"'[^:]+$' |while read line; do
+      printf '<option %s value="%s">%s</option>' \
+             "$(egrep -q "(^|.*\|)$line(\|.*|$)" "$meta" && printf selected)" \
+             "$line" "${line#*:}"
     done
-    )
-
-    <p class="newtag additional">
-      <label class="additional">Additional Tags (one per line):</label>
-      <textarea name="tags" rows="4"></textarea>
-    </p>
-    <p class="newtag description">
-      <label class="description">Description:</label>
-      <textarea name="description" rows="4">$description</textarea>
-    </p>
-    <input type="submit" value="Edit!">
-    <input type="submit" name="trash" value="Delete Video">
-
-    <a class="panel toggle" href="#foot">Hide</a>
-
-  </form>
-</div>
+    printf '</select></fieldset>'
+  done
+  )
 
-<div class="panel footer" id="foot">
-  <a class="panel toggle" href="#tagger">Edit Tags</a>
+  <fieldset class="newtag additional">
+    <label class="additional">Additional Tags (one per line):</label>
+    <textarea name="tags" rows="4"></textarea>
+  </fieldset>
+  <fieldset class="newtag description">
+    <label class="description">Description:</label>
+    <textarea name="description" rows="4">$description</textarea>
+  </fieldset>
+  <input type="submit" value="Edit!">
+  <input type="submit" name="trash" value="Delete Video">
 
-  <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 toggle" href="#foot">Hide</a>
+</form>
+
+<div class="panel bottom" id="foot">
+  <a class="panel toggle" href="#tagger">Edit Tags</a>
 </div>
 EOF