From: Andrew Engelbrecht Date: Mon, 7 Mar 2022 21:21:43 +0000 (-0500) Subject: Base 2022 LP live pages on those used for 2021 X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=426fda7e7cfeda6139b868b9ded68bce86f84e3e;p=libreplanet-static.git Base 2022 LP live pages on those used for 2021 That version is much closer to what we want this year, in terms of room and stream names, the sidebar, and the scripting we set up. --- diff --git a/2022/includes/live_sidebar.html b/2022/includes/live_sidebar.html index e1ea369e..a993f047 100644 --- a/2022/includes/live_sidebar.html +++ b/2022/includes/live_sidebar.html @@ -26,13 +26,44 @@

Visit the FSF Shop!

-
+
Picture of LibrePlanet T-Shirt.
+

LibrePlanet 2022 is online this year, but that doesn't mean that you have to miss out on the annual conference T-shirt 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.

- + + + + + +
+
+

Low Resolution Streams

+
+
+

+ Jupiter (480p)
+ Saturn (480p)
+ Neptune (480p)
+

+
+
+ + +

Stay in the loop

diff --git a/2022/live/index.html b/2022/live/index.html index a87b3180..2d23e319 100755 --- a/2022/live/index.html +++ b/2022/live/index.html @@ -2,6 +2,10 @@ LibrePlanet 2022 ~ Live + + @@ -10,22 +14,7 @@
- - -

LibrePlanet 2022 livestream has not started yet.

-

You can view this year's videos in the archives.

- - -
@@ -76,9 +71,9 @@ ffplay https://live.fsf.org/stream-room-patriot.webm - - - + + diff --git a/2022/live/jupiter/index.html b/2022/live/jupiter/index.html new file mode 100755 index 00000000..29d2dd4e --- /dev/null +++ b/2022/live/jupiter/index.html @@ -0,0 +1,49 @@ + + +LibrePlanet 2022 ~ Live + + + + + + +

LibrePlanet 2022 - Live

+ +
+
+ +

Please note that all online participants in LibrePlanet 2022 interactions are expected to abide by the conference's safe space policy.

+ + +
+ +
+ + + + + + +

If the video is not loading for you in LibreAdventure, try clicking on the video, or leaving and revisiting the area.

+ +
+ + + + diff --git a/2022/live/menu.html b/2022/live/menu.html index fab01634..2918690a 100755 --- a/2022/live/menu.html +++ b/2022/live/menu.html @@ -11,9 +11,9 @@
- Back Bay Grand Room - Freedom Room - Patriot Room + Saturn Room + Jupiter Room + Neptune Room
diff --git a/2022/live/neptune b/2022/live/neptune new file mode 120000 index 00000000..c230c6a6 --- /dev/null +++ b/2022/live/neptune @@ -0,0 +1 @@ +jupiter/ \ No newline at end of file diff --git a/2022/live/room123.html b/2022/live/room123.html deleted file mode 100755 index 5b0c6b6c..00000000 --- a/2022/live/room123.html +++ /dev/null @@ -1,62 +0,0 @@ - - -LibrePlanet 2022 — Live — Room 123 - - - - -

Room 123

- -

Now presenting: - ""

-

- -
-
-
- -
- -
-
- Problem streaming? Contact streaming@fsf.org -
-
-

Join the discussion online!

- -
    -
  • Conference-wide Freenode IRC channel: /join #libreplanet
    • -
  • Freenode IRC channel for Room 123: /join #libreplanet_room123
    • -
  • Conference-wide Mumble (voice chat) server: mumble.fsf.org
    • -
  • Conference hashtag for microblogging: #libreplanet
    • -
- -
-

IRC

- -
-
-

To join other channels, such as #libreplanet_room123, copy and paste this text into the IRC client above after you connect to IRC: /join #libreplanet_room123

-
-
- -
- -
-
- - - - - - - diff --git a/2022/live/room144.html b/2022/live/room144.html deleted file mode 100755 index efd0d2d7..00000000 --- a/2022/live/room144.html +++ /dev/null @@ -1,59 +0,0 @@ - - -LibrePlanet 2022 — Live — Room 144 - - - - -

Room 144

- -
-
-
- -
- -
-
- Problem streaming? Contact streaming@fsf.org -
-
-

Join the discussion online!

- -
    -
  • Conference-wide Freenode IRC channel: /join #libreplanet
    • -
  • Freenode IRC channel for Room 144: /join #libreplanet_room144
    • -
  • Conference-wide Mumble (voice chat) server: mumble.fsf.org
    • -
  • Conference hashtag for microblogging: #libreplanet
    • -
