From 6764af789a72b7dcfd9c178cc15576487e640e4e Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@fsf.org>
Date: Wed, 15 Mar 2017 13:04:55 -0400
Subject: [PATCH] Adding livestreaming pages and LibreLuna carousel feature.

---
 2017/assets/css/bootstrap.css   | 18 +++++-----
 2017/includes/live_sidebar.html | 16 ++++-----
 2017/index.html                 | 37 ++++++++++-----------
 2017/live/index.html            | 56 +++++++++++++++++++++++++++++++
 2017/live/menu.html             | 28 ++++++++++++++++
 2017/live/room123.html          | 58 +++++++++++++++++++++++++++++++++
 2017/live/room141.html          | 55 +++++++++++++++++++++++++++++++
 2017/live/room155.html          | 55 +++++++++++++++++++++++++++++++
 8 files changed, 286 insertions(+), 37 deletions(-)
 create mode 100755 2017/live/index.html
 create mode 100755 2017/live/menu.html
 create mode 100755 2017/live/room123.html
 create mode 100755 2017/live/room141.html
 create mode 100755 2017/live/room155.html

diff --git a/2017/assets/css/bootstrap.css b/2017/assets/css/bootstrap.css
index 680e7687..5ab07138 100644
--- a/2017/assets/css/bootstrap.css
+++ b/2017/assets/css/bootstrap.css
@@ -5189,9 +5189,9 @@ a.thumbnail.active {
   background-color: #337ab7;
   -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
           box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
-  -webkit-transition: width .6s ease;
-       -o-transition: width .6s ease;
-          transition: width .6s ease;
+  -webkit-transition: width .4s ease;
+       -o-transition: width .4s ease;
+          transition: width .4s ease;
 }
 .progress-striped .progress-bar,
 .progress-bar-striped {
@@ -6292,9 +6292,9 @@ button.close {
 .carousel-inner > .item {
   position: relative;
   display: none;
-  -webkit-transition: .6s ease-in-out left;
-       -o-transition: .6s ease-in-out left;
-          transition: .6s ease-in-out left;
+  -webkit-transition: .4s ease-in-out left;
+       -o-transition: .4s ease-in-out left;
+          transition: .4s ease-in-out left;
 }
 .carousel-inner > .item > img,
 .carousel-inner > .item > a > img {
@@ -6302,9 +6302,9 @@ button.close {
 }
 @media all and (transform-3d), (-webkit-transform-3d) {
   .carousel-inner > .item {
-    -webkit-transition: -webkit-transform .6s ease-in-out;
-         -o-transition:      -o-transform .6s ease-in-out;
-            transition:         transform .6s ease-in-out;
+    -webkit-transition: -webkit-transform .4s ease-in-out;
+         -o-transition:      -o-transform .4s ease-in-out;
+            transition:         transform .4s ease-in-out;
 
     -webkit-backface-visibility: hidden;
             backface-visibility: hidden;
diff --git a/2017/includes/live_sidebar.html b/2017/includes/live_sidebar.html
index 6c04ab13..a54e238d 100755
--- a/2017/includes/live_sidebar.html
+++ b/2017/includes/live_sidebar.html
@@ -7,12 +7,12 @@
 	  advanced-ever free software streaming system for LibrePlanet 2017. We
 	  appreciate your support to help cover labor and equipment.</p>
 
-	<p><a href="https://my.fsf.org/associate/support_freedom/join_fsf">
+	<p><a href="https://my.fsf.org/associate/support_freedom/join_fsf" style="border-bottom: none !important;">
 		<img class="fsf-donate-button" src="https://static.fsf.org/nosvn/join.en.red.png"
 			 alt="[ Join FSF ]" >
 	</a></p>
 
-	<p><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=14">
+	<p><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=14" style="border-bottom: none !important;">
 		<img class="fsf-donate-button" src="//static.fsf.org/nosvn/donate.en.png"
 			 alt="[ Donate to the FSF ]" >
 	</a></p>
@@ -34,22 +34,22 @@
 	<h3 class="panel-title">Stay in the loop</h3>
   </div>
   <div class="panel-body">
-	<p>Sign up to receive updates about LibrePlanet 2017.</p>
-	<form action="https://my.fsf.org/civicrm/profile/create?gid=281&amp;reset=1"
+	<p>Sign up to receive updates about LibrePlanet.</p>
+	<form action="https://my.fsf.org/civicrm/profile/create?gid=285&amp;reset=1"
           class="" method="post" name="Edit" id="Edit-live-sidebar" >
 
       <div>
 		<input name="entryURL" type="hidden"
-	           value="https://my.fsf.org/civicrm/profile/create?gid=281&amp;reset=1/update?action=update&amp;amp;id=281&amp;amp;reset=1&amp;amp;context=field"
+	           value="https://my.fsf.org/civicrm/profile/create?gid=285&amp;reset=1/update?action=update&amp;amp;id=285&amp;amp;reset=1&amp;amp;context=field"
 	           />
-		<input name="postURL" type="hidden" value="https://libreplanet.org/2015/live/confirmation.html" />
+		<input name="postURL" type="hidden" value="https://libreplanet.org/2017/live/confirmation.html" />
 		<input name="cancelURL" type="hidden"
-	           value="https://my.fsf.org/civicrm/profile?reset=1&amp;gid=281" />
+	           value="https://my.fsf.org/civicrm/profile?reset=1&amp;gid=285" />
 		<input name="add_to_group" type="hidden" value="619" />
 		<input name="_qf_default" type="hidden" value="Edit:cancel" />
       </div>
 
-      <div class="crm-profile-name-LP15_announce_simple_signup_281">
+      <div class="crm-profile-name-interested_in_libreplanet_285">
 
 		<div id="crm-container-live-sidebar" class="crm-container crm-public" lang="en"
 			 xml:lang="en">
diff --git a/2017/index.html b/2017/index.html
index 1931c2ef..540f8512 100755
--- a/2017/index.html
+++ b/2017/index.html
@@ -12,25 +12,23 @@
 	<ul class="carousel-inner list-unstyled">
 
 		<li class="item active">
-			<a href="https://shop.fsf.org/tshirts-hoodies/libreplanet-2017"><img src="https://static.fsf.org/nosvn/libreplanet/2017/lp2017-shirt/lp2017-shirt-feature.png"
-			alt="[ The LibrePlanet shirt. The shirt is red with the text 'Roots of Freedom' and a design in tan. ]"></img>
-			<p class="carousel-caption-bottom" style="background-color: white;"><br></p></a>
-		</li>
-
-		<li class="item">
 			<img src="https://static.fsf.org/nosvn/libreplanet/feature-images/keynotes-2017.png"
 			alt="[ 2017 Keynote Speakers: Cory Doctorow, Kade Crockford, Richard Stallman, Sumana Harihareswara ]"></img>
 			<p class="carousel-caption-bottom" style="background-color: white;"><br></p>
 			</li>
 
 			<li class="item">
-				<img src="https://static.fsf.org/nosvn/libreplanet/feature-images/sumana-speaking-with-cables.png"
-				alt="[ Crypto Session at the Free Software Foundation 30th Anniversary User Freedom Summit ]"></img>
-				<p class="carousel-caption-bottom">
-					Explore a wealth of <a href="https://www.libreplanet.org/2016/program/index.html">session videos and slides</a> from LibrePlanet 2016.</p>
-				</li>
-
+			<img src="//static.fsf.org/nosvn/libreplanet/feature-images/libreluna-feature.png"
+			alt="[ Can't come to the conference? Host a LibreLuna viewing party. ]">
+			<p class="carousel-caption-bottom">
+			<a href="https://my.fsf.org/civicrm/event/register?id=67&reset=1">Register your party</a> with the FSF.</p>
+		</li>
 
+		<li class="item">
+			<a href="https://shop.fsf.org/tshirts-hoodies/libreplanet-2017"><img src="https://static.fsf.org/nosvn/libreplanet/2017/lp2017-shirt/lp2017-shirt-feature.png"
+			alt="[ The LibrePlanet shirt. The shirt is red with the text 'Roots of Freedom' and a design in tan. ]"></img>
+			<p class="carousel-caption-bottom" style="background-color: white;"><br></p></a>
+		</li>
 
 				</ul>
 
@@ -42,6 +40,13 @@
 			</p>
 		</li>
 
+		<li class="item">
+			<img src="https://static.fsf.org/nosvn/libreplanet/feature-images/sumana-speaking-with-cables.png"
+			alt="[ Sumana Harihareswara speaking at a podium at LibrePlanet 2016. Between her and the camera is a table strewn with cables and computer equipment. ]"></img>
+			<p class="carousel-caption-bottom">
+				Explore a wealth of <a href="https://www.libreplanet.org/2016/program/index.html">session videos and slides</a> from LibrePlanet 2016.</p>
+			</li>
+
 		<li class="item ">
 			<img src="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/carousel/lp2015-open-house-carousel.jpg"
 			alt="[ Crypto panel at the FSF 30th Anniversary User Freedom Summit ]"></img>
@@ -49,14 +54,6 @@
 				<a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the discussion list now</a> and meet the people you'll spend time with at LibrePlanet.</p>
 			</li>
 
-		<li class="item">
-		<img src="//static.fsf.org/nosvn/libreplanet/feature-images/libreluna-feature.png"
-		alt="[ Can't come to the conference? Host a LibreLuna viewing party. ]">
-		<p class="carousel-caption-bottom">
-		<a href="https://www.libreplanet.org/conference/libreluna">Register your party</a> with the FSF.</p>
-	</li>
-
-
 	<li class="item">
 	<a href="streaming"><img src="//static.fsf.org/nosvn/libreplanet/feature-images/remote_participation.png"
 	alt="[ A globe. ]"></a>
diff --git a/2017/live/index.html b/2017/live/index.html
new file mode 100755
index 00000000..ff60cec3
--- /dev/null
+++ b/2017/live/index.html
@@ -0,0 +1,56 @@
+<!--#include virtual="/2017/includes/header.html"-->
+
+<title>LibrePlanet 2017 ~ Live</title>
+
+<!--#include virtual="/2017/includes/banner.html"-->
+<!--#include virtual="/2017/includes/sidebar.html"-->
+
+<h1>LibrePlanet 2017 - Live</h1>
+
+<div class="row margin-top">
+  <div class="col-sm-8"> <!-- start of main content -->
+
+    <noscript>
+      <p>
+        Our conference streaming web interface requires JavaScript, but
+        all of our streams are readily available on
+        <a href="http://live2.fsf.org">
+          live2.fsf.org
+        </a>
+        and can be played with the video client of your
+        choice, such as VLC or mplayer.
+      </p>
+      <p>
+	You can watch the streams directly by using vlc or some other media players with the following URLs:<br><br>
+	https://live2.fsf.org/room-123-stream.webm <br>
+	https://live2.fsf.org/room-141-stream.webm <br>
+	https://live2.fsf.org/room-155-stream.webm <br><br>
+	or using something like this on a terminal:
+        <pre>
+          vlc https://live2.fsf.org/room-123-stream.webm
+	  mpv https://live2.fsf.org/room-141-stream.webm
+	  ffplay https://live2.fsf.org/room-155-stream.webm
+        </pre>
+      </p>
+    </noscript>
+
+    <div id="stream"></div>
+
+    <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 -->
+    <!--#include virtual="/2017/includes/live_sidebar.html" -->
+  </div> <!-- end of right sidebar column -->
+</div>
+
+<!--#include virtual="/2017/includes/footer.html"-->
+<!--#include virtual="/2017/includes/common_js.html"-->
+<script type="text/javascript" src="/2017/assets/js/mithril.min.js"></script>
+<script type="text/javascript" src="/2017/assets/js/stream.js"></script>
+<script type="text/javascript">
+$("#p-sessions").addClass("active").text("Sessions");
+</script>
+<!--#include virtual="/2017/includes/close.html" -->
diff --git a/2017/live/menu.html b/2017/live/menu.html
new file mode 100755
index 00000000..4941df87
--- /dev/null
+++ b/2017/live/menu.html
@@ -0,0 +1,28 @@
+<!--#include virtual="/server/2017/header.html"-->
+
+<title>LibrePlanet 2017 &mdash; Live</title>
+
+<!--#include virtual="/server/2017/banner.html"-->
+<!--#include virtual="/server/2017/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=."/room123.html">Room 123</a>
+	  <a class="list-group-item alt-a" href="./room141.html" >Room 141</a>
+	  <a class="list-group-item alt-a" href="./room155.html" >Room 155</a>
+	</div>
+
+  </div>
+  <div class="col-sm-4"> <!-- start of sidebar column -->
+	<!--#include virtual="/server/2017/live_sidebar.html" -->
+  </div> <!-- end of sidebar column -->
+</div>
+
+
+<!--#include virtual="/server/2017/footer.html"-->
+<!--#include virtual="/server/2017/common_js.html"-->
+<!--#include virtual="/server/2017/close.html" -->
diff --git a/2017/live/room123.html b/2017/live/room123.html
new file mode 100755
index 00000000..bb1f8028
--- /dev/null
+++ b/2017/live/room123.html
@@ -0,0 +1,58 @@
+<!--#include virtual="/2017/includes/header.html"-->
+
+<title>LibrePlanet 2017 &mdash; Live &mdash; Room 123</title>
+
+<!--#include virtual="/2017/includes/banner.html"-->
+<!--#include virtual="/2017/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="http://live2.fsf.org/slides-123.webm" type="video/webm" />
+	<p><em>Your browser does not support the video
+	  tag, <a href="http://live.fsf.org/room123.ogv">
+	  [ please download ]</a> the video instead.</em></p>
+      </video>
+    </div>  <!-- end Live Player -->
+	<!--#include virtual="/2017/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>#libreplanet</strong></li>
+	  <li>Freenode IRC channel for Room 123: <strong>#libreplanet_room123</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&amp;#libreplanet_room123"
+                  class="irc-client">
+          </iframe>
+	</div><!-- End of Kiwiirc widget -->
+  </div> <!-- end of main content -->
+
+  <div class="col-sm-4"> <!-- start of right sidebar column -->
+	<!--#include virtual="/2017/includes/live_sidebar.html" -->
+  </div> <!-- end of right sidebar column -->
+</div>
+
+
+<!--#include virtual="/2017/includes/footer.html"-->
+<!--#include virtual="/2017/includes/common_js.html"-->
+<script type="text/javascript" src="/2017/assets/js/stream.js"></script>
+<script type="text/javascript">
+ $("#room123").addClass("active").html("<strong>Room 123</strong>");
+ monitorStream('/test.webm');
+</script>
+<!--#include virtual="/2017/includes/close.html" -->
diff --git a/2017/live/room141.html b/2017/live/room141.html
new file mode 100755
index 00000000..3d68cfb9
--- /dev/null
+++ b/2017/live/room141.html
@@ -0,0 +1,55 @@
+<!--#include virtual="/2017/includes/header.html"-->
+
+<title>LibrePlanet 2017 &mdash; Live &mdash; Room 141</title>
+
+<!--#include virtual="/2017/includes/banner.html"-->
+<!--#include virtual="/2017/includes/sidebar.html"-->
+
+<h1>Room 141 </h1>
+
+<div class="row margin-top">
+  <div class="col-sm-8">
+	<div class="thumbnail"> <!-- start Live Player -->
+	    <video class="lp-video" controls>
+		  <source
+		      src="http://live.fsf.org/room141.ogv"
+		      type="video/ogg" />
+		  <p><em>Your browser does not support the video
+			  tag, <a href="http://live.fsf.org/room141.ogv">
+			    [ please download ]</a> the video instead.</em></p>
+	    </video>
+	</div>  <!-- end Live Player -->
+	<!--#include virtual="/2017/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>#libreplanet</strong></li>
+	  <li>Freenode IRC channel for Room 141: <strong>#libreplanet_room141</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/?&amp;theme=mini#libreplanet_room141"
+                  class="irc-client">
+          </iframe>
+	</div><!-- End of Kiwiirc widget -->
+  </div> <!-- end of main content -->
+
+  <div class="col-sm-4"> <!-- start of right sidebar column -->
+	<!--#include virtual="/2017/includes/live_sidebar.html" -->
+  </div> <!-- end of right sidebar column -->
+</div>
+
+
+<!--#include virtual="/2017/includes/footer.html"-->
+<!--#include virtual="/2017/includes/common_js.html"-->
+<script type="text/javascript">
+  $("#room141").addClass("active").html("<strong>Room 141</strong>");
+</script>
+<!--#include virtual="/2017/includes/close.html" -->
diff --git a/2017/live/room155.html b/2017/live/room155.html
new file mode 100755
index 00000000..91494711
--- /dev/null
+++ b/2017/live/room155.html
@@ -0,0 +1,55 @@
+<!--#include virtual="/2017/includes/header.html"-->
+
+<title>LibrePlanet 2017 &mdash; Live &mdash; Room 155</title>
+
+<!--#include virtual="/2017/includes/banner.html"-->
+<!--#include virtual="/2017/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="http://live.fsf.org/room155.ogv"
+		    type="video/ogg" />
+		<p><em>Your browser does not support the video
+			tag, <a href="http://live.fsf.org/room155.ogv">
+			  [ please download ]</a> the video instead.</em></p>
+	  </video>
+	</div>  <!-- end Live Player -->
+	<!--#include virtual="/2017/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>#libreplanet</strong></li>
+	  <li>Freenode IRC channel for Room 155: <strong>#libreplanet_room155</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/?&amp;theme=mini#libreplanet_room155"
+                  class="irc-client">
+          </iframe>
+	</div><!-- End of Kiwiirc widget -->
+  </div> <!-- end of main content -->
+
+  <div class="col-sm-4"> <!-- start of right sidebar column -->
+	<!--#include virtual="/2017/includes/live_sidebar.html" -->
+  </div> <!-- end of right sidebar column -->
+</div>
+
+
+<!--#include virtual="/2017/includes/footer.html"-->
+<!--#include virtual="/2017/includes/common_js.html"-->
+<script type="text/javascript">
+  $("#room155").addClass("active").html("<strong>Room 155</strong>");
+</script>
+<!--#include virtual="/2017/includes/close.html" -->
-- 
2.25.1