updated live page for workshop streams

diff --git a/2022/assets/js/stream.js b/2022/assets/js/stream.js
index 543b5c49dd28ec39504347d1feb3c385e987586e..2babc5cdce79920fc405dd76891a11150eecb4b5 100644 (file)
--- a/2022/assets/js/stream.js
+++ b/2022/assets/js/stream.js
@@ -129,24 +129,31 @@ app.withVideo = function(id, callback) {
 
 app.streams = [
   {
-    name: "Jupiter Room",
-    speakerMount: "/stream-room-jupiter.webm",
-    desktopMount: "/slides-room-jupiter.webm",
-    speakerSmallMount: "/stream-room-jupiter-480p.webm",
-    ircChannel: "#libreplanet-room-jupiter"
-  }, {
-    name: "Saturn Room",
-    speakerMount: "/stream-room-saturn.webm",
-    desktopMount: "/slides-room-saturn.webm",
-    speakerSmallMount: "/stream-room-saturn-480p.webm",
-    ircChannel: "#libreplanet-room-saturn"
-  }, {
-    name: "Neptune Room",
-    speakerMount: "/stream-room-neptune.webm",
-    desktopMount: "/slides-room-neptune.webm",
-    speakerSmallMount: "/stream-room-neptune-480p.webm",
-    ircChannel: "#libreplanet-room-neptune"
+    name: "LibrePlanet Workshop",
+    speakerMount: "/libreplanet-workshop.webm",
+    desktopMount: "/libreplanet-workshop.webm",
+    speakerSmallMount: "/libreplanet-workshop-lowres.webm",
+    ircChannel: "#libreplanet"
   }
+//  {
+//    name: "Jupiter Room",
+//    speakerMount: "/stream-room-jupiter.webm",
+//    desktopMount: "/slides-room-jupiter.webm",
+//    speakerSmallMount: "/stream-room-jupiter-480p.webm",
+//    ircChannel: "#libreplanet-room-jupiter"
+//  }, {
+//    name: "Saturn Room",
+//    speakerMount: "/stream-room-saturn.webm",
+//    desktopMount: "/slides-room-saturn.webm",
+//    speakerSmallMount: "/stream-room-saturn-480p.webm",
+//    ircChannel: "#libreplanet-room-saturn"
+//  }, {
+//    name: "Neptune Room",
+//    speakerMount: "/stream-room-neptune.webm",
+//    desktopMount: "/slides-room-neptune.webm",
+//    speakerSmallMount: "/stream-room-neptune-480p.webm",
+//    ircChannel: "#libreplanet-room-neptune"
+//  }
 ];
 
 app.controller = function() {

diff --git a/2022/includes/live_sidebar.html b/2022/includes/live_sidebar.html
index ad614438c5c11c910a3ed4fcdae5ddcf27817639..90893668295aafd9e24ef8476ad12daebcefeb0a 100644 (file)
--- a/2022/includes/live_sidebar.html
+++ b/2022/includes/live_sidebar.html
@@ -34,6 +34,7 @@
 <!-- end fsf shop box -->
 
 <!-- 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>
@@ -46,6 +47,7 @@
 /join #libreplanet-room-hallway</pre>
   </div>
 </div>
+-->
 <!-- end irc links bar -->
 
 <!-- start low res links bar -->
@@ -55,9 +57,12 @@
   </div>
   <div class="panel-body">
       <p>
+      <a target="_blank" href="https://live.fsf.org/libreplanet-workshop-lowres.webm">LP Workshop</a> (480p)</br>
+      <!--
       <a target="_blank" href="https://live.fsf.org/stream-room-jupiter-lowres.webm">Jupiter</a> (480p)</br>
       <a target="_blank" href="https://live.fsf.org/stream-room-saturn-lowres.webm">Saturn</a> (480p)</br>
       <a target="_blank" href="https://live.fsf.org/stream-room-neptune-lowres.webm">Neptune</a> (480p)</br>
+      -->
       </p>
   </div>
 </div>
@@ -70,9 +75,12 @@
   </div>
   <div class="panel-body">
       <p>
+      <a target="_blank" href="https://live.fsf.org/libreplanet-workshop.ogg">LP Workshop</a> (Ogg)</br>
+      <!--
       <a target="_blank" href="https://live.fsf.org/stream-room-jupiter.ogg">Jupiter</a> (Ogg)</br>
       <a target="_blank" href="https://live.fsf.org/stream-room-saturn.ogg">Saturn</a> (Ogg)</br>
       <a target="_blank" href="https://live.fsf.org/stream-room-neptune.ogg">Neptune</a> (Ogg)</br>
+      -->
       </p>
   </div>
 </div>

diff --git a/2022/live/index.html b/2022/live/index.html
index e6e8b2e05a14fced7aa60e61b1f7f2f170422eb9..e6ffd1125324f9a1e84f37bdfacc584995648ee7 100755 (executable)
--- a/2022/live/index.html
+++ b/2022/live/index.html
@@ -34,23 +34,32 @@
       <p>
        You can watch the streams directly by using vlc or some other media players with the following URLs:<br><br>
 
-        <!--<strong>High resolution videos:</strong><br><br>
+        <strong>High resolution videos:</strong><br><br>
 
+        <a href="https://live.fsf.org/libreplanet-workshop.webm">https://live.fsf.org/libreplanet-workshop.webm</a><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/libreplanet-workshop-lowres.webm">https://live.fsf.org/libreplanet-workshop-lowres.webm</a><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>
+        -->
 
         <strong>Audio:</strong><br><br>
 
+        <a href="https://live.fsf.org/libreplanet-workshop.ogg">https://live.fsf.org/libreplanet-workshop.ogg</a><br>
+        <!--
         <a href="https://live.fsf.org/stream-room-jupiter.ogg">https://live.fsf.org/stream-room-jupiter.ogg</a><br>
         <a href="https://live.fsf.org/stream-room-saturn.ogg">https://live.fsf.org/stream-room-saturn.ogg</a><br>
         <a href="https://live.fsf.org/stream-room-neptune.ogg">https://live.fsf.org/stream-room-neptune.ogg</a><br><br>
+        -->
 
        or using something like this on a terminal:
 <pre>