diff --git a/html/static/flash/player.swf b/html/static/flash/player.swf new file mode 100644 index 0000000..7d76b65 Binary files /dev/null and b/html/static/flash/player.swf differ diff --git a/html/static/flash/skin.swf b/html/static/flash/skin.swf new file mode 100644 index 0000000..bdcb0b5 Binary files /dev/null and b/html/static/flash/skin.swf differ diff --git a/pug/includes/layout.pug b/pug/includes/layout.pug index a7e0eb6..5da074d 100644 --- a/pug/includes/layout.pug +++ b/pug/includes/layout.pug @@ -43,4 +43,4 @@ html h3.footer__colhead About ul.footer__list li: a(href="/privacy") Privacy policy - li: a(href="/js-licenses" data-jslicense=1) JavaScript licenses + li: a(href="/licenses" data-jslicense=1) Licenses diff --git a/pug/js-licenses.pug b/pug/licenses.pug similarity index 65% rename from pug/js-licenses.pug rename to pug/licenses.pug index ea408a6..854ac23 100644 --- a/pug/js-licenses.pug +++ b/pug/licenses.pug @@ -1,11 +1,12 @@ extends includes/layout.pug block head - title JavaScript license information + title License information block content main.js-licenses-page - h1 JavaScript license information + h1 License information + h2 JavaScript table#jslicense-labels1 thead tr @@ -20,3 +21,5 @@ block content td: a(href=file)= file td: a(href="http://www.gnu.org/licenses/agpl-3.0.html") GNU-AGPL-3.0-or-later td: a(href=file)= file + h2 Flash + p Flash playback is provided by #[a(href="https://github.com/gokercebeci/f4player/") f4player by Goker Cebeci.] (HTML 5 playback is still preferred where possible; Flash is only tried on ancient browsers.) diff --git a/pug/video.pug b/pug/video.pug index 34bc578..b1fc394 100644 --- a/pug/video.pug +++ b/pug/video.pug @@ -32,6 +32,9 @@ block content source(src=format.url type=format.type) each t in video.captions track(label=t.label kind="subtitles" srclang=t.languageCode src=t.url) + // fallback: flash player + - let flashvars = new URLSearchParams({skin: "/static/flash/skin.swf", video: format.url}) + embed(type="application/x-shockwave-flash" src="/static/flash/player.swf" id="f4Player" width=1280 height=720 flashvars=flashvars.toString() allowscriptaccess="always" allowfullscreen="true" bgcolor="#000000") else video(src="")#video.video .stream-notice The server provided no playback streams. diff --git a/sass/includes/js-licenses-page.sass b/sass/includes/licenses-page.sass similarity index 64% rename from sass/includes/js-licenses-page.sass rename to sass/includes/licenses-page.sass index 91fea5d..1794067 100644 --- a/sass/includes/js-licenses-page.sass +++ b/sass/includes/licenses-page.sass @@ -1,3 +1,3 @@ .js-licenses-page - max-width: 600px + max-width: 800px margin: 0 auto diff --git a/sass/includes/video-list-item.sass b/sass/includes/video-list-item.sass index 2620de7..d240360 100644 --- a/sass/includes/video-list-item.sass +++ b/sass/includes/video-list-item.sass @@ -1,6 +1,10 @@ @use "colors.sass" as c @use "_dimensions.sass" as dimensions +// navigator hacks +.thumbnail > .thumbnail__options-container + float: right + .thumbnail $more-size: 24px @@ -33,7 +37,8 @@ &::-webkit-details-marker display: none - &__options-container + // "&__more" is needed for navigator hacks + &__more &__options-container position: absolute z-index: 1 top: $more-size diff --git a/sass/main.sass b/sass/main.sass index 301e516..a912132 100644 --- a/sass/main.sass +++ b/sass/main.sass @@ -9,7 +9,7 @@ @use "includes/settings-page.sass" @use "includes/cant-think-page.sass" @use "includes/privacy-page.sass" -@use "includes/js-licenses-page.sass" +@use "includes/licenses-page.sass" @use "includes/filters-page.sass" @use "includes/forms.sass" @use "includes/nav.sass" diff --git a/server.js b/server.js index 24c5ee4..e9d7805 100644 --- a/server.js +++ b/server.js @@ -25,7 +25,7 @@ const constants = require("./utils/constants") server.addPugDir("pug/errors") server.addRoute("/cant-think", "pug/cant-think.pug", "pug") server.addRoute("/privacy", "pug/privacy.pug", "pug") - server.addRoute("/js-licenses", "pug/js-licenses.pug", "pug") + server.addRoute("/licenses", "pug/licenses.pug", "pug") server.addStaticHashTableDir("html/static/js") server.addStaticHashTableDir("html/static/js/elemjs")