From af408d685f95bb79063f995c18255d47f716b7aa Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@fsf.org>
Date: Thu, 6 Mar 2014 17:52:19 -0500
Subject: [PATCH] Building new carousel features.

---
 2014/index.html | 50 +++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/2014/index.html b/2014/index.html
index 936991ff..199455ff 100644
--- a/2014/index.html
+++ b/2014/index.html
@@ -90,16 +90,51 @@
 			  
 			  <!-- wrapper for slides -->
 			  <ul class="carousel-inner list-unstyled">
+<li class="item active">
+				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/volunteer_helping.png"
+					   alt="[ A presentation at LibrePlanet 2013]">
+				  <p class="carousel-caption-tr">
+					Volunteers make LibrePlanet great<br>(and get gratis admission and a t-shirt!)<br>
+					<a class="btn btn-default btn-carousel" href="https://libreplanet.org/2014/volunteer">Volunteer</a></p>
+				</li>
+
+				<li class="item">
+				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/remote_participation.png" alt="[A globe]">
+<p class="carousel-caption-tr">
+					Wherever you are, we invite you to participate in LibrePlanet<br>via chat and livestream<br>
+					<a class="btn btn-default btn-carousel" href="https://libreplanet.org/2014/live">Bookmark the remote participation page</a></p>
+				</li>
+
+				<li class="item">
+				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/stata_center.png"
+					   alt="[MIT's Stata Center]">
+				  <p class="carousel-caption-tl">
+					LibrePlanet has something for everyone<br>
+					<a class="btn btn-default btn-carousel" href="https://libreplanet.org/2014/program">View the complete program</a></p>
+				</li>
+				<li class="item">
+				  <a href="https://libreplanet.org/2014/video"><img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/video.png"
+					   alt="[A video screenshot of two free software advocates talking.]"></a>
+				  <p class="carousel-caption-tl">
+Watch and share our volunteer-created LibrePlanet video<br>
+					<a class="btn btn-default btn-carousel" href="https://libreplanet.org/2014/video">Watch now!</a></p>
+				</li>
+
+</ul>
+<!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT -->
+
+<!--
+
+
+
                  <li class="item">
 				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
 					   alt="[ Apply for a scholarship ]">
 			<p class="lead carousel-caption-tl">
 <a class="btn btn-default" href="https://libreplanet.org/2014/scholarship_donation">Donate to the scholarship fund</a> to help us bring new people to LibrePlanet.
 					  </p>
-				
 				</li>		
 
-				<!--
 				<li class="item">
 				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-room-110.jpg"
 					   alt="[ LibrePlanet 2013 discussion ]">
@@ -113,7 +148,7 @@
 
 				  </p>
 				</li>
-				-->
+				
 				<li class="item active">
 				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp14_keynotes.png"
 					   alt="[ Keynote speakers]">
@@ -122,7 +157,7 @@
 					  Get excited for our keynote speakers!
 					</a></p>
 				</li>
-<!-- Commented this out when adding the Keynote speaker slide
+
                 <li class="item">
 				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-expand-the-tent.jpg"
 					   alt="[ The Expanding the Tent panel ]">
@@ -135,8 +170,8 @@
 				  </p>
 				
 				</li>				
--->
-               			<li class="item">
+
+    			<li class="item">
 				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-printer.jpg"
 					   alt="[ Aleph Objects' Lulzbot 3D printer ]">
 				  <p class="carousel-caption-tr">
@@ -145,6 +180,7 @@
 					  Apply for an exhibition table and program ad
 					</a>
 				  </p>
+
 				</li>
 				<li class="item">
 				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-presentation.jpg"
@@ -155,8 +191,6 @@
 					  Join the planning committee
 					</a>
 				</li>
-
-			  </ul>
 			  <!-- controls -->
 			  <a class="left carousel-control" href="#lpc-carousel" data-slide="prev">
 				<span class="glyphicon glyphicon-chevron-left"></span>
-- 
2.25.1