making streamlanding page go live

diff --git a/2016/live/confirmation.html b/2016/live/confirmation.html
new file mode 100755 (executable)
index 0000000..2ecceb4
--- /dev/null
+++ b/2016/live/confirmation.html
@@ -0,0 +1,29 @@
+<!--#include virtual="/2016/includes/header.html"-->
+
+<title>LibrePlanet 2015 &mdash; LP16 announcements Confirmation</title>
+
+<!--#include virtual="/2016/includes/banner.html"-->
+<!--#include virtual="/2016/includes/sidebar.html"-->
+
+<h1>LibrePlanet 2016 announcements</h1>
+
+<div class="row margin-top">
+  <div class="col-sm-8">
+       <p>You'll be the first to get news about LibrePlanet 2016.</p>
+
+       <div class="alert alert-info margin-top">
+         <p>
+               <span class="glyphicon glyphicon-inbox"></span>
+               <strong>&nbsp;Please check your email now for the confirmation link.</strong>
+         </p>
+       </div>
+
+       <!--#include virtual="/2016/includes/live_menu.html" -->
+  </div>
+</div>
+
+
+<!--#include virtual="/2016/includes/footer.html"-->
+<!--#include virtual="/2016/includes/common_js.html"-->
+<!--#include virtual="/2016/includes/close.html" -->
+

diff --git a/2016/live/index.html b/2016/live/index.html
index 3e592aae7c361fc1fadd23d3b37443877b989f4c..a5470dd20f9502a536d570d7434b6020c545c356 100755 (executable)
--- a/2016/live/index.html
+++ b/2016/live/index.html
@@ -1,18 +1,51 @@
 <!--#include virtual="/2016/includes/header.html"-->
 
-<title>Streaming</title>
+<title>LibrePlanet 2015 ~ Live</title>
 
 <!--#include virtual="/2016/includes/banner.html"-->
 <!--#include virtual="/2016/includes/sidebar.html"-->
 
-<h1>Streaming starts March 19</h1>
-<h3>Even if you can't make it to LibrePlanet, you'll be able to watch and chat from here.</p><p>You're also invited to make it a social event by <a href="https://www.libreplanet.org/conference/libreluna">organizing a LibreLuna streaming party</a>.</h3>
+<h1>LibrePlanet 2016 - Live</h1>
 
-<img style="display: block; margin: 50px auto 0 auto; width: 30%;" src="//static.fsf.org/nosvn/libreplanet/hypno-tv.svg">
+<div class="row margin-top">
+  <div class="col-sm-8"> <!-- start of main content -->
 
+    <noscript>
+      <p>
+        Our conference streaming web interface requires JavaScript, but
+        all of our streams are readily available on
+        <a href="http://live.fsf.org">
+          live.fsf.org
+        </a>
+        and can be played with the video client of your
+        choice, such as VLC or mplayer.
+      </p>
+      <p>
+        To stream the Room 123 sessions, you could run this in your
+        terminal:
+        <pre>
+          vlc http://live.fsf.org/room123.ogv
+        </pre>
+      </p>
+    </noscript>
 
+    <div id="stream"></div>
+
+    <iframe src="https://irc0d.libreplanet.org/irc/irc.freenode.net/?theme=mini&amp;#libreplanet"
+            class="irc-client">
+    </iframe>
+  </div> <!-- end of main content -->
+
+  <div class="col-sm-4"> <!-- start of right sidebar column -->
+    <!--#include virtual="/2016/includes/live_sidebar.html" -->
+  </div> <!-- end of right sidebar column -->
+</div>
 
 <!--#include virtual="/2016/includes/footer.html"-->
 <!--#include virtual="/2016/includes/common_js.html"-->
-<!--#include virtual="/2016/includes/streaming_js.html"-->
+<script type="text/javascript" src="/2016/assets/js/mithril.min.js"></script>
+<script type="text/javascript" src="/2016/assets/js/stream.js"></script>
+<script type="text/javascript">
+$("#p-sessions").addClass("active").text("Sessions");
+</script>
 <!--#include virtual="/2016/includes/close.html" -->

