re-add irc client embeds and channel names

diff --git a/2021/assets/js/stream.js b/2021/assets/js/stream.js
index dcd8695534d922588efec0dd59993f066ec5f8ce..f2cfc1570ec0eff40fc620b85b983eeaece6e9ec 100644 (file)
--- a/2021/assets/js/stream.js
+++ b/2021/assets/js/stream.js
@@ -308,12 +308,11 @@ app.view = function(ctrl) {
   // show or hide irc info based on page URL
   if (!window.location.pathname.match(RegExp("\/2021\/live.*"))) {
     var irc_info = [
-        "IRC channel names will be listed here"
-//      "This room's channel: ",
-//      m("strong", ["/join ", stream.ircChannel])
+      "This room's channel: ",
+      m("strong", ["/join ", stream.ircChannel])
     ];
     // set css to show irc links in sidebar
-    //document.querySelector('#irc-links-panel').style.display = "block";
+    document.querySelector('#irc-links-panel').style.display = "block";
   } else {
     var irc_info = [
       m("strong", [

diff --git a/2021/includes/live_sidebar.html b/2021/includes/live_sidebar.html
index e8ecc4c2c7ae53bd7353ea95c1976dd0f2a4eaad..92c20dc3acb93a30e4e1f8accc542391b73caf62 100644 (file)
--- a/2021/includes/live_sidebar.html
+++ b/2021/includes/live_sidebar.html
@@ -34,7 +34,6 @@
 <!-- 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>
@@ -47,7 +46,6 @@
 /join #libreplanet_room_hallway</pre>
   </div>
 </div>
--->
 <!-- end irc links bar -->
 
 <!-- start LP20 signup -->

diff --git a/2021/live/index.html b/2021/live/index.html
index 57717db64708c02421a0417ce9d4ebf571799253..9b5fa566b377737aee93954e0a77fb522c033457 100755 (executable)
--- a/2021/live/index.html
+++ b/2021/live/index.html
@@ -48,11 +48,9 @@ ffplay https://live.fsf.org/stream-room-neptune.webm
 
     <div id="stream"></div>
 
-    <!--
     <iframe src="https://irc.libreplanet.org/irc/"
             class="irc-client">
     </iframe>
-    -->
 
   </div> <!-- end of main content -->
 

diff --git a/2021/registered/chill/index.html b/2021/registered/chill/index.html
index 42b87f8e050750fd208bfe317ae753119b240acd..6c96a1c02a50d435b6e742b91664e6437ba6bfad 100755 (executable)
--- a/2021/registered/chill/index.html
+++ b/2021/registered/chill/index.html
@@ -118,11 +118,9 @@ Exhibitor' room names are listed above.
 <p>Log in and enter: <strong><code>/join #libreplanet-gaming</code></strong>
 in the chat window below.</p>
 
-<!--
 <iframe src="https://irc.libreplanet.org/irc/"
     class="irc-client">
 </iframe>
--->
 
 <!--#include virtual="/2021/includes/footer.html"-->
 <!--#include virtual="/2021/includes/common_js.html"-->

diff --git a/2021/registered/exhibitors/eff/index.html b/2021/registered/exhibitors/eff/index.html
index dd39965dca7eb41c69a2838d7379c77cb8f66e20..7f8762570cb82cf17636f481de4bd7edda1a68b9 100755 (executable)
--- a/2021/registered/exhibitors/eff/index.html
+++ b/2021/registered/exhibitors/eff/index.html
@@ -71,11 +71,9 @@ room name is like <strong><code>#room-name</code></strong>, then log in and
 enter <strong><code>/join #room-name</code></strong> in the chat window
 below.</p>
 
-<!--
 <iframe src="https://irc.libreplanet.org/irc/"
     class="irc-client">
 </iframe>
--->
 
 
 <!--#include virtual="/2021/includes/footer.html"-->

diff --git a/2021/registered/exhibitors/opensuse/index.html b/2021/registered/exhibitors/opensuse/index.html
index b3b948df963a80ceef3491fd6135d44126ada24f..6dfbd41294c02333f649993224d8770a8410cd25 100755 (executable)
--- a/2021/registered/exhibitors/opensuse/index.html
+++ b/2021/registered/exhibitors/opensuse/index.html
@@ -83,11 +83,9 @@ room name is like <strong><code>#room-name</code></strong>, then log in and
 enter <strong><code>/join #room-name</code></strong> in the chat window
 below.</p>
 
-<!--
 <iframe src="https://irc.libreplanet.org/irc/"
     class="irc-client">
 </iframe>
--->
 
 
 <!--#include virtual="/2021/includes/footer.html"-->

diff --git a/2021/registered/hallway/index.html b/2021/registered/hallway/index.html
index b2e45ee87f2b96295495099e436b5e95eba70a43..e52d9ae1f90cdf09e83e7abc1ccbddbaf7472543 100755 (executable)
--- a/2021/registered/hallway/index.html
+++ b/2021/registered/hallway/index.html
@@ -32,11 +32,9 @@ Exhibitor' room names are listed above.
 <p>Log in and enter: <strong><code>/join #libreplanet_room_hallway</code></strong>
 in the chat window below.</p>
 
-<!--
 <iframe src="https://irc.libreplanet.org/irc/"
     class="irc-client">
 </iframe>
--->
 
 <!--#include virtual="/2021/includes/footer.html"-->
 <!--#include virtual="/2021/includes/common_js.html"-->

diff --git a/2021/registered/index.html b/2021/registered/index.html
index ad99793e5095a345af0862240631045a9315aaaa..4e02f807cc7c1d139369770ea26558db97cfff26 100755 (executable)
--- a/2021/registered/index.html
+++ b/2021/registered/index.html
@@ -42,11 +42,9 @@ for the conference, as this space is for registered participants only.</p>
 
 <div style="margin-top: 20px;"></div>
 
-<!--
 <iframe src="https://irc.libreplanet.org/irc/"
     class="irc-client">
 </iframe>
--->
 
 <!--#include virtual="/2021/includes/footer.html"-->
 <!--#include virtual="/2021/includes/common_js.html"-->