Merge branch 'master' of ssh://git.xpub.nl:2501/XPUB/issue.xpub.nl

master
Sandra 5 years ago
commit 51bcaf5e8d

@ -40,12 +40,12 @@
</audio>
</div>
<div id="table_content_04">
<li id="track_4_1"> &#8674; Public Damage No. 2992 &#8674; 0'00''&#8674; by Clara &#8674;</li>
<li id="track_4_1"> &#8674; Public Damage No. 2992 &#8674; 2'17''&#8674; by Clara &#8674;</li>
<li id="track_4_2"> &#8674; SupraSignal: An audio piece of the unseen image &#8674; 0'00''&#8674; by Ioana &#8674;</li>
<li id="track_4_3"> &#8674; I can think with my own head &#8674; 0'00''&#8674; by Tisa &#8674;</li>
<li id="track_4_4"> &#8674; M.su &#8674; 0'00''&#8674; by Mika &#8674;</li>
<li id="track_4_3"> &#8674; I can think with my own head &#8674; 1'28''&#8674; by Tisa &#8674;</li>
<li id="track_4_4"> &#8674; M.su &#8674; 3'51''&#8674; by Mika &#8674;</li>
<li id="track_4_5"> &#8674; A shift of power &#8674; x'xx''&#8674; by Avital & Max &#8674;</li>
<li id="track_4_6"> &#8674; it/*talks &#8674; 4'00''&#8674; by Anna &#8674;</li>
<li id="track_4_6"> &#8674; out of reach &#8674; 4'00''&#8674; by Anna &#8674;</li>
</div>
</div>
</div>

@ -26,14 +26,14 @@
<div id="info"><div id="title"></div><div id="authors"></div>
</div>
<div id="implicancies_04">
<div id="implicancies_04" class="liveplayer">
<div id="resources" class=""><iframe name="resources" id="iframe" src='resources_04.html'></iframe></div>
<!-- <div id="info"><div id="title"></div><div id="authors"></div> -->
<div id="week_04">
<div class="schedule_04">PROGRAMME #12.4<br>04/06 at 16:00 (UTC+2)</div>
<div class="audio_04">
<audio controls>
<source src="archive_12.1.4.mp3" type="audio/mp3">
<source src="http://echo.lurk.org:999/radioimplicancies_live.ogg" type="audio/mp3">
<track default kind="captions"
srclang="en"
src="archive_12.1.4.vtt"/>
@ -63,7 +63,7 @@
<div class="previous"> &#8668;&#8668;&#8668;&#8668;&#8668;&#8668;&#8668;&#8668;&#8668;&#8668;&#8668;&#8668;&#8668;&#8668; ARCHIVE &#8669;&#8669;&#8669;&#8669;&#8669;&#8669;&#8669;&#8669;&#8669;&#8669;&#8669;&#8669;&#8669;&#8669;</div>
<div id="week_03" class="liveplayer">
<div id="week_03">
<!-- <script src="https://threejs.org/build/three.js"></script>
<script src="torusKnot.js"></script> -->
@ -240,9 +240,10 @@
<script>
player(document.querySelector("#week_02"));
player(document.querySelector("#week_01"));
liveplayer(document.querySelector("#week_03"));
player(document.querySelector("#week_03"));
liveplayer(document.querySelector("#week_04"));
document.querySelector("#iframe").addEventListener("load",function(){
document.querySelector("#shell_03").classList.remove("hidden");
document.querySelector("#resources").classList.remove("hidden");
});
document.querySelector("#iframe2").addEventListener("load",function(){
document.querySelector("#etherpad").classList.remove("hidden");

@ -39,7 +39,7 @@ function liveplayer (elt) {
iframe.src = d.artist;
}
} else if (iframe) {
iframe.src = "blank.html";
iframe.src = "resources_04.html";
}

Loading…
Cancel
Save