Merge commit '84d5f73a1c0258adf803c9ec53fbc9b36a1c0edc'

[serve0] / view.sh

diff --git a/view.sh b/view.sh
index 4ee5fb590ec6d731a3f256b03064f4dc77bd9a59..9bd507cbab93ae2d5f4a479ffe9b0e6994fa3e6e 100644 (file)
--- a/view.sh
+++ b/view.sh
@@ -15,6 +15,7 @@ printf 'Content-Type: text/html;charset=utf-8\r\n\r\n'
   HTML "${ITEM##*/}"
   printf ']
   [meta name="viewport" content="width=device-width"]
+  [link rel=stylesheet href="/cgilite/common.css" ]
   [link rel=stylesheet href="/style.css" ]
 ] [body #view
   [script type="text/javascript" src="/stereoview.js"\n]
@@ -22,14 +23,13 @@ printf 'Content-Type: text/html;charset=utf-8\r\n\r\n'
     [a #t_bookmarks href="#bookmarks" ★]'
     w_search
     printf '
-    [a #t_avsearch href="#advsearch" Advanced]
     [a #t_prefs href="#prefs" ⚙]
   ]'
   w_bookmarks
   w_advsearch
   w_prefs
   printf '
-  [video #mainvideo controls="controls" [source src="?a=download" type="video/mp4"]]
+  [video #mainvideo controls="controls" preload="auto" [source src="?a=download" type="video/mp4"]]
   [a "?a=download" Download]
   [a "javascript:stereoview(180, document.getElementById("mainvideo"));" View 180° Stereoscopic]
   [a "javascript:stereoview(360, document.getElementById("mainvideo"));" View 360° Stereoscopic]
@@ -37,7 +37,7 @@ printf 'Content-Type: text/html;charset=utf-8\r\n\r\n'
   [span .time %i:%02imin] [span .dim %ix%i] %s
   ' "$(HTML "${ITEM##*/}" |sed -r "$w_ascii"' s;[^0-9a-zA-Z&#];&[wbr];g')" \
     "$((length / 60))" "$((length % 60))" "$width" "$height" \
-    "$(printf '%s\n' "${tags#tags=}" |sed -r "$UNSTRING"'
+    "$(UNSTRING "${tags#tags=}" |sed -r '
        s;^;,;; s;,+;,;g; s;,$;;; :X s;,-?([^,]+)(,|$); [span .tag\n \1]\2;; tX;'
     )"
   printf '