From ae9cc2ac49b976992f2e924ef8d30bd540ce2ec0 Mon Sep 17 00:00:00 2001 From: Julian Hurst Date: Sat, 24 Jul 2021 10:40:39 +0200 Subject: Add support for dlsrv streaming --- grimtube.go | 12 +++++- static/dark.css | 17 ++++++++- static/style.css | 4 +- templates/embed.html | 11 +++++- templates/search.html | 100 +++++++++++++++++++++++++------------------------- 5 files changed, 89 insertions(+), 55 deletions(-) diff --git a/grimtube.go b/grimtube.go index bd700fb..385be92 100644 --- a/grimtube.go +++ b/grimtube.go @@ -143,7 +143,17 @@ func embed(w http.ResponseWriter, r *http.Request) { case "GET": query := r.URL.Query() id := query.Get("id") - serve(w, "templates/embed.html", id) + url := query.Get("url") + data := struct { + Id string + Url string + Dlsrv string + }{ + id, + url, + dlsrv, + } + serve(w, "templates/embed.html", data) default: } } diff --git a/static/dark.css b/static/dark.css index f204117..fd89ec2 100644 --- a/static/dark.css +++ b/static/dark.css @@ -1,9 +1,11 @@ a { - color: orange; + /*color: orange;*/ + color: slategray; } a:hover { - color: darkorange; + /*color: darkorange;*/ + color: darkslategray; } p { @@ -15,6 +17,11 @@ li { } body { + background-color: #111; + margin: 0; +} + +div.content { margin: 0 auto; margin-top: 10px; max-width: 80ex; @@ -71,3 +78,9 @@ select#lang { select#order { width: calc(20% - 10px); } + +video { + /*max-width: 100vh;*/ + height: 100vh; + /*max-height: 100vh;*/ +} diff --git a/static/style.css b/static/style.css index 420e9c2..45ca754 100644 --- a/static/style.css +++ b/static/style.css @@ -1,3 +1,3 @@ -@import "light.css" screen; +@import "dark.css" screen; -@import "dark.css" screen and (prefers-color-scheme: dark); +/*@import "dark.css" screen and (prefers-color-scheme: dark);*/ diff --git a/templates/embed.html b/templates/embed.html index ff372ab..a9d9d68 100644 --- a/templates/embed.html +++ b/templates/embed.html @@ -1,4 +1,13 @@ {{define "title"}}Index{{end}} {{define "content"}} - + {{if ne .Dlsrv ""}} +
+ +
+ {{else}} + + {{end}} {{end}} diff --git a/templates/search.html b/templates/search.html index e5cff9a..6a9ce28 100644 --- a/templates/search.html +++ b/templates/search.html @@ -1,56 +1,58 @@ {{define "title"}}Search{{end}} {{define "content"}} -
- - + - + -
- - {{range .Items}} - - - - - {{if ne $.Dlsrv ""}} + + +
- - - {{.Title}} -
- {{.ChannelTitle}} | Atom feed -
- Comments -
- {{.ViewCount}} -
- {{.Published}} -
- {{.LengthText}} -
+ {{range .Items}} + - {{end}} - - {{end}} -
- Download +
- {{if ge .Page 0 }} - Prev Page | - Next Page - {{end}} + + {{.Title}} +
+ {{.ChannelTitle}} | Atom feed +
+ Comments +
+ {{.ViewCount}} +
+ {{.Published}} + + + {{.LengthText}} + + {{if ne $.Dlsrv ""}} + + Download + + {{end}} + + {{end}} + + {{if ge .Page 0 }} + Prev Page | + Next Page + {{end}} + {{end}} -- cgit v1.2.3