From 982aec19c6bcde6aee0bbb19015a77689a551ed7 Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@fsf.org>
Date: Mon, 21 Dec 2015 15:53:16 -0500
Subject: [PATCH] Adding exhibitor reg to sidebar and caorusel.

---
 2016/includes/sidebar.html |  1 +
 2016/index.html            | 66 +++++++++++++++++++-------------------
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/2016/includes/sidebar.html b/2016/includes/sidebar.html
index d051c001..5c5deffd 100755
--- a/2016/includes/sidebar.html
+++ b/2016/includes/sidebar.html
@@ -28,6 +28,7 @@
 			<li><a href="https://media.libreplanet.org/">Videos of previous conferences</a></li>
 			<li><a href="https://www.libreplanet.org/2015/program">Last year's program</a></li>
 			<li id="mailing-list-link"><a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the discussion list</a></li>
+			<li><a href="https://my.fsf.org/civicrm/profile/create?gid=326&reset=1">Apply to exhibit</a></li>
 		</ul>
 
 		<ul class="nav nav-pills nav-stacked">
diff --git a/2016/index.html b/2016/index.html
index 9df5d0e5..6f4786e1 100755
--- a/2016/index.html
+++ b/2016/index.html
@@ -10,38 +10,49 @@
 
 	<!-- wrapper for slides -->
 	<ul class="carousel-inner list-unstyled">
-			<li class="item active">
-				<img src="//static.fsf.org/nosvn/images/best-event-photos/lp2013-expand-the-tent-848x477.jpg"
-				alt="[ The Expanding the Tent panel at LibrePlanet 2013 ]">
+		<li class="item active">
+			<img src="//static.fsf.org/nosvn/images/best-event-photos/lp2013-expand-the-tent-848x477.jpg"
+			alt="[ The Expanding the Tent panel at LibrePlanet 2013 ]">
 			<p class="carousel-caption-bottom">
 				<a href="https://media.libreplanet.org/">Watch videos</a> of great sessions from previous LibrePlanets.</a></p>
 			</li>
 
 			<li class="item">
-				<img src="//static.fsf.org/nosvn/images/best-event-photos/lp2015-open-house-848x477.jpg"
-				alt="[ Open house at LibrePlanet 2015 ]">
-				<p class="carousel-caption-bottom"> <a href="https://crm.fsf.org/join">Join the Free Software Foundation</a> and get gratis conference admission and other perks.
+				<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-printer.jpg"
+				alt="[ Aleph Objects' Lulzbot 3D printer ]">
+				<p class="carousel-caption-bottom">
+					LibrePlanet is a great place to spread the word about your free software business or project<br>
+					<a href="https://my.fsf.org/civicrm/profile/create?gid=326&reset=1">
+						Apply for an exhibition table
+					</a>
 				</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 ]">
-			<p class="carousel-caption-bottom">
-				<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>
-	</ul>
+			<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 ]">
+				<p class="carousel-caption-bottom">
+					<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>
+			</ul>
 
-	<!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT
+			<!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT
 
-	<li class="item active">
-	<img src="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/carousel/lp2015-open-house-carousel.jpg" alt="[ The Friday open house before the conference ]">
-	<p class="carousel-caption-tl" style="font-size: larger; font-weight: bold;">Thanks for making LibrePlanet 2016 great! <a href="https://www.fsf.org/blogs/community/libreplanet-2016-highlights-and-what-comes-next">Read the wrap-up</a> or use the form above to subscribe for updates on the 2016 conference.</p>
+			<li class="item active">
+			<img src="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/carousel/lp2015-open-house-carousel.jpg" alt="[ The Friday open house before the conference ]">
+			<p class="carousel-caption-tl" style="font-size: larger; font-weight: bold;">Thanks for making LibrePlanet 2016 great! <a href="https://www.fsf.org/blogs/community/libreplanet-2016-highlights-and-what-comes-next">Read the wrap-up</a> or use the form above to subscribe for updates on the 2016 conference.</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="https://www.libreplanet.org/2016/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/gnu30_hackers.jpg"
-alt="[ Apply for a scholarship ]">
-<p class="lead carousel-caption-tl"><a href="https://www.libreplanet.org/2016/scholarship_donation">Donate to the scholarship fund</a> to help us bring new people to LibrePlanet.
+<img src="//static.fsf.org/nosvn/images/best-event-photos/lp2015-open-house-848x477.jpg"
+alt="[ Open house at LibrePlanet 2015 ]">
+<p class="carousel-caption-bottom"> <a href="https://crm.fsf.org/join">Join the Free Software Foundation</a> and get gratis conference admission and other perks.
 </p>
 </li>
 
@@ -67,17 +78,6 @@ Volunteers keep LibrePlanet spinning <br>(and get great perks as well).<br>
 </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 project<br>
-<a href="https://libreplanet.org/2014/exhibit">
-Apply for an exhibition table
-</a>
-</p>
-</li>
-
 <li class="item">
 <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
 alt="[ Apply for a scholarship ]">
@@ -122,10 +122,10 @@ Get excited for our keynote speakers!
 
 
 <a class="left carousel-control" href="#lpc-carousel" data-slide="prev">
-<span class="glyphicon glyphicon-chevron-left"></span>
+	<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>
+	<span class="glyphicon glyphicon-chevron-right"></span>
 </a>  <!--end of carousel -->
 </div>
 
-- 
2.25.1