X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=page_channel.sh;h=b1fd4c50d000448ea7b00312c399a8d94ae6fe29;hb=8d0b3c5e1934c4bb2a3a5dbd9e0a14ab4efa438b;hp=57de476c579b17dbc2db175d222bac7aa72694ea;hpb=5a89bb04f642cabd4420689a7c84070647029d38;p=rawnet

diff --git a/page_channel.sh b/page_channel.sh
index 57de476..b1fd4c5 100755
--- a/page_channel.sh
+++ b/page_channel.sh
@@ -134,15 +134,14 @@ esac
 w_video(){
   local CID="$1" thumb
   local ID NAME DESCRIPTION RESX RESY LENGTH COVER STATUS UPLOADER HITS DESCR_CACHE FUTUREUSE
-  if read -r ID NAME DESCRIPTION RESX RESY LENGTH COVER STATUS UPLOADER HITS FUTUREUSE; then
+  if read -r ID NAME DESCRIPTION RESX RESY LENGTH COVER STATUS UPLOADER HITS DESCR_CACHE FUTUREUSE; then
     thumb="${_BASE}/${CID}/thumb_${ID}.jpg"
     [ "$NAME" = \\ ] && NAME="(Unnamed Video)"
-    cat <<-EOF
-	[div .video
-	  [h3 [a href="${ID}/" . $(UNSTRING "$NAME" |HTML)]]
-	  [img href="${thumb}" alt="$(UNSTRING "$DESCR_CACHE")"]
-	]
-	EOF
+    printf '[div .video .thumb
+              [h3 [a href="%s/" . %s]]
+              [figure [img src="%s" alt=""]]
+              [div .description . %s]
+            ]' "$ID" "$(UNSTRING "$NAME" |HTML)" "$thumb" "$(UNSTRING "$DESCR_CACHE")"
   else
     return 1
   fi
@@ -156,10 +155,12 @@ w_channel(){
     [ "$NAME" = \\ ] && NAME="(UNNAMED CHANNEL)"
     cat <<-EOF
 	[div .channel
-	  [h2 [a href="${_BASE}/channel/${ID}/" $(UNSTRING "${NAME}" |HTML)]]
-	  [div .description . $(UNSTRING "$DESCR_CACHE")]
-	  $( [ -f "$vid_db" -a -r "$vid_db" ] \
-	     && while w_video "$ID"; do :; done <"$vid_db"
+	  [div .description
+	    [h2 [a href="${_BASE}/channel/${ID}/" $(UNSTRING "${NAME}" |HTML)]]
+	    $(UNSTRING "$DESCR_CACHE")
+	  ]$(
+            [ -f "$vid_db" -a -r "$vid_db" ] \
+	    && while w_video "$ID"; do :; done <"$vid_db"
 	  )
 	]
 	EOF
@@ -203,18 +204,16 @@ elif [ "$channel" ]; then
 	[h1 .name $(HTML "$CHANNEL_NAME")]
 	[div .description . ${CHANNEL_DESCR_CACHE}]
 	[h1 .videos Videos]
-	[div .videos
-	  $( [ "$USER_ID" -a ! "${CHANNEL_AUTHORS##*${USER_ID}*}" ] \
-	     && printf '
-                [form .video .newvideo method=POST
-                  [hidden "video" "%s"]
-                  [submit "action" "newvideo" New Video]
-                ]' "$(timeid)"
-          )
-	  $( [ -f "$vid_db" -a -r "$vid_db" ] \
-	     && while w_video "$ID"; do :; done <"$vid_db"
-	  )
-	]
+	[div .videos . $(
+          [ "$USER_ID" -a ! "${CHANNEL_AUTHORS##*${USER_ID}*}" ] \
+	  && printf '
+             [form .video .newvideo method=POST
+               [hidden "video" "%s"]
+               [submit "action" "newvideo" New Video]
+             ]' "$(timeid)"
+	  [ -f "$vid_db" -a -r "$vid_db" ] \
+	  && while w_video "$ID"; do :; done <"$vid_db"
+	)]
 	EOF
 else
   yield_page "Channels" "channels" <<-EOF