X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=pages%2Fvideoview.sh;h=ac3532b4f6349b717b0df290c27a5156d93a114d;hb=3a030bfc7933228ab4405dbb706bd63edbf7bc31;hp=dacb524bcf7dae126d77bfb81eb94dc2b8d50fed;hpb=dcdca39400b4b67090aa35c6dbfcafe8a2131b2f;p=serve0

diff --git a/pages/videoview.sh b/pages/videoview.sh
index dacb524..ac3532b 100755
--- a/pages/videoview.sh
+++ b/pages/videoview.sh
@@ -24,6 +24,16 @@ order=$(echo "$_GET[\"o\"]" |egrep '^(Name|Date|Length)$')
 page=$(echo "$_GET[\"p\"]" |egrep '^[0-9]+$')
 [ -z "$page" ] && page=0
 
+page_link=''
+[ -n "$info" ]   && page_link="${page_link}i=${info}&"
+[ -n "$order" ]  && page_link="${page_link}o=${order}&"
+[ -n "$search" ] && page_link="${page_link}s=${search}&"
+[ -n "$filter" ] && page_link="${page_link}f=${filter}&"
+page_prev="${page_link}p=$([ "$page" = 0 ] && echo 0 || echo $(($page - 1)) )"
+page_next="${page_link}p=$(($page + 1))"
+page_this="${page_link}p=$page"
+
+
 taglist=$(
   [ -r ${_DATA}/cache/taglist ] && cat ${_DATA}/cache/taglist ||\
   for each in ${_DATA}/meta/*.meta; do
@@ -90,17 +100,16 @@ _printVideo(){
 
     tee "$cache" <<VIDEOend
       <div class="thumb">
-        <a name="$info" href="?i=$info&p=$page&f=$filter&s=$search&o=$order#$info"><img src="$thumb"></a>
-        <div class="thumbinfo">
-          <a href="$video"><b>$info</b></a><br>
-          <!-- a href="$reenc">VP8</a -->
-          <a href="$mpfake">fake-mp4</a><br>
-          <input type="checkbox" name="tagsel" value="$info">
-          <span class="coord">${minutes}min</span>
-          <span class="coord">${width}x${height}</span><br>
-          <!--a class="function" href='write/lock.cgi?p=Locations&e=$info&i=$info&f=$filter#$anchor'>edit</a-->
-          <span class="tag">$(sed 's,|$,,;s,|,</span> <span class="tag">,g' <<<"$tags")</span>
-        </div>
+        <a class="watchlink" name="$info" href="?action=watch&i=$info">
+          <img src="$thumb">
+        </a>
+        <a class="videolink" href="$video">$info</a>
+        <!-- a href="$reenc">VP8</a -->
+        <a class="videolink fake-mp4" href="$mpfake">fake-mp4</a>
+        <input type="checkbox" name="tagsel" value="$info">
+        <span class="info property">${minutes}min</span>
+        <span class="info property">${width}x${height}</span><br>
+	$(echo "$tags" |sed -r 's:\|*([^|]+)\|*:<span class="info tag">\1</span>:g')
       </div>
 VIDEOend
   fi