From 0851364a6bfec251fa192bd5fdda2341dacd0e04 Mon Sep 17 00:00:00 2001
From: Andrew Engelbrecht <andrew@fsf.org>
Date: Mon, 15 Mar 2021 17:33:47 -0400
Subject: [PATCH] enabling the 2021 live streaming page

it's currently behind an apache-level firewall
---
 2021/assets/js/stream.js | 30 +++++++++++++++---------------
 2021/live/index.html     | 21 +++------------------
 2 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/2021/assets/js/stream.js b/2021/assets/js/stream.js
index 09e63d1c..fbe07237 100644
--- a/2021/assets/js/stream.js
+++ b/2021/assets/js/stream.js
@@ -129,23 +129,23 @@ app.withVideo = function(id, callback) {
 
 app.streams = [
   {
-    name: "Back Bay Grand Room",
-    speakerMount: "/stream-room-grand.webm",
-    desktopMount: "/slides-room-grand.webm",
-    speakerSmallMount: "/stream-room-grand-480p.webm",
-    ircChannel: "#libreplanet_room_grand"
+    name: "Jupiter Room",
+    speakerMount: "/stream-room-jupiter.webm",
+    desktopMount: "/slides-room-jupiter.webm",
+    speakerSmallMount: "/stream-room-jupiter-480p.webm",
+    ircChannel: "#libreplanet_room_jupiter"
   }, {
-    name: "Freedom Room",
-    speakerMount: "/stream-room-freedom.webm",
-    desktopMount: "/slides-room-freedom.webm",
-    speakerSmallMount: "/stream-room-freedom-480p.webm",
-    ircChannel: "#libreplanet_room_freedom"
+    name: "Saturn Room",
+    speakerMount: "/stream-room-saturn.webm",
+    desktopMount: "/slides-room-saturn.webm",
+    speakerSmallMount: "/stream-room-saturn-480p.webm",
+    ircChannel: "#libreplanet_room_saturn"
   }, {
-    name: "Patriot Room",
-    speakerMount: "/stream-room-patriot.webm",
-    desktopMount: "/slides-room-patriot.webm",
-    speakerSmallMount: "/stream-room-patriot-480p.webm",
-    ircChannel: "#libreplanet_room_patriot"
+    name: "Neptune Room",
+    speakerMount: "/stream-room-neptune.webm",
+    desktopMount: "/slides-room-neptune.webm",
+    speakerSmallMount: "/stream-room-neptune-480p.webm",
+    ircChannel: "#libreplanet_room_neptune"
   }
 ];
 
diff --git a/2021/live/index.html b/2021/live/index.html
index 581e20cc..144ff718 100755
--- a/2021/live/index.html
+++ b/2021/live/index.html
@@ -10,22 +10,9 @@
 <div class="row margin-top">
   <div class="col-sm-8"> <!-- start of main content -->
 
-    <!--
-    <h2 style="margin-bottom: 10px;">Partner:</h2>
-    <div class="hover_img" style="margin-bottom: 40px;">
-      <img src="https://static.fsf.org/nosvn/libreplanet/sponsor-logos/pia.svg"  alt="The Private Internet Access logo." height="75%" width="75%">
-      <div class="right_text">
-        <p><strong><a href="https://www.privateinternetaccess.com/">Private Internet Access</a>, protecting your privacy online</strong></p>
-      </div>
-    </div>
-    -->
-
     <p>LibrePlanet 2021: Empowering Users is happening in the spring of 2021!</p>
-    <p>You can view this year's videos <a href="https://media.libreplanet.org/u/libreplanet/tag/libreplanet-2020-video/">in the archives.</a></p>
 
-    <!-- The Conference is not running at this time.
-
-    <p>Please note that all online participants in LibrePlanet 2021 interactions are expected to abide by the conference's <a href="https://libreplanet.org/2021/safe-space-policy/">safe space policy</a>.</p>    
+    <p>Please note that all online participants in LibrePlanet 2021 interactions are expected to abide by the conference's <a href="/2021/safe-space-policy/">safe space policy</a>.</p>
     <p>  <div class="panel-body">
 	    </div></p>
 
@@ -57,16 +44,14 @@ ffplay https://live.fsf.org/stream-room-patriot.webm
 
     <div id="stream"></div>
 
-    <iframe src="https://irc0d.libreplanet.org/irc/irc.freenode.net/?theme=mini&amp;#libreplanet"
+    <iframe src="https://irc.libreplanet.org/irc/"
             class="irc-client">
     </iframe>
 
     <div style="margin-top: 20px">
-        <p>To join other channels, such as <strong>#libreplanet_room_grand</strong>, copy and paste this text into the IRC client above after you connect to IRC: <strong>/join #libreplanet_room_grand</strong></p>
+        <p>To join channels specific to each room, make sure to register.</p>
     </div>
 
-    end The Conference is not running at this time. -->
-
   </div> <!-- end of main content -->
 
   <div class="col-sm-4"> <!-- start of right sidebar column -->
-- 
2.25.1