Base 2022 LP live pages on those used for 2021

That version is much closer to what we want this year, in terms of room
and stream names, the sidebar, and the scripting we set up.

diff --git a/2022/includes/live_sidebar.html b/2022/includes/live_sidebar.html
index e1ea369e432dde00089fa6595fed12a86b0afb7e..a993f047dcddf38a9eb8b475414d6178257fea4a 100644 (file)
--- a/2022/includes/live_sidebar.html
+++ b/2022/includes/live_sidebar.html
@@ -26,13 +26,44 @@
     <h3 class="panel-title">Visit the FSF Shop!</h3>
   </div>
   <div class="panel-body">
-       <center><a href="https://shop.fsf.org/tshirts-hoodies/libreplanet-2020-t-shirt"><img src="https://static.fsf.org/nosvn/libreplanet/2022/assets/tiny_shirt.png"></a></center>
+       <center><a style="border: none;" href="https://shop.fsf.org/tshirts-hoodies/libreplanet-2022-t-shirt"><img src="https://static.fsf.org/nosvn/libreplanet/2022/assets/tiny_shirt.png" alt="Picture of LibrePlanet T-Shirt."></a></center>
+        <div style="margin-top: 20px;"></div>
        <p>LibrePlanet 2022 is online this year, but that doesn't mean that you have to miss out on the <a href="https://shop.fsf.org/tshirts-hoodies/libreplanet-2022-t-shirt">annual conference T-shirt</a> or any of the other GNU and FSF gear! Let the world know you were "here" by picking up this year's T-shirt in the FSF shop.</p>
     </div>
 </div>
 <!-- end fsf shop box -->
 
-<!-- start LP20 signup -->
+<!-- start irc links bar -->
+<div id="irc-links-panel" class="panel panel-default" style="display: none">
+  <div class="panel-heading">
+       <h3 class="panel-title">IRC Links</h3>
+  </div>
+  <div class="panel-body">
+      <p>After connecting, copy each into IRC:</p>
+<pre style="background-color: rgba(55, 57, 58, 0.85); color: rgb(219, 214, 206)">/join #libreplanet_room_jupiter
+/join #libreplanet-room-saturn
+/join #libreplanet-room-neptune
+/join #libreplanet-room-hallway</pre>
+  </div>
+</div>
+<!-- end irc links bar -->
+
+<!-- start low res links bar -->
+<div class="panel panel-default">
+  <div class="panel-heading">
+       <h3 class="panel-title">Low Resolution Streams</h3>
+  </div>
+  <div class="panel-body">
+      <p>
+      <a href="https://live.fsf.org/stream-room-jupiter-lowres.webm">Jupiter</a> (480p)</br>
+      <a href="https://live.fsf.org/stream-room-saturn-lowres.webm">Saturn</a> (480p)</br>
+      <a href="https://live.fsf.org/stream-room-neptune-lowres.webm">Neptune</a> (480p)</br>
+      </p>
+  </div>
+</div>
+<!-- end low res links bar -->
+
+<!-- start LP22 signup -->
 <div class="panel panel-default">
   <div class="panel-heading">
        <h3 class="panel-title">Stay in the loop</h3>

diff --git a/2022/live/index.html b/2022/live/index.html
index a87b31808139b4a0640552299c6b7c94681cb057..2d23e319dbcbc7a999c719f3e2ea6dec97c3172d 100755 (executable)
--- a/2022/live/index.html
+++ b/2022/live/index.html
@@ -2,6 +2,10 @@
 
 <title>LibrePlanet 2022 ~ Live</title>
 
