X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=pages%2Fcommon.sh;h=9e659bf1c5a3575c6050068fbf5310aec3d85aa7;hb=0619bc447c21ac196734848ae3b0aa786b6eb1ee;hp=b424dff0a914c360052a54e6dbf3f3b69422c0be;hpb=d0b44dc7ebbb28086c66506cbf40b8df32163796;p=serve0

diff --git a/pages/common.sh b/pages/common.sh
index b424dff..9e659bf 100755
--- a/pages/common.sh
+++ b/pages/common.sh
@@ -62,37 +62,21 @@ _printVideo(){
     thumb="$(urlsave "thumbs/$info.jpg")"
     linkinfo="$(urlsave "$info")"
 
-    [ "$(($length % 60))" -lt 10 ] &&\
-      minutes="$(($length / 60)):0$(($length % 60))" ||\
-      minutes="$(($length / 60)):$(($length % 60))"
-
-    rpiaddr="pfostenpanne.helmchyn.no-ip.biz"
-    rpidull="http://${rpiaddr}/?player=play&path=http://jupiter:8000/${video}"
-    rpicgi="http://${rpiaddr}/?player=play&path=$(urlsave "http://jupiter:8000/?action=transcode&i=${linkinfo}&t=480")"
-
-    [ $height -gt 480 -a $width -gt 480 ] && \
-       raspi="<a class=\"videolink alt raspi\" href=\"${rpicgi}\">RasPi</a>" \
-    || raspi="<a class=\"videolink alt raspi\" href=\"${rpidull}\">RasPi</a>"
-    [ $height -gt 480 ] && \
-      alt480="<a class=\"videolink alt 480p\" href=\"?action=transcode&i=${linkinfo}&t=480\">480p</a>" \
-    ||unset alt480
-    [ $height -gt 240 ] && \
-      alt240="<a class=\"videolink alt 240p\" href=\"?action=transcode&i=${linkinfo}&t=240\">240p</a>" \
-    ||unset alt240
+    [ "$(($length % 60))" -lt 10 ] && minutes="$(($length / 60)):0$(($length % 60))" \
+                                   || minutes="$(($length / 60)):$(($length % 60))"
 
     tee "$cache" <<VIDEOend
       <li class="thumb">
         <a class="watchlink" name="${linkinfo}" href="?action=watch&i=${linkinfo}">
-          <img src="$thumb">
+          <img src="$thumb" alt="Preview not yet available">
         </a>
-        <a class="videolink" href="$video">$info</a>
-        ${alt480} ${alt320} ${alt240} ${raspi}<br>
+        <h2>$info</h2>
         
         <input type="checkbox" name="tagsel" value="$info">
         <span class="info property">${minutes}min</span>
         <span class="info property">${width}x${height}</span>
-	$(echo -E "$tags" |sed -r 's:\|*([^|]+)\|*:<span class="info tag">\1</span>:g')
-      </div>
+	$(printf %s "$tags" |sed -r 's:\|*([^|]+)\|*:<span class="info tag">\1</span>:g')
+      </li>
 VIDEOend
   fi
 }