From 6915a28f702ae6525ae1ba7086e8507b4f2e4288 Mon Sep 17 00:00:00 2001
From: Michael McMahon <michael@fsf.org>
Date: Fri, 26 Apr 2024 17:56:17 -0400
Subject: [PATCH] Remove Neptune and cleanup sidebar.

---
 2024/includes/live_sidebar.html | 188 ++++++++++++++++++--------------
 1 file changed, 104 insertions(+), 84 deletions(-)

diff --git a/2024/includes/live_sidebar.html b/2024/includes/live_sidebar.html
index 21ea0782..143810f5 100644
--- a/2024/includes/live_sidebar.html
+++ b/2024/includes/live_sidebar.html
@@ -1,49 +1,63 @@
 <div class="panel panel-default"><!-- start support bar -->
   <div class="panel-heading">
-	<h3 class="panel-title">Support the FSF!</h3>
+    <h3 class="panel-title">Support the FSF!</h3>
   </div>
   <div class="panel-body">
-	<p>Hard-working FSF hackers are running our
-	  advanced, fully free software streaming system for LibrePlanet 2024. We
-	  appreciate your support to help cover labor and equipment.</p>
-
-	<p><a href="https://my.fsf.org/associate/support_freedom/join_fsf" style="border-bottom: none !important;">
-		<img class="fsf-donate-button" src="https://static.fsf.org/nosvn/join.en.red.png"
-			 alt="[ Join FSF ]">
-	</a></p>
-
-	<p><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=14" style="border-bottom: none !important;">
-		<img class="fsf-donate-button" src="//static.fsf.org/nosvn/donate.en.png"
-			 alt="[ Donate to the FSF ]">
-	</a></p>
+    <p>
+      Hard-working FSF hackers are running our advanced, fully free software
+      streaming system for LibrePlanet 2024. We appreciate your support to help
+      cover labor and equipment.
+    </p>
+
+    <p>
+      <a href="https://my.fsf.org/associate/support_freedom/join_fsf"
+        style="border-bottom: none !important;">
+        <img class="fsf-donate-button" src="https://static.fsf.org/nosvn/join.en.red.png"
+          alt="[ Join FSF ]">
+      </a>
+    </p>
+
+    <p>
+      <a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=14"
+        style="border-bottom: none !important;">
+        <img class="fsf-donate-button" src="//static.fsf.org/nosvn/donate.en.png"
+          alt="[ Donate to the FSF ]">
+      </a>
+    </p>
   </div>
 </div>
 <!-- end support bar -->
 
 <!-- start fsf shop box -->
-<!--<div class="panel panel-default"><!-- start librejs box -->
- <!-- <div class="panel-heading">
+<!--
+<div class="panel panel-default">
+  <div class="panel-heading">
     <h3 class="panel-title">Visit the FSF Shop!</h3>
   </div>
   <div class="panel-body">
-	<center><a style="border: none;" href="https://shop.fsf.org/tshirts-hoodies/libreplanet-2024-t-shirt"><img src="https://shop.fsf.org/sites/default/files/styles/medium/public/t-shirt-final.png" alt="Picture of LibrePlanet T-Shirt."></a></center>
-        <div style="margin-top: 20px;"></div>
-	<p>LibrePlanet 2024 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-2024-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>
+    <center>
+      <a style="border: none;" href="https://shop.fsf.org/tshirts-hoodies/libreplanet-2024-t-shirt">
+        <img src="https://shop.fsf.org/sites/default/files/styles/medium/public/t-shirt-final.png"
+          alt="Picture of LibrePlanet T-Shirt.">
+      </a>
+    </center>
+    <div style="margin-top: 20px;"></div>
+    <p>LibrePlanet 2024 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-2024-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>-->
+</div>
+-->
 <!-- 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>
+    <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>
@@ -53,17 +67,19 @@
 <!-- start low res links bar -->
 <div class="panel panel-default">
   <div class="panel-heading">
-	<h3 class="panel-title">Low Resolution Streams</h3>
+    <h3 class="panel-title">Low Resolution Streams</h3>
   </div>
   <div class="panel-body">
       <p>
-      <a target="_blank" href="https://live.fsf.org/stream-room-jupiter-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>
-            <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">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>
+        <a target="_blank" href="https://live.fsf.org/libreplanet-workshop-lowres.webm">LP Workshop</a> (480p)<br>
+        -->
       </p>
   </div>
 </div>
@@ -72,83 +88,86 @@
 <!-- start audio links bar -->
 <div class="panel panel-default">
   <div class="panel-heading">
-	<h3 class="panel-title">Audio Streams</h3>
+    <h3 class="panel-title">Audio Streams</h3>
   </div>
   <div class="panel-body">
-      <p>
-
+    <p>
+      <!--
       <a target="_blank" href="https://live.fsf.org/stream-room-jupiter.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>
-            <a target="_blank" href="https://live.fsf.org/libreplanet-workshop.ogg">LP Workshop</a> (Ogg)<br>
-            -->
-      </p>
+      <a target="_blank" href="https://live.fsf.org/libreplanet-workshop.ogg">LP Workshop</a> (Ogg)<br>
+      -->
+    </p>
   </div>
 </div>
 <!-- end audio links bar -->
 
-<!-- start LP22 signup -->
+<!-- start LP signup -->
 <div class="panel panel-default">
   <div class="panel-heading">
