craigt trivia description, current

[libreplanet-static.git] / 2015 / live / room123.html

diff --git a/2015/live/room123.html b/2015/live/room123.html
old mode 100644 (file)
new mode 100755 (executable)
index 12845f0..e158bc2
--- a/2015/live/room123.html
+++ b/2015/live/room123.html
@@ -7,22 +7,23 @@
 
 <h1> Room 123 </h1>
 
+<p>Now presenting: <strong id="speaker-name"></strong> - "<i id="talk-title"></i>"</p>
+<p id="viewer-counter"></p>
+
 <div class="row margin-top">
   <div class="col-sm-8"> <!-- start of main content -->
-       <div class="thumbnail"> <!-- start Live Player -->
-         <video class="lp-video" controls>
-               <source
-                  src="http://live.fsf.org/room123.ogv"
-                  type="video/ogg" />
-               <p><em>Your browser does not support the video
-                       tag, <a href="http://live.fsf.org/room123.ogv">
-                         [ please download ]</a> the video instead.</em></p>
-         </video>
-       </div>  <!-- end Live Player -->
+    <div class="thumbnail"> <!-- start Live Player -->
+      <video class="lp-video" controls>
+       <source src="http://live.fsf.org/test.webm" type="video/webm" />
+       <p><em>Your browser does not support the video
+         tag, <a href="http://live.fsf.org/room123.ogv">
+         [ please download ]</a> the video instead.</em></p>
+      </video>
+    </div>  <!-- end Live Player -->
        <!--#include virtual="/server/2015/live_menu.html" -->
        <div class="panel panel-default">
          <div class="panel-body text-center">
-               Problem stream? Contact <strong><a class="alt-a" href="mailto:streaming@fsf.org">streaming@fsf.org</a></strong>
+               Problem streaming? Contact <strong><a class="alt-a" href="mailto:streaming@fsf.org">streaming@fsf.org</a></strong>
          </div>
        </div>
        <p>Join the discussion online!</p>
@@ -35,7 +36,9 @@
 
        <div id="kiwiirc-widget"><!-- Start of Kiwiirc widget -->
          <h2> IRC </h2>
-         <iframe src="https://kiwiirc.com/client/irc.freenode.net/?&amp;theme=basic#libreplanet_room123" style="border:0; width:100%; height:450px"></iframe>
+         <iframe src="https://www0.libreplanet.org/kiwi/irc.freenode.net/?&amp;theme=mini#libreplanet_room123"
+                  class="irc-client">
+          </iframe>
        </div><!-- End of Kiwiirc widget -->
   </div> <!-- end of main content -->
 
@@ -47,7 +50,9 @@
 
 <!--#include virtual="/server/2015/footer.html"-->
 <!--#include virtual="/server/2015/common_js.html"-->
+<script type="text/javascript" src="/2015/assets/js/stream.js"></script>
 <script type="text/javascript">
-  $("#room123").addClass("active").html("<strong>Room 123</strong>");
+ $("#room123").addClass("active").html("<strong>Room 123</strong>");
+ monitorStream('/test.webm');
 </script>
 <!--#include virtual="/server/2015/close.html" -->