+<style>
+.special-irc { background-color: #282a2b; padding: 5px; margin-left: -5px; }
+</style>
+
 <!--#include virtual="/2022/includes/banner.html"-->
 <!--#include virtual="/2022/includes/sidebar.html"-->
 
@@ -10,22 +14,7 @@
 <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 2022 livestream has not started yet.</p>
-    <p>You can view this year's videos <a href="https://media.libreplanet.org/u/libreplanet/tag/libreplanet-2021-video/">in the archives.</a></p>
-
-    <!-- The Conference is not running at this time.
-
-    <p>Please note that all online participants in LibrePlanet 2020 interactions are expected to abide by the conference's <a href="https://libreplanet.org/2020/safe-space-policy/">safe space policy</a>.</p>    
+    <p>Please note that all online participants in LibrePlanet 2022 interactions are expected to abide by the conference's <a href="/2022/safe-space-policy/">safe space policy</a>.</p>
     <p>  <div class="panel-body">
            </div></p>
 
@@ -42,31 +31,37 @@
       <p>
        You can watch the streams directly by using vlc or some other media players with the following URLs:<br><br>
 
-       https://live.fsf.org/stream-room-grand.webm <br>
-       https://live.fsf.org/stream-room-freedom.webm <br>
-       https://live.fsf.org/stream-room-patriot.webm <br><br>
+        <strong>High resolution videos:</strong><br><br>
+
+        <a href="https://live.fsf.org/stream-room-jupiter.webm">https://live.fsf.org/stream-room-jupiter.webm</a><br>
+        <a href="https://live.fsf.org/stream-room-saturn.webm">https://live.fsf.org/stream-room-saturn.webm</a><br>
+        <a href="https://live.fsf.org/stream-room-neptune.webm">https://live.fsf.org/stream-room-neptune.webm</a><br><br>
+
+        <strong>Low resolution videos (480p):</strong><br><br>
+
+        <a href="https://live.fsf.org/stream-room-jupiter-lowres.webm">https://live.fsf.org/stream-room-jupiter-lowres.webm</a><br>
+        <a href="https://live.fsf.org/stream-room-saturn-lowres.webm">https://live.fsf.org/stream-room-saturn-lowres.webm</a><br>
+        <a href="https://live.fsf.org/stream-room-neptune-lowres.webm">https://live.fsf.org/stream-room-neptune-lowres.webm</a><br><br>
 
        or using something like this on a terminal:
 <pre>
-mpv https://live.fsf.org/stream-room-grand.webm
-mplayer https://live.fsf.org/stream-room-freedom.webm
-ffplay https://live.fsf.org/stream-room-patriot.webm
+mpv https://live.fsf.org/stream-room-jupiter.webm
+mplayer https://live.fsf.org/stream-room-saturn.webm
+ffplay https://live.fsf.org/stream-room-neptune.webm
 </pre>
       </p>
     </noscript>
 
     <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>For low resolution stream URLs, check the sidebar to the right.</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 -->
@@ -76,9 +71,9 @@ ffplay https://live.fsf.org/stream-room-patriot.webm
 
 <!--#include virtual="/2022/includes/footer.html"-->
 <!--#include virtual="/2022/includes/common_js.html"-->
-<script type="text/javascript" src="/2020/assets/js/mithril.min.js"></script>
-<script type="text/javascript" src="/2020/assets/js/stream.js"></script>
-<script type="text/javascript">
+<script src="/2022/assets/js/mithril.min.js"></script>
+<script src="/2022/assets/js/stream.js"></script>
+<script>
 $("#p-sessions").addClass("active").text("Sessions");
 </script>
 <!--#include virtual="/2022/includes/livestream_js.html"-->

diff --git a/2022/live/jupiter/index.html b/2022/live/jupiter/index.html
new file mode 100755 (executable)
index 0000000..29d2dd4
--- /dev/null
+++ b/2022/live/jupiter/index.html
@@ -0,0 +1,49 @@
+<!--#include virtual="/2022/includes/header.html"-->
+
+<title>LibrePlanet 2022 ~ Live</title>
+
+<style>
+.astronaut {
+  display: none;
+}
+</style>
+
+<!--#include virtual="/2022/includes/banner.html"-->
+<!--#include virtual="/2022/includes/sidebar.html"-->
+
+<h1>LibrePlanet 2022 - Live</h1>
+
+<div class="row margin-top">
+  <div class="col-sm-12"> <!-- start of main content -->
+
+    <p>Please note that all online participants in LibrePlanet 2022 interactions are expected to abide by the conference's <a href="/2022/safe-space-policy/">safe space policy</a>.</p>
+
+    <a name="stream"></a>
+    <div id="static-stream">
+        <video class="lp-video" id="speaker-video" controls autoplay>
+            <p><em>Your browser does not support the HTML5 video tag, please upgrade to a recent libre browser.</em></p>
+        </video>
+    </div>
+
+<script>
+// embed video url based on page name, and add a ?t=foo datestamp to work around caching issues
+matchResult = window.location.pathname.match(RegExp("\/2022\/(registered/|libreadventure-iframe/|)live/(jupiter|saturn|neptune)/?"));
+if (matchResult !== null) {
+    document.getElementById("speaker-video").src = "https://live.fsf.org/stream-room-" + matchResult[2] + ".webm?t=" + (new Date() * 1);
+}
+</script>
+
+
+    <!--
+    <iframe src="https://irc.libreplanet.org/irc/"
+            class="irc-client">
+    </iframe>
+    -->
+
+    <p>If the video is not loading for you in LibreAdventure, try clicking on the video, or leaving and revisiting the area.</p>
+
+  </div> <!-- end of main content -->
+
+<!--#include virtual="/2022/includes/footer.html"-->
+<!--#include virtual="/2022/includes/common_js.html"-->
+<!--#include virtual="/2022/includes/close.html" -->

diff --git a/2022/live/menu.html b/2022/live/menu.html
index fab016340f35e8478ad7cd4a7cee0e93ae9d6046..2918690a40db2dce17a35b1df774daa8844eeead 100755 (executable)
--- a/2022/live/menu.html
+++ b/2022/live/menu.html
@@ -11,9 +11,9 @@
   <div class="col-sm-8">
 
        <div class="list-group text-center text-thick">
-         <a class="list-group-item alt-a" href="roomgrand.html">Back Bay Grand Room</a>
-         <a class="list-group-item alt-a" href="roomfreedom.html">Freedom Room</a>
-         <a class="list-group-item alt-a" href="roompatriot.html">Patriot Room</a>
+         <a class="list-group-item alt-a" href="staturn">Saturn Room</a>
+         <a class="list-group-item alt-a" href="jupiter">Jupiter Room</a>
+         <a class="list-group-item alt-a" href="neptune">Neptune Room</a>
        </div>
 
   </div>

diff --git a/2022/live/neptune b/2022/live/neptune
new file mode 120000 (symlink)
index 0000000..c230c6a
--- /dev/null
+++ b/2022/live/neptune
@@ -0,0 +1 @@
+jupiter/
\ No newline at end of file

diff --git a/2022/live/room123.html b/2022/live/room123.html
deleted file mode 100755 (executable)
index 5b0c6b6..0000000
--- a/2022/live/room123.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--#include virtual="/2022/includes/header.html"-->
-
-<title>LibrePlanet 2022 &mdash; Live &mdash; Room 123</title>
-
-<!--#include virtual="/2022/includes/banner.html"-->
-<!--#include virtual="/2022/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="https://live.fsf.org/stream-123.webm" type="video/webm" />
-       <p><em>Your browser does not support the video
-         tag, <a href="https://live.fsf.org/stream-123.webm">
-         [ please download ]</a> the video instead.</em></p>
-      </video>
-    </div>  <!-- end Live Player -->
-       <!--#include virtual="/2022/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>/join #libreplanet</strong></li>
-         <li>Freenode IRC channel for Room 123: <strong>/join #libreplanet_room123</strong></li>
-         <li>Conference-wide Mumble (voice chat) server: <strong>mumble.fsf.org</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_room123"
-                  class="irc-client">
-          </iframe>
-       </div><!-- End of Kiwiirc widget -->
-        <div style="margin-top: 20px">
-            <p>To join other channels, such as <strong>#libreplanet_room123</strong>, copy and paste this text into the IRC client above after you connect to IRC: <strong>/join #libreplanet_room123</strong></p>
-        </div>
-  </div> <!-- end of main content -->
-
-  <div class="col-sm-4"> <!-- start of right sidebar column -->
-       <!--#include virtual="/2022/includes/live_sidebar.html" -->
-  </div> <!-- end of right sidebar column -->
-</div>
-
-
-<!--#include virtual="/2022/includes/footer.html"-->
-<!--#include virtual="/2022/includes/common_js.html"-->
-<script type="text/javascript" src="/2022/assets/js/stream.js"></script>
-<script type="text/javascript">
- $("#room123").addClass("active").html("<strong>Room 123</strong>");
- monitorStream('/test.webm');
-</script>
-<!--#include virtual="/2022/includes/close.html" -->

diff --git a/2022/live/room144.html b/2022/live/room144.html
deleted file mode 100755 (executable)
index efd0d2d..0000000
--- a/2022/live/room144.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--#include virtual="/2022/includes/header.html"-->
-
-<title>LibrePlanet 2022 &mdash; Live &mdash; Room 144</title>
-
-<!--#include virtual="/2022/includes/banner.html"-->
-<!--#include virtual="/2022/includes/sidebar.html"-->
-
-<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="https://live.fsf.org/stream-144.webm"
-                     type="video/ogg" />
-                 <p><em>Your browser does not support the video
-                         tag, <a href="https://live.fsf.org/stream-144.webm">
-                           [ please download ]</a> the video instead.</em></p>
-           </video>
-       </div>  <!-- end Live Player -->
-       <!--#include virtual="/2022/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>/join #libreplanet</strong></li>
-         <li>Freenode IRC channel for Room 144: <strong>/join #libreplanet_room144</strong></li>
-         <li>Conference-wide Mumble (voice chat) server: <strong>mumble.fsf.org</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_room144"
-                  class="irc-client">
-          </iframe>
-       </div><!-- End of Kiwiirc widget -->
-        <div style="margin-top: 20px">
-            <p>To join other channels, such as <strong>#libreplanet_room144</strong>, copy and paste this text into the IRC client above after you connect to IRC: <strong>/join #libreplanet_room144</strong></p>
-        </div>
-  </div> <!-- end of main content -->
-
-  <div class="col-sm-4"> <!-- start of right sidebar column -->
-       <!--#include virtual="/2022/includes/live_sidebar.html" -->
-  </div> <!-- end of right sidebar column -->
-</div>
-
-
-<!--#include virtual="/2022/includes/footer.html"-->
-<!--#include virtual="/2022/includes/common_js.html"-->
-<script type="text/javascript">
-  $("#room144").addClass("active").html("<strong>Room 144</strong>");
-</script>
-<!--#include virtual="/2022/includes/close.html" -->

diff --git a/2022/live/room155.html b/2022/live/room155.html
deleted file mode 100755 (executable)
index a52d04e..0000000
--- a/2022/live/room155.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--#include virtual="/2022/includes/header.html"-->
-
-<title>LibrePlanet 2022 &mdash; Live &mdash; Room 155</title>
-
-<!--#include virtual="/2022/includes/banner.html"-->
-<!--#include virtual="/2022/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="https://live.fsf.org/stream-155.webm"
-                   type="video/ogg" />
-               <p><em>Your browser does not support the video
-                       tag, <a href="https://live.fsf.org/stream-155.webm">
-                         [ please download ]</a> the video instead.</em></p>
-         </video>
-       </div>  <!-- end Live Player -->
-       <!--#include virtual="/2022/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>/join #libreplanet</strong></li>
-         <li>Freenode IRC channel for Room 155: <strong>/join #libreplanet_room155</strong></li>
-         <li>Conference-wide Mumble (voice chat) server: <strong>mumble.fsf.org</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_room155"
-                  class="irc-client">
-          </iframe>
-       </div><!-- End of Kiwiirc widget -->
-        <div style="margin-top: 20px">
-            <p>To join other channels, such as <strong>#libreplanet_room155</strong>, copy and paste this text into the IRC client above after you connect to IRC: <strong>/join #libreplanet_room155</strong></p>
-        </div>
-  </div> <!-- end of main content -->
-
-  <div class="col-sm-4"> <!-- start of right sidebar column -->
-       <!--#include virtual="/2022/includes/live_sidebar.html" -->
-  </div> <!-- end of right sidebar column -->
-</div>
-
-
-<!--#include virtual="/2022/includes/footer.html"-->
-<!--#include virtual="/2022/includes/common_js.html"-->
-<script type="text/javascript">
-  $("#room155").addClass("active").html("<strong>Room 155</strong>");
-</script>
-<!--#include virtual="/2022/includes/close.html" -->

diff --git a/2022/live/roomfreedom.html b/2022/live/roomfreedom.html
deleted file mode 100755 (executable)
index b10e110..0000000
--- a/2022/live/roomfreedom.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--#include virtual="/2022/includes/header.html"-->
-
-<title>LibrePlanet 2022 &mdash; Live &mdash; Freedom Room</title>
-
-<!--#include virtual="/2022/includes/banner.html"-->
-<!--#include virtual="/2022/includes/sidebar.html"-->
-
-<h1>Freedom Room </h1>
-
-<div class="row margin-top">
-  <div class="col-sm-8">
-       <div class="thumbnail"> <!-- start Live Player -->
-           <video class="lp-video" controls>
-                 <source
-                     src="https://live.fsf.org/stream-room-freedom.webm"
-                     type="video/ogg" />
-                 <p><em>Your browser does not support the video
-                         tag, <a href="https://live.fsf.org/stream-room-freedom.webm">
-                           [ please download ]</a> the video instead.</em></p>
-           </video>
-       </div>  <!-- end Live Player -->
-       <!--#include virtual="/2022/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>/join #libreplanet</strong></li>
-         <li>Freenode IRC channel for Freedom Room: <strong>/join #libreplanet_room_freedom</strong></li>
-         <li>Conference-wide Mumble (voice chat) server: <strong>mumble.fsf.org</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_room_freedom"
-                  class="irc-client">
-          </iframe>
-       </div><!-- End of Kiwiirc widget -->
-        <div style="margin-top: 20px">
-            <p>To join other channels, such as <strong>#libreplanet_room_freedom</strong>, copy and paste this text into the IRC client above after you connect to IRC: <strong>/join #libreplanet_room_freedom</strong></p>
-        </div>
-  </div> <!-- end of main content -->
-
-  <div class="col-sm-4"> <!-- start of right sidebar column -->
-       <!--#include virtual="/2022/includes/live_sidebar.html" -->
-  </div> <!-- end of right sidebar column -->
-</div>
-
-
-<!--#include virtual="/2022/includes/footer.html"-->
-<!--#include virtual="/2022/includes/common_js.html"-->
-<script type="text/javascript">
-  $("#room144").addClass("active").html("<strong>Freedom Room</strong>");
-</script>
-<!--#include virtual="/2022/includes/close.html" -->

diff --git a/2022/live/roomgrand.html b/2022/live/roomgrand.html
deleted file mode 100755 (executable)
index 63ba6c4..0000000
--- a/2022/live/roomgrand.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--#include virtual="/2022/includes/header.html"-->
-
-<title>LibrePlanet 2022 &mdash; Live &mdash; Back Bay Grand Room</title>
-
-<!--#include virtual="/2022/includes/banner.html"-->
-<!--#include virtual="/2022/includes/sidebar.html"-->
-
-<h1> Back Bay Grand Room </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="https://live.fsf.org/stream-room-grand.webm" type="video/webm" />
-       <p><em>Your browser does not support the video
-         tag, <a href="https://live.fsf.org/stream-room-grand.webm">
-         [ please download ]</a> the video instead.</em></p>
-      </video>
-    </div>  <!-- end Live Player -->
-       <!--#include virtual="/2022/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>/join #libreplanet</strong></li>
-         <li>Freenode IRC channel for Back Bay Grand Room: <strong>/join #libreplanet_room_grand</strong></li>
-         <li>Conference-wide Mumble (voice chat) server: <strong>mumble.fsf.org</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_room_grand"
-                  class="irc-client">
-          </iframe>
-       </div><!-- End of Kiwiirc widget -->
-        <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>
-        </div>
-  </div> <!-- end of main content -->
-
-  <div class="col-sm-4"> <!-- start of right sidebar column -->
-       <!--#include virtual="/2022/includes/live_sidebar.html" -->
-  </div> <!-- end of right sidebar column -->
-</div>
-
-
-<!--#include virtual="/2022/includes/footer.html"-->
-<!--#include virtual="/2022/includes/common_js.html"-->
-<script type="text/javascript" src="/2020/assets/js/stream.js"></script>
-<script type="text/javascript">
- $("#room123").addClass("active").html("<strong>Back Bay Grand Room</strong>");
- monitorStream('/test.webm');
-</script>
-<!--#include virtual="/2022/includes/close.html" -->

diff --git a/2022/live/roompatriot.html b/2022/live/roompatriot.html
deleted file mode 100755 (executable)
index 26687a9..0000000
--- a/2022/live/roompatriot.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--#include virtual="/2022/includes/header.html"-->
-
-<title>LibrePlanet 2022 &mdash; Live &mdash; Patriot Room</title>
-
-<!--#include virtual="/2022/includes/banner.html"-->
-<!--#include virtual="/2022/includes/sidebar.html"-->
-
-<h1>Patriot Room </h1>
-
-<div class="row margin-top">
-  <div class="col-sm-8">
-       <div class="thumbnail"> <!-- start Live Player -->
-         <video class="lp-video" controls>
-               <source
-                   src="https://live.fsf.org/stream-room-patriot.webm"
-                   type="video/ogg" />
-               <p><em>Your browser does not support the video
-                       tag, <a href="https://live.fsf.org/stream-room-patriot.webm">
-                         [ please download ]</a> the video instead.</em></p>
-         </video>
-       </div>  <!-- end Live Player -->
-       <!--#include virtual="/2022/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>/join #libreplanet</strong></li>
-         <li>Freenode IRC channel for Patriot Room: <strong>/join #libreplanet_room_patriot</strong></li>
-         <li>Conference-wide Mumble (voice chat) server: <strong>mumble.fsf.org</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_room_patriot"
-                  class="irc-client">
-          </iframe>
-       </div><!-- End of Kiwiirc widget -->
-        <div style="margin-top: 20px">
-            <p>To join other channels, such as <strong>#libreplanet_room_patriot</strong>, copy and paste this text into the IRC client above after you connect to IRC: <strong>/join #libreplanet_room_patriot</strong></p>
-        </div>
-  </div> <!-- end of main content -->
-
-  <div class="col-sm-4"> <!-- start of right sidebar column -->
-       <!--#include virtual="/2022/includes/live_sidebar.html" -->
-  </div> <!-- end of right sidebar column -->
-</div>
-
-
-<!--#include virtual="/2022/includes/footer.html"-->
-<!--#include virtual="/2022/includes/common_js.html"-->
-<script type="text/javascript">
-  $("#room155").addClass("active").html("<strong>Patriot Room</strong>");
-</script>
-<!--#include virtual="/2022/includes/close.html" -->

diff --git a/2022/live/saturn b/2022/live/saturn
new file mode 120000 (symlink)
index 0000000..c230c6a
--- /dev/null
+++ b/2022/live/saturn
@@ -0,0 +1 @@
+jupiter/
\ No newline at end of file