From 60678eee3396ebf3f5c19f4217a638e71045c698 Mon Sep 17 00:00:00 2001
From: Zak Rogoff <atticus@Amdijefri.office.fsf.org>
Date: Wed, 29 Oct 2014 17:00:24 -0400
Subject: [PATCH] Adding carousel back, with some aesthetic improvements.

---
 2015/assets/css/custom.css |  14 +----
 2015/index.html            | 115 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 116 insertions(+), 13 deletions(-)

diff --git a/2015/assets/css/custom.css b/2015/assets/css/custom.css
index 7f75401e..0b3da69f 100644
--- a/2015/assets/css/custom.css
+++ b/2015/assets/css/custom.css
@@ -384,16 +384,10 @@ h3 {
   padding-bottom: 10px;
   color: #ffffff;
   text-align: center;
-  background-color: rgba(0, 0, 0,0.4);
-  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
+  background-color: rgba(0, 0, 0,0.6);
   border-radius: 8px;
 }
 
-.call-for-proposal {
-	right: 2%;
-	left: 35%;
-}
-
 .carousel-caption-bl {
   position: absolute;
   font-size: 1.1em;
@@ -408,8 +402,7 @@ h3 {
   padding-right: 10px;
   color: #ffffff;
   text-align: center;
-  background-color: rgba(0, 0, 0,0.4);
-  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
+  background-color: rgba(0, 0, 0,0.6);
   border-radius: 8px;
 }
 
@@ -425,8 +418,7 @@ h3 {
   padding-bottom: 10px;
   color: #ffffff;
   text-align: center;
-  background-color: rgba(0, 0, 0,0.4);
-  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
+  background-color: rgba(0, 0, 0,0.6);
   border-radius: 8px;
 }
 
diff --git a/2015/index.html b/2015/index.html
index 4b162d2c..d227a540 100755
--- a/2015/index.html
+++ b/2015/index.html
@@ -5,8 +5,119 @@
 <!--#include virtual="/server/2015/banner.html"-->
 <!--#include virtual="/server/2015/sidebar.html"-->
 
-<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/crockford_and_levy_2014.jpg"
-	 alt="[ MIT Stata Center ]" />
+
+<!-- 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="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/crockford_and_levy_2014.jpg"
+					   alt="[ Two speakers at LibrePlanet 2014]">
+				  <p class="carousel-caption-tr">
+					Call for Sessions open until November 2nd.<br><a href="call_for_sessions">Submit a proposal today.</a><br>
+				</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> before November 30th or <a href="https://www.libreplanet.org/2015/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="[ Become a member ]">
+			<p class="lead carousel-caption-bl"> <a href="https://my.fsf.org/associate/support_freedom">Join the Free Software Foundation as a member</a> and get</br>gratis conference admission and other perks. 
+					  </p>
+				</li>
+
+</ul>
+<!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT -->
+
+<!--
+				<li class="item active">
+				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/stata_center.jpg"
+					   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">
+				  <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 LibrePlanet<br>via chat and livestream<br>
+					<a class="btn btn-default btn-carousel" href="http://libreplanet.org/2014/live">Participate online</a></p>
+				</li>
+
+
+
+				<li class="item">
+				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-room-110.jpg"
+					   alt="[ LibrePlanet 2013 discussion ]">
+				  <p class="lead carousel-caption-bl">
+					We're collecting suggestions for<br>LibrePlanet 2014
+
+					<a class="btn btn-default"
+					   href="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+					  Share your ideas
+					</a>
+
+				  </p>
+				</li>
+
+				<li class="item active">
+				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp14_keynotes.png"
+					   alt="[ Keynote speakers]">
+				  <p class="carousel-caption-tl">
+					<a class="btn btn-default btn-carousel" href="https://libreplanet.org/2014/speakers">
+					  Get excited for our keynote speakers!
+					</a></p>
+				</li>
+
+                <li class="item">
+				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-expand-the-tent.jpg"
+					   alt="[ The Expanding the Tent panel ]">
+				  <p class="carousel-caption-tr">
+					<a class="btn btn-default btn-carousel"
+					   href="https://libreplanet.org/2014/register">
+					  Register now
+					</a>
+					and be part of LibrePlanet 2014!
+				  </p>
+
+				</li>
+
+    			<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">
+					LibrePlanet is a great place to spread the word about your free software business or organization<br>
+					<a class="btn btn-default btn-carousel" href="https://libreplanet.org/2014/exhibit">
+					  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"
+					   alt="[ A presentation at LibrePlanet 2013]">
+				  <p class="carousel-caption-tr">
+					Volunteers are crucial in planning LibrePlanet<br>
+					<a class="btn btn-default btn-carousel" href="https://libreplanet.org/2014/volunteer">
+					  Join the planning committee
+					</a>
+				</li> -->
+			  <!-- controls -->
+			  <a class="left carousel-control" href="#lpc-carousel" data-slide="prev">
+				<span class="glyphicon glyphicon-chevron-left"></span>
+			  </a>
+			  <a class="right carousel-control" href="#lpc-carousel" data-slide="next">
+				<span class="glyphicon glyphicon-chevron-right"></span>
+			  </a>
+			</div> <!-- end of carousel -->
+
 
 			  <!-- // SURVEY ASK
 			<div class="alert alert-info margin-top">
-- 
2.25.1