Add crazy streaming JS at the last minute! holy crap!

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

diff --git a/2015/live/index.html b/2015/live/index.html
old mode 100644 (file)
new mode 100755 (executable)
index 03ff5b8..33e93f6
--- a/2015/live/index.html
+++ b/2015/live/index.html
@@ -1,45 +1,31 @@
-  <!--#include virtual="/server/2015/header.html"-->
-
-
-  <div id="lp-content" class="col-sm-9"> <!-- start of content column -->
-                       <h1>LibrePlanet from anywhere</h1>
-<p>During LibrePlanet, this page will host streaming video of all sessions. If you plan to participate remotely, please bookmark it now and check back during the conference.</p>
-
-<p>We're creating our most advanced-ever free software streaming system for LibrePlanet 2014. We'd appreciate your donations to help make it as great as possible. Can you chip in?</p>
-
-<p style="text-align:center"><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=14"><img src="//static.fsf.org/nosvn/donate.en.png" alt="Donate to the FSF" style="align:left; padding: 15px"></a></p>
-
-<br>
-<p>To tide you over until the conference, here's a video about the LibrePlanet, created by a volunteer who attended in 2013.</p>
-                       <div class="row"> <!-- start LP video -->
-                         <div class="col-sm-12">
-                               <div class="thumbnail">
-                                 <video class="lp-video" controls>
-                                       <source
-                                          src="https://media.libreplanet.org/mgoblin_media/media_entries/50/LibrePlanet__9B__848x477__1.webm"
-                                          type="video/webm" />
-                                         <p><em>Your browser does not support the video
-                                               tag, <a href="https://media.libreplanet.org/mgoblin_media/media_entries/50/LibrePlanet__9B__848x477__1.webm">
-                                               [ please download ]</a> the video instead.</em></p>
-                                 </video>
-                                 <div class="caption">
-                                       <p>
-                                         <em>
-                                               This video is licensed
-                                               under <a href="http://creativecommons.org/licenses/by-sa/3.0/">CC
-                                               BY-SA 3.0</a> by Dan Fitzmartin and the Free
-                                               Software
-                                               Foundation. <a href="https://media.libreplanet.org/mgoblin_media/media_entries/50/LibrePlanet__9B__848x477__1.webm">Download
-                                               the video</a>.
-                                       </em></p>
-                                 </div>
-                               </div>
-                         </div>
-                       </div> <!-- end LP video -->
-
-                 </div> <!-- end of content column -->
-                 <!--#include virtual="/server/2015/footer.html"-->
+<!--#include virtual="/server/2015/header.html"-->
+
+<title>LibrePlanet 2015 &mdash; Live</title>
+
+<!--#include virtual="/server/2015/banner.html"-->
+<!--#include virtual="/server/2015/sidebar.html"-->
+
+<h1>LibrePlanet 2015 &mdash; Live</h1>
+
+<div class="row margin-top">
+  <div class="col-sm-8"> <!-- start of main content -->
+
+    <div id="stream"></div>
+
+    <iframe src="https://www0.libreplanet.org/kiwi/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="/server/2015/live_sidebar.html" -->
+  </div> <!-- end of right sidebar column -->
+</div>
+
+<!--#include virtual="/server/2015/footer.html"-->
 <!--#include virtual="/server/2015/common_js.html"-->
+<script type="text/javascript" src="/2015/assets/js/mithril.min.js"></script>
+<script type="text/javascript" src="/2015/assets/js/stream.js"></script>
 <script type="text/javascript">
 $("#p-sessions").addClass("active").text("Sessions");
 </script>