From ffc0870a0b420412d83e824377d5d1567712843a Mon Sep 17 00:00:00 2001
From: zoe <zoe@fsf.org>
Date: Thu, 13 Aug 2020 01:28:57 -0400
Subject: [PATCH] live index update to 2021 -- deleted other files (can be
taken from 2020)
---
2021/live/index.html | 28 ++++++++---------
2021/live/menu.html | 28 -----------------
2021/live/room123.html | 62 --------------------------------------
2021/live/room144.html | 59 ------------------------------------
2021/live/room155.html | 59 ------------------------------------
2021/live/roomfreedom.html | 59 ------------------------------------
2021/live/roomgrand.html | 62 --------------------------------------
2021/live/roompatriot.html | 59 ------------------------------------
8 files changed, 14 insertions(+), 402 deletions(-)
delete mode 100755 2021/live/menu.html
delete mode 100755 2021/live/room123.html
delete mode 100755 2021/live/room144.html
delete mode 100755 2021/live/room155.html
delete mode 100755 2021/live/roomfreedom.html
delete mode 100755 2021/live/roomgrand.html
delete mode 100755 2021/live/roompatriot.html
diff --git a/2021/live/index.html b/2021/live/index.html
index 392a5897..581e20cc 100755
--- a/2021/live/index.html
+++ b/2021/live/index.html
@@ -1,11 +1,11 @@
-<!--#include virtual="/2020/includes/header.html"-->
+<!--#include virtual="/2021/includes/header.html"-->
-<title>LibrePlanet 2020 ~ Live</title>
+<title>LibrePlanet 2021 ~ Live</title>
-<!--#include virtual="/2020/includes/banner.html"-->
-<!--#include virtual="/2020/includes/sidebar.html"-->
+<!--#include virtual="/2021/includes/banner.html"-->
+<!--#include virtual="/2021/includes/sidebar.html"-->
-<h1>LibrePlanet 2020 - Live</h1>
+<h1>LibrePlanet 2021 - Live</h1>
<div class="row margin-top">
<div class="col-sm-8"> <!-- start of main content -->
@@ -20,12 +20,12 @@
</div>
-->
- <p>LibrePlanet 2020 is complete!</p>
+ <p>LibrePlanet 2021: Empowering Users is happening in the spring of 2021!</p>
<p>You can view this year's videos <a href="https://media.libreplanet.org/u/libreplanet/tag/libreplanet-2020-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 2021 interactions are expected to abide by the conference's <a href="https://libreplanet.org/2021/safe-space-policy/">safe space policy</a>.</p>
<p> <div class="panel-body">
</div></p>
@@ -70,16 +70,16 @@ ffplay https://live.fsf.org/stream-room-patriot.webm
</div> <!-- end of main content -->
<div class="col-sm-4"> <!-- start of right sidebar column -->
- <!--#include virtual="/2020/includes/live_sidebar.html" -->
+ <!--#include virtual="/2021/includes/live_sidebar.html" -->
</div> <!-- end of right sidebar column -->
</div>
-<!--#include virtual="/2020/includes/footer.html"-->
-<!--#include virtual="/2020/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>
+<!--#include virtual="/2021/includes/footer.html"-->
+<!--#include virtual="/2021/includes/common_js.html"-->
+<script type="text/javascript" src="/2021/assets/js/mithril.min.js"></script>
+<script type="text/javascript" src="/2021/assets/js/stream.js"></script>
<script type="text/javascript">
$("#p-sessions").addClass("active").text("Sessions");
</script>
-<!--#include virtual="/2020/includes/livestream_js.html"-->
-<!--#include virtual="/2020/includes/close.html" -->
+<!--#include virtual="/2021/includes/livestream_js.html"-->
+<!--#include virtual="/2021/includes/close.html" -->
diff --git a/2021/live/menu.html b/2021/live/menu.html
deleted file mode 100755
index 025a278e..00000000
--- a/2021/live/menu.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--#include virtual="/2020/includes/header.html"-->
-
-<title>LibrePlanet 2020 — Live</title>
-
-<!--#include virtual="/2020/includes/banner.html"-->
-<!--#include virtual="/2020/includes/sidebar.html"-->
-
-<h1> Menu </h1>
-
-<div class="row margin-top">
- <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>
- </div>
-
- </div>
- <div class="col-sm-4"> <!-- start of sidebar column -->
- <!--#include virtual="/2020/includes/live_sidebar.html" -->
- </div> <!-- end of sidebar column -->
-</div>
-
-
-<!--#include virtual="/2020/includes/footer.html"-->
-<!--#include virtual="/2020/includes/common_js.html"-->
-<!--#include virtual="/2020/includes/close.html" -->
diff --git a/2021/live/room123.html b/2021/live/room123.html
deleted file mode 100755
index 4e2cb375..00000000
--- a/2021/live/room123.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--#include virtual="/2019/includes/header.html"-->
-
-<title>LibrePlanet 2019 — Live — Room 123</title>
-
-<!--#include virtual="/2019/includes/banner.html"-->
-<!--#include virtual="/2019/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="/2019/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&#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="/2019/includes/live_sidebar.html" -->
- </div> <!-- end of right sidebar column -->
-</div>
-
-
-<!--#include virtual="/2019/includes/footer.html"-->
-<!--#include virtual="/2019/includes/common_js.html"-->
-<script type="text/javascript" src="/2019/assets/js/stream.js"></script>
-<script type="text/javascript">
- $("#room123").addClass("active").html("<strong>Room 123</strong>");
- monitorStream('/test.webm');
-</script>
-<!--#include virtual="/2019/includes/close.html" -->
diff --git a/2021/live/room144.html b/2021/live/room144.html
deleted file mode 100755
index 5116127a..00000000
--- a/2021/live/room144.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--#include virtual="/2019/includes/header.html"-->
-
-<title>LibrePlanet 2019 — Live — Room 144</title>
-
-<!--#include virtual="/2019/includes/banner.html"-->
-<!--#include virtual="/2019/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="/2019/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/?&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="/2019/includes/live_sidebar.html" -->
- </div> <!-- end of right sidebar column -->
-</div>
-
-
-<!--#include virtual="/2019/includes/footer.html"-->
-<!--#include virtual="/2019/includes/common_js.html"-->
-<script type="text/javascript">
- $("#room144").addClass("active").html("<strong>Room 144</strong>");
-</script>
-<!--#include virtual="/2019/includes/close.html" -->
diff --git a/2021/live/room155.html b/2021/live/room155.html
deleted file mode 100755
index dcaa3d16..00000000
--- a/2021/live/room155.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--#include virtual="/2019/includes/header.html"-->
-
-<title>LibrePlanet 2019 — Live — Room 155</title>
-
-<!--#include virtual="/2019/includes/banner.html"-->
-<!--#include virtual="/2019/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="/2019/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/?&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="/2019/includes/live_sidebar.html" -->
- </div> <!-- end of right sidebar column -->
-</div>
-
-
-<!--#include virtual="/2019/includes/footer.html"-->
-<!--#include virtual="/2019/includes/common_js.html"-->
-<script type="text/javascript">
- $("#room155").addClass("active").html("<strong>Room 155</strong>");
-</script>
-<!--#include virtual="/2019/includes/close.html" -->
diff --git a/2021/live/roomfreedom.html b/2021/live/roomfreedom.html
deleted file mode 100755
index 0a3fbbd7..00000000
--- a/2021/live/roomfreedom.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--#include virtual="/2020/includes/header.html"-->
-
-<title>LibrePlanet 2020 — Live — Freedom Room</title>
-
-<!--#include virtual="/2020/includes/banner.html"-->
-<!--#include virtual="/2020/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="/2020/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/?&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="/2020/includes/live_sidebar.html" -->
- </div> <!-- end of right sidebar column -->
-</div>
-
-
-<!--#include virtual="/2020/includes/footer.html"-->
-<!--#include virtual="/2020/includes/common_js.html"-->
-<script type="text/javascript">
- $("#room144").addClass("active").html("<strong>Freedom Room</strong>");
-</script>
-<!--#include virtual="/2020/includes/close.html" -->
diff --git a/2021/live/roomgrand.html b/2021/live/roomgrand.html
deleted file mode 100755
index 6befe1b9..00000000
--- a/2021/live/roomgrand.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--#include virtual="/2020/includes/header.html"-->
-
-<title>LibrePlanet 2020 — Live — Back Bay Grand Room</title>
-
-<!--#include virtual="/2020/includes/banner.html"-->
-<!--#include virtual="/2020/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="/2020/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&#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="/2020/includes/live_sidebar.html" -->
- </div> <!-- end of right sidebar column -->
-</div>
-
-
-<!--#include virtual="/2020/includes/footer.html"-->
-<!--#include virtual="/2020/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="/2020/includes/close.html" -->
diff --git a/2021/live/roompatriot.html b/2021/live/roompatriot.html
deleted file mode 100755
index 6e5d7435..00000000
--- a/2021/live/roompatriot.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--#include virtual="/2020/includes/header.html"-->
-
-<title>LibrePlanet 2020 — Live — Patriot Room</title>
-
-<!--#include virtual="/2020/includes/banner.html"-->
-<!--#include virtual="/2020/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="/2020/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/?&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="/2020/includes/live_sidebar.html" -->
- </div> <!-- end of right sidebar column -->
-</div>
-
-
-<!--#include virtual="/2020/includes/footer.html"-->
-<!--#include virtual="/2020/includes/common_js.html"-->
-<script type="text/javascript">
- $("#room155").addClass("active").html("<strong>Patriot Room</strong>");
-</script>
-<!--#include virtual="/2020/includes/close.html" -->
--
2.25.1