aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--assets/css/_room.less4
-rw-r--r--configs/conferences/33c3/assets/f-beta.svg85
-rw-r--r--configs/conferences/33c3/assets/min/f-beta.svg1
-rw-r--r--configs/conferences/33c3/main.less7
-rw-r--r--template/assemblies/switcher/dash.phtml30
5 files changed, 126 insertions, 1 deletions
diff --git a/assets/css/_room.less b/assets/css/_room.less
index 161000d..cfffbd8 100644
--- a/assets/css/_room.less
+++ b/assets/css/_room.less
@@ -46,6 +46,10 @@ body.room {
}
}
+ .notes.well {
+ margin-top: @padding-large-vertical;
+ }
+
#chat {
text-align: center;
diff --git a/configs/conferences/33c3/assets/f-beta.svg b/configs/conferences/33c3/assets/f-beta.svg
new file mode 100644
index 0000000..ea55e5d
--- /dev/null
+++ b/configs/conferences/33c3/assets/f-beta.svg
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ version="1.1"
+ id="svg2"
+ viewBox="0 0 539.0371 46.5"
+ height="46.5"
+ width="539.03711">
+ <metadata
+ id="metadata12">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Live_Music</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs10" />
+ <title
+ id="title4">Live_Music</title>
+ <g
+ id="text3340"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:559.99999046%;font-family:'TeX Gyre Adventor';-inkscape-font-specification:'TeX Gyre Adventor, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1">
+ <path
+ id="path3382"
+ style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:62.5px;font-family:'Avenir LT Std';-inkscape-font-specification:'Avenir LT Std Ultra-Bold'"
+ d="m 13.125,45.375 8.375,0 9.75,-30.625 0.125,0 9.75,30.625 8.6875,0 12.9375,-44.25 -9.875,0 -7.4375,29.125 -0.125,0 -9.1875,-29.125 -9.0625,0 -9.25,28.375 -0.125,0 L 10.625,1.125 0,1.125 13.125,45.375 Z" />
+ <path
+ id="path3384"
+ style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:62.5px;font-family:'Avenir LT Std';-inkscape-font-specification:'Avenir LT Std Ultra-Bold'"
+ d="m 60.975586,45.375 10.75,0 3.6875,-9.375 17.1875,0 3.8125,9.375 11.000004,0 -19.250004,-44.25 -8.0625,0 -19.125,44.25 z m 28.3125,-17.625 -10.8125,0 5.375,-13.75 5.4375,13.75 z" />
+ <path
+ id="path3386"
+ style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:62.5px;font-family:'Avenir LT Std';-inkscape-font-specification:'Avenir LT Std Ultra-Bold'"
+ d="m 147.30273,45.375 -9.75,0 0,-17.6875 -4.8125,0 -9.25,17.6875 -11.6875,0 11.25,-18.6875 c -6.25,-1.125 -9.5625,-5.9375 -9.5625,-12.125 0,-10.3125 7.625,-13.4375 16.6875,-13.4375 l 17.125,0 0,44.25 z m -9.75,-36 -6.375,0 c -3.5625,0 -7.5625,0.6875 -7.5625,5.125 0,4.8125 4.625,4.9375 8.1875,4.9375 l 5.75,0 0,-10.0625 z" />
+ <path
+ id="path3388"
+ style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:62.5px;font-family:'Avenir LT Std';-inkscape-font-specification:'Avenir LT Std Ultra-Bold'"
+ d="m 152.33008,45.375 9.75,0 0,-31.5 0.125,0 19.3125,31.5 12.75,0 0,-44.25 -9.75,0 0,30.75 -0.125,0 -18.8125,-30.75 -13.25,0 0,44.25 z" />
+ <path
+ id="path3390"
+ style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:62.5px;font-family:'Avenir LT Std';-inkscape-font-specification:'Avenir LT Std Ultra-Bold'"
+ d="m 203.1084,45.375 9.75,0 0,-44.25 -9.75,0 0,44.25 z" />
+ <path
+ id="path3392"
+ style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:62.5px;font-family:'Avenir LT Std';-inkscape-font-specification:'Avenir LT Std Ultra-Bold'"
+ d="m 263.72559,45.375 -9.75,0 0,-31.5 -0.125,0 -19.3125,31.5 -12.75,0 0,-44.25 9.75,0 0,30.75 0.125,0 18.8125,-30.75 13.25,0 0,44.25 z" />
+ <path
+ id="path3394"
+ style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:62.5px;font-family:'Avenir LT Std';-inkscape-font-specification:'Avenir LT Std Ultra-Bold'"
+ d="m 270.31641,19.125 17.3125,0 0,9 -7.9375,0 0,7.1875 c 1.8125,1 4.9375,2.1875 9.1875,2.1875 8.3125,0 13.75,-6 13.75,-14.25 0,-8.25 -5.4375,-14.25 -13.75,-14.25 -4.9375,0 -8.125,1.4375 -10.75,4.1875 l -6.875,-7.5 C 275.69141,1.5625 281.87891,0 288.87891,0 c 13.8125,0 23.875,9.0625 23.875,23.25 0,14.1875 -10.0625,23.25 -23.875,23.25 -6.5,0 -12.8125,-1.25 -18.5625,-4.25 l 0,-23.125 z" />
+ <path
+ id="path3396"
+ style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:62.5px;font-family:'Avenir LT Std';-inkscape-font-specification:'Avenir LT Std Ultra-Bold'"
+ d="m 335.33789,1.125 -9.375,0 0,29.625 9.375,0 0,-29.625 z M 324.90039,40 c 0,3.1875 2.5625,5.75 5.75,5.75 3.1875,0 5.75,-2.5625 5.75,-5.75 0,-3.1875 -2.5625,-5.75 -5.75,-5.75 -3.1875,0 -5.75,2.5625 -5.75,5.75 z" />
+ <path
+ id="path3398"
+ style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:62.5px;font-family:'Avenir LT Std';-inkscape-font-specification:'Avenir LT Std Ultra-Bold'"
+ d="m 402.29004,45.375 -18.125,0 c -7.875,0 -16.625,-3.0625 -16.625,-12.3125 0,-5.75 3.875,-10.0625 9.6875,-10.8125 l 0,-0.125 c -4.5625,-1.4375 -7.625,-4.8125 -7.625,-9.75 0,-9.625 8.4375,-11.25 16.1875,-11.25 l 16.5,0 0,44.25 z m -9.75,-36 -6.625,0 c -3.0625,0 -6.5625,0.9375 -6.5625,4.625 0,3.5625 3.125,4.8125 6.125,4.8125 l 7.0625,0 0,-9.4375 z m 0,17.6875 -7.375,0 c -3.1875,0 -7.875,0.6875 -7.875,4.875 0,3.875 3.4375,5.1875 6.5,5.1875 l 8.75,0 0,-10.0625 z" />
+ <path
+ id="path3400"
+ style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:62.5px;font-family:'Avenir LT Std';-inkscape-font-specification:'Avenir LT Std Ultra-Bold'"
+ d="m 439.62988,45.375 -31.1875,0 0,-9 21.4375,0 0,-9 -19.1875,0 0,-9 19.1875,0 0,-8.25 -20.3125,0 0,-9 30.0625,0 0,44.25 z" />
+ <path
+ id="path3402"
+ style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:62.5px;font-family:'Avenir LT Std';-inkscape-font-specification:'Avenir LT Std Ultra-Bold'"
+ d="m 456.05859,45.375 9.75,0 0,-35.625 12.625,0 0,-8.625 -35,0 0,8.625 12.625,0 0,35.625 z" />
+ <path
+ id="path3404"
+ style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:62.5px;font-family:'Avenir LT Std';-inkscape-font-specification:'Avenir LT Std Ultra-Bold'"
+ d="m 473.08496,45.375 10.75,0 3.6875,-9.375 17.1875,0 3.8125,9.375 11,0 -19.25,-44.25 -8.0625,0 -19.125,44.25 z m 28.3125,-17.625 -10.8125,0 5.375,-13.75 5.4375,13.75 z" />
+ <path
+ id="path3406"
+ style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:62.5px;font-family:'Avenir LT Std';-inkscape-font-specification:'Avenir LT Std Ultra-Bold'"
+ d="m 537.97461,1.125 -9.375,0 0,29.625 9.375,0 0,-29.625 z M 527.53711,40 c 0,3.1875 2.5625,5.75 5.75,5.75 3.1875,0 5.75,-2.5625 5.75,-5.75 0,-3.1875 -2.5625,-5.75 -5.75,-5.75 -3.1875,0 -5.75,2.5625 -5.75,5.75 z" />
+ </g>
+</svg>
diff --git a/configs/conferences/33c3/assets/min/f-beta.svg b/configs/conferences/33c3/assets/min/f-beta.svg
new file mode 100644
index 0000000..f3fe1a9
--- /dev/null
+++ b/configs/conferences/33c3/assets/min/f-beta.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 539.0371 46.5" height="46.5" width="539.037"><title>Live_Music</title><g style="line-height:559.99999046%;-inkscape-font-specification:'TeX Gyre Adventor, Normal';text-align:start" font-weight="800" font-size="62.5" font-family="Avenir LT Std" letter-spacing="0" word-spacing="0"><path style="-inkscape-font-specification:'Avenir LT Std Ultra-Bold'" d="M13.125 45.375H21.5l9.75-30.625h.125l9.75 30.625h8.688L62.75 1.125h-9.875L45.437 30.25h-.124L36.124 1.125h-9.063L17.813 29.5h-.125L10.625 1.125H0l13.125 44.25zM60.976 45.375h10.75L75.413 36h17.188l3.812 9.375h11l-19.25-44.25h-8.062l-19.125 44.25zM89.288 27.75H78.476L83.85 14l5.437 13.75zM147.303 45.375h-9.75V27.687h-4.813l-9.25 17.688h-11.687l11.25-18.688c-6.25-1.125-9.563-5.937-9.563-12.125 0-10.312 7.625-13.437 16.688-13.437h17.125v44.25zm-9.75-36h-6.375c-3.563 0-7.563.688-7.563 5.125 0 4.813 4.625 4.938 8.188 4.938h5.75V9.374zM152.33 45.375h9.75v-31.5h.125l19.313 31.5h12.75V1.125h-9.75v30.75h-.125L165.58 1.125h-13.25v44.25zM203.108 45.375h9.75V1.125h-9.75v44.25zM263.726 45.375h-9.75v-31.5h-.125l-19.313 31.5h-12.75V1.125h9.75v30.75h.125l18.813-30.75h13.25v44.25zM270.316 19.125h17.313v9h-7.938v7.188c1.813 1 4.938 2.187 9.188 2.187 8.312 0 13.75-6 13.75-14.25S297.19 9 288.879 9c-4.938 0-8.125 1.438-10.75 4.188l-6.875-7.5C275.69 1.563 281.879 0 288.879 0c13.812 0 23.875 9.063 23.875 23.25 0 14.188-10.063 23.25-23.875 23.25-6.5 0-12.813-1.25-18.563-4.25V19.125zM335.338 1.125h-9.375V30.75h9.375V1.125zM324.9 40a5.735 5.735 0 0 0 5.75 5.75A5.735 5.735 0 0 0 336.4 40a5.735 5.735 0 0 0-5.75-5.75A5.735 5.735 0 0 0 324.9 40zM402.29 45.375h-18.125c-7.875 0-16.625-3.063-16.625-12.313 0-5.75 3.875-10.062 9.688-10.812v-.125c-4.563-1.438-7.625-4.813-7.625-9.75 0-9.625 8.437-11.25 16.187-11.25h16.5v44.25zm-9.75-36h-6.625c-3.062 0-6.562.938-6.562 4.625 0 3.563 3.125 4.813 6.125 4.813h7.062V9.374zm0 17.688h-7.375c-3.187 0-7.875.687-7.875 4.875 0 3.875 3.438 5.187 6.5 5.187h8.75V27.062zM439.63 45.375h-31.188v-9h21.438v-9h-19.188v-9h19.188v-8.25h-20.313v-9h30.063v44.25zM456.059 45.375h9.75V9.75h12.625V1.125h-35V9.75h12.625v35.625zM473.085 45.375h10.75L487.522 36h17.188l3.812 9.375h11l-19.25-44.25h-8.062l-19.125 44.25zm28.312-17.625h-10.812L495.96 14l5.437 13.75zM537.975 1.125H528.6V30.75h9.375V1.125zM527.537 40a5.735 5.735 0 0 0 5.75 5.75 5.735 5.735 0 0 0 5.75-5.75 5.735 5.735 0 0 0-5.75-5.75 5.735 5.735 0 0 0-5.75 5.75z"/></g></svg> \ No newline at end of file
diff --git a/configs/conferences/33c3/main.less b/configs/conferences/33c3/main.less
index 703c8bd..e5269c6 100644
--- a/configs/conferences/33c3/main.less
+++ b/configs/conferences/33c3/main.less
@@ -281,6 +281,13 @@ body.multiview .cell {
}
+.functions-wrap {
+ .beta {
+ .svg-replace("assets/min/f-beta.svg");
+ margin-bottom: 30px;
+ height: 50%;
+ }
+}
nav .button-wrapper > .btn {
height: 75px;
diff --git a/template/assemblies/switcher/dash.phtml b/template/assemblies/switcher/dash.phtml
index a597ad4..164af12 100644
--- a/template/assemblies/switcher/dash.phtml
+++ b/template/assemblies/switcher/dash.phtml
@@ -1 +1,29 @@
-<h2 style="text-align: center; margin: 40px 0;">DASH-Format-Selector coming soon</h1>
+<div class="container-fluid">
+
+ <div class="notes well">
+ <h3 class="beta">WARNING! BETA!</h3>
+ <p><a href="https://en.wikipedia.org/wiki/Dynamic_Adaptive_Streaming_over_HTTP">DASH</a> is an adaptive-bitrate HTTP-based streaming solution, that is (unlike existing proprietary solutions such as HLS) internationally standardized.</p>
+ <p>Support for DASH in open source software such as ffmpeg is still pretty rough, so consider this a technology-preview, it's not yet a stable solution.</p>
+ <p>Please report your experience to <a href="https://twitter.com/c3streaming">@c3streaming</a>, but please don't expect full support.</p>
+ </div>
+
+
+ <div class="directlinks">
+ <h3>Direct links</h3>
+
+ <div class="row">
+ <div class="col-lg-3 col-md-4 col-lg-5 col-xs-12">
+
+ <div class="btn-group" role="group">
+ <div class="btn btn-primary" disabled>DASH</div>
+ <a href="<?=h($room->getDashManifestUrl())?>" target="_blank" class="btn btn-default">
+ <span class="fa fa-flask"></span>
+ Manifest
+ </a>
+ </div>
+
+ </div>
+ </div>
+ </div>
+
+</div>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 04:52:59 +0000