From: Michael McMahon <michael@fsf.org>
Date: Sun, 28 Apr 2024 21:21:11 +0000 (-0400)
Subject: See how it looks adding Neptune back, but with instructions on accessing galene.fsf... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a1b788be807fe5e95ebb26859260dc71ffd404d2;p=libreplanet-static.git

See how it looks adding Neptune back, but with instructions on accessing galene.fsf.org instead of a stream.
---

diff --git a/2024/assets/js/stream.js b/2024/assets/js/stream.js
index bca3addd..fb2a2c9e 100644
--- a/2024/assets/js/stream.js
+++ b/2024/assets/js/stream.js
@@ -147,13 +147,13 @@ app.streams = [
     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: "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/2024/includes/nav-list-1.html b/2024/includes/nav-list-1.html
index 530093da..f62b39e8 100755
--- a/2024/includes/nav-list-1.html
+++ b/2024/includes/nav-list-1.html
@@ -1,8 +1,8 @@
 <!-- <li class="fsf-donate"><a href="https://my.fsf.org/lp-call-for-sessions/"><strong>Submit a Session</strong></a></li> -->
 <!--<li class="fsf-donate"><a href="/2024/live/"><strong>Live</strong></a></li>-->
 <!--<li class="fsf-donate"><a href="https://play.libreadventure.fsf.org/"><strong>LibreAdventure</strong></a></li>-->
- <li class="fsf-donate"><a href="https://my.fsf.org/civicrm/event/info?reset=1&id=125">Register to the in-person event!</a></li>
-  <li class="fsf-donate"><a href="https://my.fsf.org/civicrm/event/info?reset=1&id=126">Register to the online event!</a></li>
+<li class="fsf-donate"><a href="https://my.fsf.org/civicrm/event/info?reset=1&id=125">Register to the in-person event!</a></li>
+<li class="fsf-donate"><a href="https://my.fsf.org/civicrm/event/info?reset=1&id=126">Register to the online event!</a></li>
 <li class="fsf-donate"><a href="https://media.libreplanet.org/u/libreplanet/tag/libreplanet-2023-video/">Watch the LibrePlanet 2023 Videos</a></li>
 <li><a href="/2024/program">Schedule</a></li>
 <li><a href="/2024/speakers">Bios & Talks</a></li>
diff --git a/2024/live/jupiter/index.html b/2024/live/jupiter/index.html
index a0fd14da..da7127db 100755
--- a/2024/live/jupiter/index.html
+++ b/2024/live/jupiter/index.html
@@ -14,17 +14,35 @@
 <h1>LibrePlanet 2024 - Live</h1>
 
 <div class="row margin-top">
-  <div class="col-sm-12"> <!-- start of main content -->
+  <!-- start of main content -->
+  <div class="col-sm-12">
 
-    <p>Please note that all online participants in LibrePlanet 2024 interactions are expected to abide by the conference's <a href="/2024/safe-space-policy/">safe space policy</a>.</p>
+    <p>
+      Please note that all online participants in LibrePlanet 2024 interactions
+      are expected to abide by the conference's
+      <a href="/2024/safe-space-policy/">safe space policy</a>.
+    </p>
 
+    <p>
+      The Neptune room can be viewed through <a href="https://galene.fsf.org/">
+      our Galène instance</a> at <a href="https://galene.fsf.org/">
+      https://galene.fsf.org</a>. Enter a username of your choice and any
+      password will do.
+    </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>
+      <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("\/2024\/(registered/|libreadventure-iframe/|)live/(jupiter|saturn|neptune)/?"));
@@ -32,7 +50,7 @@ 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/"
@@ -40,9 +58,15 @@ if (matchResult !== null) {
     </iframe>
     -->
 
-    <p>If the video is not loading for you in LibreAdventure, try clicking on the video, or leaving and revisiting the area.</p>
+    <!--
+    <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 -->
+  </div>
+  <!-- end of main content -->
 
 <!--#include virtual="/2024/includes/footer.html"-->
 <!--#include virtual="/2024/includes/common_js.html"-->
diff --git a/2024/live/menu.html b/2024/live/menu.html
index 26b6eb61..3e37812f 100755
--- a/2024/live/menu.html
+++ b/2024/live/menu.html
@@ -13,9 +13,7 @@
     <div class="list-group text-center text-thick">
       <a class="list-group-item alt-a" href="jupiter">Jupiter Room</a>
       <a class="list-group-item alt-a" href="staturn">Saturn Room</a>
-      <!--
       <a class="list-group-item alt-a" href="neptune">Neptune Room</a>
-      -->
     </div>
 
   </div>