From d8bc9c4e50a90a0ce183099c731d77ed277867da Mon Sep 17 00:00:00 2001
From: Molly de Blanc <molly@fsf.org>
Date: Wed, 30 Aug 2017 12:43:04 -0400
Subject: [PATCH] changes to carousel. :(

---
 2018/index.html | 82 ++++++++++++++++++++++++-------------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/2018/index.html b/2018/index.html
index 3256bb82..8a67712f 100755
--- a/2018/index.html
+++ b/2018/index.html
@@ -5,41 +5,37 @@
 <!--#include virtual="/2018/includes/banner.html"-->
 <!--#include virtual="/2018/includes/sidebar.html"-->
 
+
 <!-- start of carousel -->
 <div id="lpc-carousel" class="carousel slide">
 
 	<!-- wrapper for slides -->
 	<ul class="carousel-inner list-unstyled">
 
-		<li class="item active">
-			<img src="http://static.fsf.org/nosvn/libreplanet/2018/assets/banner_no_year.svg"
-			alt="[ Libreplanet logo, consisting of several stars and connected green planets and the text "LibrePlanet" ]"
-			     height="860" width="1536">
-			<p class="carousel-caption-bottom" style="background-color: white;">
-		</li>
-			
-		<li class="item">
-				<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
-				alt="[ A photo of people in a room on laptops. They are sitting at desks, with a clean blackboard in the background on one wall, and on the other written on a bloackboard is the text "Installation Feedback." Several of the people have long hair, and one woman's hair is pink and yellow. ]"
-				     height="860" width="1536">>
-				<p class="carousel-caption-bottom"><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&id=33">Donate to the scholarship fund</a> to help us bring new people to LibrePlanet.
-			</p>
-		</li>
+	  <li class="item-active">
+	    <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
+		 alt="[ Apply for a scholarship ]"></img>
+	    <p class="carousel-caption-bottom">
+	      <a href="https://www.libreplanet.org/2017/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/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">
+	    <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/volunteer_helping.jpg" 
+		 alt="[ A presentation at LibrePlanet 2013]">
+	    <p class="carousel-caption-center">
+	      Volunteers keep LibrePlanet spinning <br>(and get great perks as well).<br>
+	      <a href="https://libreplanet.org/2018/volunteer">Join us today.</a>
+</p>
 
 		<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. ]">
-			<p class="carousel-caption-bottom" style="background-color: white;"><br></p></a>
-		</li>
-
-				</ul> -->
+			<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. ]">
+			<p class="carousel-caption-bottom">
+				Explore a wealth of <a href="https://www.libreplanet.org/2017/program/index.html">session videos and slides</a> from LibrePlanet 2017.</p></a>
+</li>
+				</ul>
+</div>
 
 				<!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT. Their formatting might not be quite right, but reusing them is much faster than making them from scratch.
 				<li class="item">
@@ -84,14 +80,6 @@ Apply for an exhibition table</a> for your free software business or project.
 <p class="carousel-caption-bottom">Thanks for making LibrePlanet 2016 great! <a href="https://www.fsf.org/news/hundreds-explore-ways-to-fork-the-system-with-free-software-at-libreplanet-2016">Read the recap</a>.</p>
 </li>
 
-
-<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 href="scholarships">Apply for a travel scholarship</a> by November 30th or <a href="https://www.libreplanet.org/2018/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/images/best-event-photos/fsf30-crypto-session-848x477.jpg"
 alt="[ Crypto panel at the FSF 30th Anniversary User Freedom Summit ]">
@@ -104,7 +92,7 @@ alt="[ Crypto panel at the FSF 30th Anniversary User Freedom Summit ]">
 <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 href="scholarships">Apply for a travel scholarship</a> by November 30th or <a href="https://www.libreplanet.org/2018/scholarship_donation">donate to the scholarship fund</a> to help us bring new people to LibrePlanet.
+<p class="lead carousel-caption-tl"> <a href="scholarships">Apply for a travel scholarship</a> by November 30th or <a href="https://www.libreplanet.org/2017/scholarship_donation">donate to the scholarship fund</a> to help us bring new people to LibrePlanet.
 </p>
 </li>
 
@@ -116,10 +104,10 @@ alt="[ Open house at LibrePlanet 2015 ]">
 </li>
 
 <li class="item">
-<img src="//static.fsf.org/nosvn/libreplanet/2018/site/graphics/carousel/keynotes-slide.jpg"
+<img src="//static.fsf.org/nosvn/libreplanet/2017/site/graphics/carousel/keynotes-slide.jpg"
 alt="[ Karen Sandler, Mako Hill and Richard Stallman speaking at previous LibrePlanets ]">
 <p class="carousel-caption-bl">
-<a href="https://libreplanet.org/2018/program/speakers.html#sandler">Karen Sandler</a>, <a href="https://libreplanet.org/2018/program/speakers.html#hill">Benjamin Mako Hill</a>, and<br><a href="https://libreplanet.org/2018/program/speakers.html#stallman">Richard Stallman</a> announced as keynote speakers.
+<a href="https://libreplanet.org/2017/program/speakers.html#sandler">Karen Sandler</a>, <a href="https://libreplanet.org/2017/program/speakers.html#hill">Benjamin Mako Hill</a>, and<br><a href="https://libreplanet.org/2017/program/speakers.html#stallman">Richard Stallman</a> announced as keynote speakers.
 </p>
 </li>
 
@@ -127,14 +115,14 @@ alt="[ Karen Sandler, Mako Hill and Richard Stallman speaking at previous LibreP
 <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/volunteer_helping.jpg" alt="[ A presentation at LibrePlanet 2013]">
 <p class="carousel-caption-center">
 Volunteers keep LibrePlanet spinning <br>(and get great perks as well).<br>
-<a href="https://libreplanet.org/2018/volunteer">Join us today.</a>
+<a href="https://libreplanet.org/2017/volunteer">Join us today.</a>
 </p>
 </li>
 
 <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 href="scholarships">Apply for a travel scholarship</a> by November 30th or <a href="https://www.libreplanet.org/2018/scholarship_donation">donate to the scholarship fund</a> to help us bring new people to LibrePlanet.
+<p class="lead carousel-caption-tl"> <a href="scholarships">Apply for a travel scholarship</a> by November 30th or <a href="https://www.libreplanet.org/2017/scholarship_donation">donate to the scholarship fund</a> to help us bring new people to LibrePlanet.
 </p>
 </li>
 
@@ -168,6 +156,20 @@ alt="[ Keynote speakers]">
 Get excited for our keynote speakers!
 </a></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> 
+
+			<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://my.fsf.org/civicrm/event/register?id=67&reset=1">Register your party</a> with the FSF.</p>
+		</li> -->
+
 -->
 
 
@@ -182,7 +184,6 @@ Get excited for our keynote speakers!
 </a>  <!--end of carousel -->
 </div>
 
-
 <!-- start of notification area -->
 
 <div class="row">
@@ -199,7 +200,6 @@ Get excited for our keynote speakers!
 <div class="col-md-12">
 #include virtual="/2018/includes/media-status.html"
 </div>-->
-</div>
 
 <!-- // next year's site available
 <div class="alert alert-success margin-top">
-- 
2.25.1