From e30ee83f72d9e6bb71278698b9845bb6ebadc71d Mon Sep 17 00:00:00 2001
From: k054 <k@fsf.org>
Date: Tue, 22 Mar 2016 13:34:41 -0400
Subject: [PATCH] removing live2 (was use as sandbox) and making a minot tweak
 on the js stream file

---
 2016/assets/js/stream.js     |  8 ++---
 2016/live2/confirmation.html | 29 ------------------
 2016/live2/index.html        | 51 -------------------------------
 2016/live2/menu.html         | 28 -----------------
 2016/live2/room123.html      | 58 ------------------------------------
 2016/live2/room141.html      | 55 ----------------------------------
 2016/live2/room155.html      | 55 ----------------------------------
 7 files changed, 2 insertions(+), 282 deletions(-)
 delete mode 100755 2016/live2/confirmation.html
 delete mode 100755 2016/live2/index.html
 delete mode 100755 2016/live2/menu.html
 delete mode 100755 2016/live2/room123.html
 delete mode 100755 2016/live2/room141.html
 delete mode 100755 2016/live2/room155.html

diff --git a/2016/assets/js/stream.js b/2016/assets/js/stream.js
index 499a2b34..d50192b2 100644
--- a/2016/assets/js/stream.js
+++ b/2016/assets/js/stream.js
@@ -143,12 +143,8 @@ app.streams = [
     speakerMount: "/room-155-stream.webm",
     desktopMount: "/room-155-slides.webm",
     ircChannel: "#libreplanet_room155"
-  }, {
-    name: "Room 144",
-    speakerMount: "/room-144-slides.webm",
-    desktopMount: "/room-144-stream.webm",
-    ircChannel: "#libreplanet_room144"
-  }    
+  }
+
 
 
     
diff --git a/2016/live2/confirmation.html b/2016/live2/confirmation.html
deleted file mode 100755
index 2ecceb4f..00000000
--- a/2016/live2/confirmation.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--#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/live2/index.html b/2016/live2/index.html
deleted file mode 100755
index a5470dd2..00000000
--- a/2016/live2/index.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--#include virtual="/2016/includes/header.html"-->
-
-<title>LibrePlanet 2015 ~ Live</title>
-
-<!--#include virtual="/2016/includes/banner.html"-->
-<!--#include virtual="/2016/includes/sidebar.html"-->
-
-<h1>LibrePlanet 2016 - Live</h1>
-
-<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"-->
-<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/live2/menu.html b/2016/live2/menu.html
deleted file mode 100755
index 2476b56d..00000000
--- a/2016/live2/menu.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--#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/live2/room123.html b/2016/live2/room123.html
deleted file mode 100755
index 49daf212..00000000
--- a/2016/live2/room123.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!--#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/live2/room141.html b/2016/live2/room141.html
deleted file mode 100755
index f56fb17d..00000000
--- a/2016/live2/room141.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--#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/live2/room155.html b/2016/live2/room155.html
deleted file mode 100755
index 15630360..00000000
--- a/2016/live2/room155.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--#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" -->
-- 
2.25.1