From: Andrew Engelbrecht <andrew@fsf.org>
Date: Thu, 30 May 2019 19:39:54 +0000 (-0400)
Subject: link to gmg instance from live streaming pages
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1e96c1886ba380389038fc0fb5dbb443e151589d;p=libreplanet-static.git

link to gmg instance from live streaming pages
---

diff --git a/2016/live/index.html b/2016/live/index.html
index b8c0fa9f..9c0fc5dd 100755
--- a/2016/live/index.html
+++ b/2016/live/index.html
@@ -10,6 +10,10 @@
 <div class="row margin-top">
   <div class="col-sm-8"> <!-- start of main content -->
 
+    <p>To watch LibrePlanet 2016 vidoes, please visit our <a href="https://media.libreplanet.org">MediaGoblin instnce</a>.</p>
+
+    <!-- linking to conference video recordings
+
     <noscript>
       <p>
         Our conference streaming web interface requires JavaScript, but
@@ -39,6 +43,9 @@
     <iframe src="https://irc0d.libreplanet.org/irc/irc.freenode.net/?theme=mini&amp;#libreplanet"
             class="irc-client">
     </iframe>
+
+    -->
+
   </div> <!-- end of main content -->
 
   <div class="col-sm-4"> <!-- start of right sidebar column -->
diff --git a/2017/includes/nav-list-1.html b/2017/includes/nav-list-1.html
index 8057901f..dc67e2b1 100644
--- a/2017/includes/nav-list-1.html
+++ b/2017/includes/nav-list-1.html
@@ -5,4 +5,4 @@
 <li class="speakers-link"><a href="/2017/program/speakers.html">Speakers</a></li>
 <li class="social-events-link"><a href="/2017/social.html">Social Events</a></li>
 <li class="exhibit-hall-link"><a href="/2017/exhibit-hall">Exhibit Hall</a></li>
-<li><a href="/2017/live">Livestream <span class="glyphicon glyphicon-globe"></span></a></li>
+<li><a href="/2017/live">Video Recordings <span class="glyphicon glyphicon-globe"></span></a></li>
diff --git a/2017/live/index.html b/2017/live/index.html
index 49e5d54a..f79d6921 100755
--- a/2017/live/index.html
+++ b/2017/live/index.html
@@ -10,6 +10,11 @@
 <div class="row margin-top">
   <div class="col-sm-8"> <!-- start of main content -->
 
+
+    <p>To watch LibrePlanet 2017 vidoes, please visit our <a href="https://media.libreplanet.org">MediaGoblin instnce</a>.</p>
+
+    <!-- linking to conference video recordings
+
     <noscript>
       <p>
         Our conference streaming web interface requires JavaScript, but
@@ -52,6 +57,9 @@ ffplay https://live.fsf.org/stream-155.webm
     <iframe src="https://irc0d.libreplanet.org/irc/irc.freenode.net/?theme=mini&amp;#libreplanet"
             class="irc-client">
     </iframe>
+
+    -->
+
   </div> <!-- end of main content -->
 
   <div class="col-sm-4"> <!-- start of right sidebar column -->
diff --git a/2018/live/index.html b/2018/live/index.html
index 5c4f8c70..45f91258 100755
--- a/2018/live/index.html
+++ b/2018/live/index.html
@@ -18,6 +18,10 @@
       </div>
     </div>
 
+    <p style="margin-top: 80px">To watch LibrePlanet 2018 vidoes, please visit our <a href="https://media.libreplanet.org">MediaGoblin instnce</a>.</p>
+
+    <!-- Linking to recorded videos rather than life feed
+
     <noscript>
       <p>
         Our conference streaming web interface requires JavaScript, but
@@ -56,6 +60,9 @@ ffplay https://live.fsf.org/stream-155.webm
     <iframe src="https://irc0d.libreplanet.org/irc/irc.freenode.net/?theme=mini&amp;#libreplanet"
             class="irc-client">
     </iframe>
+
+    -->
+
   </div> <!-- end of main content -->
 
   <div class="col-sm-4"> <!-- start of right sidebar column -->