From b2935bb23b1e89e365be76b6cf6d63a871878653 Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@fsf.org>
Date: Thu, 17 Mar 2016 23:52:04 -0400
Subject: [PATCH] Launching streaming on the site.

---
 2016/includes/nav-list-1.html |  3 ++-
 2016/index.html               | 39 +++++++++++++++++------------------
 2016/program/social.html      |  7 ++++---
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/2016/includes/nav-list-1.html b/2016/includes/nav-list-1.html
index c4a4ec90..f2c80ac4 100644
--- a/2016/includes/nav-list-1.html
+++ b/2016/includes/nav-list-1.html
@@ -1,4 +1,5 @@
+<li><a href="/2016/streaming">Livestream</a></li>
 <li class="program-link"><a href="/2016/program">Program</a></li>
-<li><a href="https://media.libreplanet.org/">Videos of previous conferences</a></li>
+<!--<li><a href="https://media.libreplanet.org/">Videos of previous conferences</a></li>--> 
 <li class="getting_around-link"><a href="/2016/getting_around">Travel info</a></li>
 <li class="ahp-link"><a href="/2016/safe-space-policy/">Safe space policy</a></li>
diff --git a/2016/index.html b/2016/index.html
index 6065134f..d81ec579 100755
--- a/2016/index.html
+++ b/2016/index.html
@@ -11,29 +11,34 @@
 	<!-- wrapper for slides -->
 	<ul class="carousel-inner list-unstyled">
 
-		<li class="item active">
-			<a href="https://media.libreplanet.org/u/libreplanet/m/libreplanet-2016-fork-the-system/"><img src="//static.fsf.org/nosvn/libreplanet/feature-images/lp2016-video.png"
-			alt="[ LibrePlanet 2016 promotional video ]"></a>
-			<p class="carousel-caption-bottom"><a href="https://media.libreplanet.org/u/libreplanet/m/libreplanet-2016-fork-the-system/">Watch the video for a taste of what's to come at LibrePlanet</a></p>
-			</li>
-
-		<li class="item">
-			<img src="//static.fsf.org/nosvn/libreplanet/feature-images/snowden-feature.png"
-			alt="[ Snowden Keynote ]">
-			<p class="carousel-caption-bottom">
-				View the <a href="program/index.html">conference program</a>.</p>
+			<li class="item active">
+			<a href="streaming"><img src="//static.fsf.org/nosvn/libreplanet/feature-images/remote_participation.png"
+			alt="[ A globe. ]"></a>
+			<p class="carousel-caption-bottom">Wherever you are, we invite you to participate in LibrePlanet via livestream</a>.
 			</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. ]">
+				<img src="//static.fsf.org/nosvn/libreplanet/feature-images/snowden-feature.png"
+				alt="[ Snowden Keynote ]">
 				<p class="carousel-caption-bottom">
-					<a href="https://www.libreplanet.org/conference/libreluna">Register your party</a> with the FSF.</p>
+					View the <a href="program/index.html">conference program</a>.</p>
 				</li>
 
+		<li class="item">
+			<a href="https://media.libreplanet.org/u/libreplanet/m/libreplanet-2016-fork-the-system/"><img src="//static.fsf.org/nosvn/libreplanet/feature-images/lp2016-video.png"
+			alt="[ LibrePlanet 2016 promotional video ]"></a>
+			<p class="carousel-caption-bottom"><a href="https://media.libreplanet.org/u/libreplanet/m/libreplanet-2016-fork-the-system/">Watch the video for a taste of what's to come at LibrePlanet</a></p>
+			</li>
+
 				</ul>
 
 				<!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT
+				<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">
@@ -78,12 +83,6 @@ alt="[ Karen Sandler, Mako Hill and Richard Stallman speaking at previous LibreP
 </p>
 </li>
 
-<li class="item">
-<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/remote_participation.jpg" alt="[A globe]">
-<p class="carousel-caption-tr">
-Wherever you are, we invite you to participate in<br>LibrePlanet <a href="live">via chat and livestream</a>.</p>
-</li>
-
 <li class="item">
 <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/volunteer_helping.jpg" alt="[ A presentation at LibrePlanet 2013]">
 <p class="carousel-caption-center">
diff --git a/2016/program/social.html b/2016/program/social.html
index 20487889..4725c90b 100755
--- a/2016/program/social.html
+++ b/2016/program/social.html
@@ -36,10 +36,11 @@
 		<h1>Saturday, March 19</h1>
 		<div class="session">
 			<h3>LibrePlanet Party!</h3>
-			<p>Spend time with the LibrePlanet community and enjoy appetizers provided by the FSF. The location is TBD, but it will be wheelchair-accessible and open to all ages.</p>
+<p>Enjoy appetizers and beverages provided by the FSF and spend time with the LibrePlanet community. The Elephant and Castle has a full bar and kitchen, and is open to all ages and is wheelchair accessible. The restaurant is close to the FSF office, accessible from the MIT Stata Center by taking the Red Line from the Kendall/MIT stop toward Braintree/Ashmont, to the Downtown Crossing stop. The restaurant is located at 161 Devonshire Street, a 5-minute walk from Downtown Crossing station. </p>
 			<p class="session-details">
-				<strong>When:</strong> Approximately 19:00 - 21:00<br>
-				<strong>Where:</strong> Cambridge, MA, near the conference<br>
+				<strong>When:</strong> 19:00 - 22:00<br>
+				<strong>Where:</strong>The Elephant and Castle, 161 Devonshire Street, Boston, MA 02110 (between Winthrop Square and Milk Street)
+<br>
 			</p>
 
 		</div>
-- 
2.25.1