diff --git a/2016/live/menu.html b/2016/live/menu.html
new file mode 100755 (executable)
index 0000000..2476b56
--- /dev/null
+++ b/2016/live/menu.html
@@ -0,0 +1,28 @@
+<!--#include virtual="/server/2016/header.html"-->
+
+<title>LibrePlanet 2016 &mdash; Live</title>
+
+<!--#include virtual="/server/2016/banner.html"-->
+<!--#include virtual="/server/2016/sidebar.html"-->
+
+<h1> Menu </h1>
+
+<div class="row margin-top">
+  <div class="col-sm-8">
+
+       <div class="list-group text-center text-thick">
+         <a class="list-group-item alt-a" href=."/room123.html">Room 123</a>
+         <a class="list-group-item alt-a" href="./room141.html" >Room 141</a>
+         <a class="list-group-item alt-a" href="./room155.html" >Room 155</a>
+       </div>
+
+  </div>
+  <div class="col-sm-4"> <!-- start of sidebar column -->
+       <!--#include virtual="/server/2016/live_sidebar.html" -->
+  </div> <!-- end of sidebar column -->
+</div>
+
+
+<!--#include virtual="/server/2016/footer.html"-->
+<!--#include virtual="/server/2016/common_js.html"-->
+<!--#include virtual="/server/2016/close.html" -->

diff --git a/2016/live/room123.html b/2016/live/room123.html
new file mode 100755 (executable)
index 0000000..49daf21
--- /dev/null
+++ b/2016/live/room123.html
@@ -0,0 +1,58 @@
+<!--#include virtual="/2016/includes/header.html"-->
+
+<title>LibrePlanet 2016 &mdash; Live &mdash; Room 123</title>
+
+<!--#include virtual="/2016/includes/banner.html"-->
+<!--#include virtual="/2016/includes/sidebar.html"-->
+
+<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://live2.fsf.org/slides-123.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="/2016/includes/live_menu.html" -->
+       <div class="panel panel-default">
+         <div class="panel-body text-center">
+               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>
+
+       <ul>
+         <li>Conference-wide Freenode IRC channel: <strong>#libreplanet</strong></li>
+         <li>Freenode IRC channel for Room 123: <strong>#libreplanet_room123</strong></li>
+         <li>Conference hashtag for <a href="https://fsf.org/twitter">microblogging</a>: <strong>#lp2016</strong></li>
+       </ul>
+
+       <div id="kiwiirc-widget"><!-- Start of Kiwiirc widget -->
+         <h2> IRC </h2>
+         <iframe src="https://irc0d.libreplanet.org/irc/irc.freenode.net/?theme=mini&amp;#libreplanet_room123"
+                  class="irc-client">
+          </iframe>
+       </div><!-- End of Kiwiirc widget -->
+  </div> <!-- end of main content -->
+
+  <div class="col-sm-4"> <!-- start of right sidebar column -->
+       <!--#include virtual="/2016/includes/live_sidebar.html" -->
+  </div> <!-- end of right sidebar column -->
+</div>
+
+
+<!--#include virtual="/2016/includes/footer.html"-->
+<!--#include virtual="/2016/includes/common_js.html"-->
+<script type="text/javascript" src="/2016/assets/js/stream.js"></script>
+<script type="text/javascript">
+ $("#room123").addClass("active").html("<strong>Room 123</strong>");
+ monitorStream('/test.webm');
+</script>
+<!--#include virtual="/2016/includes/close.html" -->

