From: Andrew Engelbrecht <andrew@fsf.org>
Date: Fri, 16 Feb 2018 18:55:53 +0000 (-0500)
Subject: updated rooms list for LP 2018
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=020415977dab4550536cc99c88b421df02431bea;p=libreplanet-static.git

updated rooms list for LP 2018
---

diff --git a/2018/live/menu.html b/2018/live/menu.html
index 9c31bd89..ceda3ace 100755
--- a/2018/live/menu.html
+++ b/2018/live/menu.html
@@ -11,9 +11,10 @@
   <div class="col-sm-8">
 
 	<div class="list-group text-center text-thick">
+	  <a class="list-group-item alt-a" href=."/room101.html">Room 101</a>
 	  <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>
+	  <a class="list-group-item alt-a" href="./room144.html">Room 144</a>
+	  <a class="list-group-item alt-a" href="./room155.html">Room 155</a>
 	</div>
 
   </div>
diff --git a/2018/live/room101.html b/2018/live/room101.html
new file mode 100755
index 00000000..7bdd276f
--- /dev/null
+++ b/2018/live/room101.html
@@ -0,0 +1,58 @@
+<!--#include virtual="/2018/includes/header.html"-->
+
+<title>LibrePlanet 2018 &mdash; Live &mdash; Room 101</title>
+
+<!--#include virtual="/2018/includes/banner.html"-->
+<!--#include virtual="/2018/includes/sidebar.html"-->
+
+<h1> Room 101 </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-101.webm" type="video/webm" />
+	<p><em>Your browser does not support the video
+	  tag, <a href="http://live.fsf.org/room101.ogv">
+	  [ please download ]</a> the video instead.</em></p>
+      </video>
+    </div>  <!-- end Live Player -->
+	<!--#include virtual="/2018/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 101: <strong>#libreplanet_room101</strong></li>
+	  <li>Conference hashtag for <a href="https://fsf.org/twitter">microblogging</a>: <strong>#libreplanet</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_room101"
+                  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="/2018/includes/live_sidebar.html" -->
+  </div> <!-- end of right sidebar column -->
+</div>
+
+
+<!--#include virtual="/2018/includes/footer.html"-->
+<!--#include virtual="/2018/includes/common_js.html"-->
+<script type="text/javascript" src="/2018/assets/js/stream.js"></script>
+<script type="text/javascript">
+ $("#room101").addClass("active").html("<strong>Room 101</strong>");
+ monitorStream('/test.webm');
+</script>
+<!--#include virtual="/2018/includes/close.html" -->
diff --git a/2018/live/room141.html b/2018/live/room144.html
similarity index 82%
rename from 2018/live/room141.html
rename to 2018/live/room144.html
index c066f865..c5919223 100755
--- a/2018/live/room141.html
+++ b/2018/live/room144.html
@@ -1,21 +1,21 @@
 <!--#include virtual="/2018/includes/header.html"-->
 
-<title>LibrePlanet 2018 &mdash; Live &mdash; Room 141</title>
+<title>LibrePlanet 2018 &mdash; Live &mdash; Room 144</title>
 
 <!--#include virtual="/2018/includes/banner.html"-->
 <!--#include virtual="/2018/includes/sidebar.html"-->
 
-<h1>Room 141 </h1>
+<h1>Room 144 </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"
+		      src="http://live.fsf.org/room144.ogv"
 		      type="video/ogg" />
 		  <p><em>Your browser does not support the video
-			  tag, <a href="http://live.fsf.org/room141.ogv">
+			  tag, <a href="http://live.fsf.org/room144.ogv">
 			    [ please download ]</a> the video instead.</em></p>
 	    </video>
 	</div>  <!-- end Live Player -->
@@ -29,13 +29,13 @@
 
 	<ul>
 	  <li>Conference-wide Freenode IRC channel: <strong>#libreplanet</strong></li>
-	  <li>Freenode IRC channel for Room 141: <strong>#libreplanet_room141</strong></li>
+	  <li>Freenode IRC channel for Room 144: <strong>#libreplanet_room144</strong></li>
 	  <li>Conference hashtag for <a href="https://fsf.org/twitter">microblogging</a>: <strong>#libreplanet</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"
+	  <iframe src="https://irc0d.libreplanet.org/irc/irc.freenode.net/?&amp;theme=mini#libreplanet_room144"
                   class="irc-client">
           </iframe>
 	</div><!-- End of Kiwiirc widget -->
@@ -50,6 +50,6 @@
 <!--#include virtual="/2018/includes/footer.html"-->
 <!--#include virtual="/2018/includes/common_js.html"-->
 <script type="text/javascript">
-  $("#room141").addClass("active").html("<strong>Room 141</strong>");
+  $("#room144").addClass("active").html("<strong>Room 144</strong>");
 </script>
 <!--#include virtual="/2018/includes/close.html" -->