- -
-

IRC

- -
-
-

To join other channels, such as #libreplanet_room144, copy and paste this text into the IRC client above after you connect to IRC: /join #libreplanet_room144

-
-
- -
- -
-
- - - - - - diff --git a/2022/live/room155.html b/2022/live/room155.html deleted file mode 100755 index a52d04e0..00000000 --- a/2022/live/room155.html +++ /dev/null @@ -1,59 +0,0 @@ - - -LibrePlanet 2022 — Live — Room 155 - - - - -

Room 155

- -
-
-
- -
- -
-
- Problem streaming? Contact streaming@fsf.org -
-
-

Join the discussion online!

- -
    -
  • Conference-wide Freenode IRC channel: /join #libreplanet
    • -
  • Freenode IRC channel for Room 155: /join #libreplanet_room155
    • -
  • Conference-wide Mumble (voice chat) server: mumble.fsf.org
    • -
  • Conference hashtag for microblogging: #libreplanet
    • -
- -
-

IRC

- -
-
-

To join other channels, such as #libreplanet_room155, copy and paste this text into the IRC client above after you connect to IRC: /join #libreplanet_room155

-
-
- -
- -
-
- - - - - - diff --git a/2022/live/roomfreedom.html b/2022/live/roomfreedom.html deleted file mode 100755 index b10e1101..00000000 --- a/2022/live/roomfreedom.html +++ /dev/null @@ -1,59 +0,0 @@ - - -LibrePlanet 2022 — Live — Freedom Room - - - - -

Freedom Room

- -
-
-
- -
- -
-
- Problem streaming? Contact streaming@fsf.org -
-
-

Join the discussion online!

- -
    -
  • Conference-wide Freenode IRC channel: /join #libreplanet
    • -
  • Freenode IRC channel for Freedom Room: /join #libreplanet_room_freedom
    • -
  • Conference-wide Mumble (voice chat) server: mumble.fsf.org
    • -
  • Conference hashtag for microblogging: #libreplanet
    • -
- -
-

IRC

- -
-
-

To join other channels, such as #libreplanet_room_freedom, copy and paste this text into the IRC client above after you connect to IRC: /join #libreplanet_room_freedom

-
-
- -
- -
-
- - - - - - diff --git a/2022/live/roomgrand.html b/2022/live/roomgrand.html deleted file mode 100755 index 63ba6c49..00000000 --- a/2022/live/roomgrand.html +++ /dev/null @@ -1,62 +0,0 @@ - - -LibrePlanet 2022 — Live — Back Bay Grand Room - - - - -

Back Bay Grand Room

- -

Now presenting: - ""

-

- -
-
-
- -
- -
-
- Problem streaming? Contact streaming@fsf.org -
-
-

Join the discussion online!

- -
    -
  • Conference-wide Freenode IRC channel: /join #libreplanet
    • -
  • Freenode IRC channel for Back Bay Grand Room: /join #libreplanet_room_grand
    • -
  • Conference-wide Mumble (voice chat) server: mumble.fsf.org
    • -
  • Conference hashtag for microblogging: #libreplanet
    • -
- -
-

IRC

- -
-
-

To join other channels, such as #libreplanet_room_grand, copy and paste this text into the IRC client above after you connect to IRC: /join #libreplanet_room_grand

-
-
- -
- -
-
- - - - - - - diff --git a/2022/live/roompatriot.html b/2022/live/roompatriot.html deleted file mode 100755 index 26687a92..00000000 --- a/2022/live/roompatriot.html +++ /dev/null @@ -1,59 +0,0 @@ - - -LibrePlanet 2022 — Live — Patriot Room - - - - -

Patriot Room

- -
-
-
- -
- -
-
- Problem streaming? Contact streaming@fsf.org -
-
-

Join the discussion online!

- -
    -
  • Conference-wide Freenode IRC channel: /join #libreplanet
    • -
  • Freenode IRC channel for Patriot Room: /join #libreplanet_room_patriot
    • -
  • Conference-wide Mumble (voice chat) server: mumble.fsf.org
    • -
  • Conference hashtag for microblogging: #libreplanet
    • -
- -
-

IRC

- -
-
-

To join other channels, such as #libreplanet_room_patriot, copy and paste this text into the IRC client above after you connect to IRC: /join #libreplanet_room_patriot

-
-
- -
- -
-
- - - - - - diff --git a/2022/live/saturn b/2022/live/saturn new file mode 120000 index 00000000..c230c6a6 --- /dev/null +++ b/2022/live/saturn @@ -0,0 +1 @@ +jupiter/ \ No newline at end of file