diff --git a/2016/live/room141.html b/2016/live/room141.html
new file mode 100755 (executable)
index 0000000..f56fb17
--- /dev/null
+++ b/2016/live/room141.html
@@ -0,0 +1,55 @@
+<!--#include virtual="/2016/includes/header.html"-->
+
+<title>LibrePlanet 2016 &mdash; Live &mdash; Room 141</title>
+
+<!--#include virtual="/2016/includes/banner.html"-->
+<!--#include virtual="/2016/includes/sidebar.html"-->
+
+<h1>Room 141 </h1>
+
+<div class="row margin-top">
+  <div class="col-sm-8">
+       <div class="thumbnail"> <!-- start Live Player -->
+           <video class="lp-video" controls>
+                 <source
+                     src="http://live.fsf.org/room141.ogv"
+                     type="video/ogg" />
+                 <p><em>Your browser does not support the video
+                         tag, <a href="http://live.fsf.org/room141.ogv">
+                           [ please download ]</a> the video instead.</em></p>
+           </video>
+       </div>  <!-- end Live Player -->
+       <!--#include virtual="/2016/includes/live_menu.html" -->
+       <div class="panel panel-default">
+         <div class="panel-body text-center">
+               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>
+
+       <ul>
+         <li>Conference-wide Freenode IRC channel: <strong>#libreplanet</strong></li>
+         <li>Freenode IRC channel for Room 141: <strong>#libreplanet_room141</strong></li>
+         <li>Conference hashtag for <a href="https://fsf.org/twitter">microblogging</a>: <strong>#lp2016</strong></li>
+       </ul>
+
+       <div id="kiwiirc-widget"><!-- Start of Kiwiirc widget -->
+         <h2> IRC </h2>
+         <iframe src="https://irc0d.libreplanet.org/irc/irc.freenode.net/?&amp;theme=mini#libreplanet_room141"
+                  class="irc-client">
+          </iframe>
+       </div><!-- End of Kiwiirc widget -->
+  </div> <!-- end of main content -->
+
+  <div class="col-sm-4"> <!-- start of right sidebar column -->
+       <!--#include virtual="/2016/includes/live_sidebar.html" -->
+  </div> <!-- end of right sidebar column -->
+</div>
+
+
+<!--#include virtual="/2016/includes/footer.html"-->
+<!--#include virtual="/2016/includes/common_js.html"-->
+<script type="text/javascript">
+  $("#room141").addClass("active").html("<strong>Room 141</strong>");
+</script>
+<!--#include virtual="/2016/includes/close.html" -->

diff --git a/2016/live/room155.html b/2016/live/room155.html
new file mode 100755 (executable)
index 0000000..1563036
--- /dev/null
+++ b/2016/live/room155.html
@@ -0,0 +1,55 @@
+<!--#include virtual="/2016/includes/header.html"-->
+
+<title>LibrePlanet 2016 &mdash; Live &mdash; Room 155</title>
+
+<!--#include virtual="/2016/includes/banner.html"-->
+<!--#include virtual="/2016/includes/sidebar.html"-->
+
+<h1>Room 155 </h1>
+
+<div class="row margin-top">
+  <div class="col-sm-8">
+       <div class="thumbnail"> <!-- start Live Player -->
+         <video class="lp-video" controls>
+               <source
+                   src="http://live.fsf.org/room155.ogv"
+                   type="video/ogg" />
+               <p><em>Your browser does not support the video
+                       tag, <a href="http://live.fsf.org/room155.ogv">
+                         [ please download ]</a> the video instead.</em></p>
+         </video>
+       </div>  <!-- end Live Player -->
+       <!--#include virtual="/2016/includes/live_menu.html" -->
+       <div class="panel panel-default">
+         <div class="panel-body text-center">
+               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>
+
+       <ul>
+         <li>Conference-wide Freenode IRC channel: <strong>#libreplanet</strong></li>
+         <li>Freenode IRC channel for Room 155: <strong>#libreplanet_room155</strong></li>
+         <li>Conference hashtag for <a href="https://fsf.org/twitter">microblogging</a>: <strong>#lp2016</strong></li>
+       </ul>
+
+       <div id="kiwiirc-widget"><!-- Start of Kiwiirc widget -->
+         <h2> IRC </h2>
+         <iframe src="https://irc0d.libreplanet.org/irc/irc.freenode.net/?&amp;theme=mini#libreplanet_room155"
+                  class="irc-client">
+          </iframe>
+       </div><!-- End of Kiwiirc widget -->
+  </div> <!-- end of main content -->
+
+  <div class="col-sm-4"> <!-- start of right sidebar column -->
+       <!--#include virtual="/2016/includes/live_sidebar.html" -->
+  </div> <!-- end of right sidebar column -->
+</div>
+
+
+<!--#include virtual="/2016/includes/footer.html"-->
+<!--#include virtual="/2016/includes/common_js.html"-->
+<script type="text/javascript">
+  $("#room155").addClass("active").html("<strong>Room 155</strong>");
+</script>
+<!--#include virtual="/2016/includes/close.html" -->