-	<h3 class="panel-title">Stay in the loop</h3>
+    <h3 class="panel-title">Stay in the loop</h3>
   </div>
   <div class="panel-body">
-	<p>Sign up to receive updates about LibrePlanet.</p>
-	<form action="https://my.fsf.org/civicrm/profile/create?gid=507&amp;reset=1"
-          class="" method="post" name="Edit" id="Edit-live-sidebar">
+    <p>Sign up to receive updates about LibrePlanet.</p>
+    <form action="https://my.fsf.org/civicrm/profile/create?gid=507&amp;reset=1"
+      class="" method="post" name="Edit" id="Edit-live-sidebar">
 
       <div>
-		<input name="entryURL" type="hidden"
-	           value="https://my.fsf.org/civicrm/profile/create?gid=507&amp;reset=1/update?action=update&amp;amp;id=507&amp;amp;reset=1&amp;amp;context=field">
-		<input name="postURL" type="hidden" value="https://libreplanet.org/2024/confirmation.html">
-		<input name="cancelURL" type="hidden"
-	           value="https://my.fsf.org/civicrm/profile?reset=1&amp;gid=507">
-		<input name="add_to_group" type="hidden" value="619">
-		<input name="_qf_default" type="hidden" value="Edit:cancel">
+        <input name="entryURL" type="hidden"
+          value="https://my.fsf.org/civicrm/profile/create?gid=507&amp;reset=1/update?action=update&amp;amp;id=507&amp;amp;reset=1&amp;amp;context=field">
+        <input name="postURL" type="hidden" value="https://libreplanet.org/2024/confirmation.html">
+        <input name="cancelURL" type="hidden"
+          value="https://my.fsf.org/civicrm/profile?reset=1&amp;gid=507">
+        <input name="add_to_group" type="hidden" value="619">
+        <input name="_qf_default" type="hidden" value="Edit:cancel">
       </div>
 
       <div class="crm-profile-name-interested_in_libreplanet_507">
 
-		<div id="crm-container-live-sidebar" class="crm-container crm-public" lang="en"
-			 xml:lang="en">
-
-	      <div id="editrow-email-Primary-live-sidebar" class="form-group">
-			<label for="email-Primary">
-			  Email <span class="field-required">*</span>
-			</label>
-			<input name="email-Primary" type="email" id="email-Primary-live-sidebar"
-					class="form-control">
-	      </div>
-
-	      <div id="editrow-group" class="form-group">
-		<div class="checkbox">
-		  <input type="hidden" name="group[25]" value="">
-		  <input id="group_25-live-sidebar"
-			 style="margin-left: 0 !important"
-			 name="group[25]" type="checkbox" value="1"
-			 checked="checked">
-		  <label for="group_25" class="control-label">Follow the FSF by email!</label>
-		</div>
-	      </div>
-
-	      <div class="form-group">
-			<input class="btn btn-default btn-block"
-			       accesskey="S" name="_qf_Edit_next" value="Submit" type="submit"
-			       id="_qf_Edit_next-live-sidebar">
-		  </div>
-
-		</div>
-	  </div>
+        <div id="crm-container-live-sidebar" class="crm-container crm-public" lang="en"
+          xml:lang="en">
+
+          <div id="editrow-email-Primary-live-sidebar" class="form-group">
+            <label for="email-Primary">
+              Email <span class="field-required">*</span>
+            </label>
+            <input name="email-Primary" type="email" id="email-Primary-live-sidebar"
+              class="form-control">
+          </div>
+
+          <div id="editrow-group" class="form-group">
+            <div class="checkbox">
+              <input type="hidden" name="group[25]" value="">
+              <input id="group_25-live-sidebar"
+                style="margin-left: 0 !important"
+                name="group[25]" type="checkbox" value="1"
+                checked="checked">
+              <label for="group_25" class="control-label">Follow the FSF by email!</label>
+            </div>
+          </div>
+
+          <div class="form-group">
+            <input class="btn btn-default btn-block"
+              accesskey="S" name="_qf_Edit_next" value="Submit" type="submit"
+              id="_qf_Edit_next-live-sidebar">
+          </div>
+
+        </div>
+      </div>
     </form>
-	<p class="text-center"><a class="alt-a" href="https://my.fsf.org/donate/privacypolicy.html">Privacy policy</a></p>
+    <p class="text-center">
+      <a class="alt-a" href="https://my.fsf.org/donate/privacypolicy.html">Privacy policy</a>
+    </p>
   </div>
 </div>
-<!-- end LP22 signup -->
+<!-- end LP signup -->
 
-<div class="panel panel-default"><!-- start librejs box -->
+<!-- start librejs box -->
+<div class="panel panel-default">
   <div class="panel-heading">
     <h3 class="panel-title">Free JavaScript</h3>
   </div>
@@ -156,4 +175,5 @@
     <p>We've modified our streaming software and Web IRC client to include computer- and human-readable license tags, so that the <a href="https://www.gnu.org/software/librejs/">LibreJS browser extension</a> can verify that all JavaScript is free.</p>
     <p>We hold all FSF Web sites to this standard and help others do the same though our <a href="https://www.fsf.org/campaigns/freejs/">Free JavaScript campaign.</a></p>
   </div>
-</div><!-- end librejs box -->
+</div>
+<!-- end librejs box -->
-- 
2.25.1