From 820f9779b8dbc22e55c2f9dab62d5eb1971917c9 Mon Sep 17 00:00:00 2001
From: zoe1 <zoe@fsf.org>
Date: Fri, 26 Mar 2021 16:06:55 +0100
Subject: [PATCH] fun update to ended events

---
 2021/fun/index.html | 117 +++++++++++++++++++++++---------------------
 1 file changed, 60 insertions(+), 57 deletions(-)

diff --git a/2021/fun/index.html b/2021/fun/index.html
index 03946fee..ceb5716f 100755
--- a/2021/fun/index.html
+++ b/2021/fun/index.html
@@ -18,12 +18,12 @@ Contents
 </h2>
 </div>
 <div class="panel-body">
+<p><a href="#BoF">Birds of a Feather Social Events</a></p>
+<p><a href="#lightning-talks">Lightning Talks</a></p>
 <p><a href="#member-meeting">Member meeting</a></p>
 <p><a href="#job-board">Job board</a></p>
 <!--<p><a href="#trivia">LibrePlanet trivia</a></p>-->
 <p><a href="#minetest">Minetest</a></p>
-<p><a href="#BoF">Birds of a Feather Social Events</a></p>
-<p><a href="#lightning-talks">Lightning Talks</a></p>
 </div>
 </div>
 
@@ -31,62 +31,7 @@ Contents
 <h1>Thank you for attending.</h1>
 <p>All the activities you can join in besides our <a href="//libreplanet.org/2021/program">session</a> and <a href="//libreplanet.org/2021/workshops">workshop</a> schedule</p>
 <br>
-<h2 id="member-meeting">Member Meeting</h2>
-
-<h3>Hosted by Jason Self, Devin Ulibarri, and Mariah Villarreal</h3>
-
-<p>Get together with other FSF associate members to share your feedback with the FSF. To participate in the meeting, jump on the FSF member forum to get more information if you missed the invitation. The link to join the videoconference will be posted in the channel topic, as well as on the LibrePlanet Web site. Please use the password shared via the invitation email. </p>
-
-<ul>
-<li><strong>Time:</strong> 12:55 - 13:40 EDT, Sunday 3/21</li>
-<li><strong>Location:</strong> <a href="https://testgreenlight.fsf.org/and-xwy-9d7">https://testgreenlight.fsf.org/and-xwy-9d7</a> </li>
-<li><strong>Sign up:</strong> <a href="https://my.fsf.org/join">Become a member</a></li>
-<li>Please check the <a href="https://forum.members.fsf.org">associate member forum</a> for the password.</li>
-</ul>
-<br>
-<hr>
-
-<h2 id="job-board">Job Board</h2>
-
-<p><a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2021/JobBoard">Post / check for free software-friendly jobs</a>.</p>
-<hr>
-
-<!--<h2 id="trivia">LibrePlanet Trivia</h2> 
-
-<p>Get your skull tool geared up for mental gymnastics at LibrePlanet
-2021's free software trivia quiz game! Win prizes and bragging rights
-while having a good time playing with your peers. Questions will vary in
-  difficulty, and we expect all participants to play under an honest policy.</p>
 
-<p>The quiz will be hosted by
-Craig Topham (FSF copyright and licensing associate & quizmaster) and
-John Hsieh (FSF deputy director). The quiz is scheduled for Sunday the
-  22nd at 14:45 - 15:30 EDT.</p>
-
-<p>To participate in the trivia contest, you will need to be <a href="https://libreplanet.org/2021/register">registered at the "Supporter" level</a>.</p>
-
-<ul>
-<li><strong>Time:</strong> 14:45 - 15:15 EDT, Sunday 3/21</li>
-<li><strong>Location:</strong> TBA</li>
-<li><strong>Registration:</strong> Not necessary</li>
-</ul>
-
-</hr>-->
-
-<a href="#minetest"><h2 id="minetest">Minetest</h2></a>
-
-<p>We run a <a href="https://www.minetest.net/">Minetest</a> game server
-this year. Minetest is a classic and fun free software game in which players
-build with blocks, and craft items. To install Minetest
-<code>0.4</code> on Trisquel, run <strong><code style="white-space:nowrap;">sudo apt-get install
-minetest</code></strong>.</p>
-
-<p>Thank you for playing! Check back with this space for a tarball of the world we made together.</p>
-
-<!--<p>To connect to our server, use the <code>minetest.libreplanet.org</code> URL
-  and the default port <code>30000</code>.</p>
-
-<p>Are you lost in the game? Use the in-game command <code>/spawn</code> to return to where you began.</p>-->
 <hr>  
 
 <br>
@@ -145,6 +90,64 @@ minetest</code></strong>.</p>
       </tbody>
 </table>
 
+
+<h2 id="member-meeting">Member Meeting</h2>
+
+<h3>Hosted by Jason Self, Devin Ulibarri, and Mariah Villarreal</h3>
+
+<p>Get together with other FSF associate members to share your feedback with the FSF. To participate in the meeting, jump on the FSF member forum to get more information if you missed the invitation. The link to join the videoconference will be posted in the channel topic, as well as on the LibrePlanet Web site. Please use the password shared via the invitation email. </p>
+
+<ul>
+<li><strong>Time:</strong> 12:55 - 13:40 EDT, Sunday 3/21</li>
+<li><strong>Location:</strong>This meeting has ended</li>
+<li><strong>Sign up:</strong> <a href="https://my.fsf.org/join">Become a member</a></li>
+<li>Please check the <a href="https://forum.members.fsf.org">associate member forum</a> for the password.</li>
+</ul>
+<br>
+<hr>
+
+<h2 id="job-board">Job Board</h2>
+
+<p><a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2021/JobBoard">Post / check for free software-friendly jobs</a>.</p>
+<hr>
+
+<!--<h2 id="trivia">LibrePlanet Trivia</h2> 
+
+<p>Get your skull tool geared up for mental gymnastics at LibrePlanet
+2021's free software trivia quiz game! Win prizes and bragging rights
+while having a good time playing with your peers. Questions will vary in
+  difficulty, and we expect all participants to play under an honest policy.</p>
+
+<p>The quiz will be hosted by
+Craig Topham (FSF copyright and licensing associate & quizmaster) and
+John Hsieh (FSF deputy director). The quiz is scheduled for Sunday the
+  22nd at 14:45 - 15:30 EDT.</p>
+
+<p>To participate in the trivia contest, you will need to be <a href="https://libreplanet.org/2021/register">registered at the "Supporter" level</a>.</p>
+
+<ul>
+<li><strong>Time:</strong> 14:45 - 15:15 EDT, Sunday 3/21</li>
+<li><strong>Location:</strong>This meeting has ended</li>
+<li><strong>Registration:</strong> Not necessary</li>
+</ul>
+
+</hr>-->
+
+<a href="#minetest"><h2 id="minetest">Minetest</h2></a>
+
+<p>We run a <a href="https://www.minetest.net/">Minetest</a> game server
+this year. Minetest is a classic and fun free software game in which players
+build with blocks, and craft items. To install Minetest
+<code>0.4</code> on Trisquel, run <strong><code style="white-space:nowrap;">sudo apt-get install
+minetest</code></strong>.</p>
+
+<p>Thank you for playing! Check back with this space for a tarball of the world we made together.</p>
+
+<!--<p>To connect to our server, use the <code>minetest.libreplanet.org</code> URL
+  and the default port <code>30000</code>.</p>
+
+<p>Are you lost in the game? Use the in-game command <code>/spawn</code> to return to where you began.</p>-->
+
 <hr>
 
 <h2>Organize your own social event!</h2>
-- 
2.25.1