From fe8b05910c212620826707b069af0d7b39765ce3 Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@montage.office.fsf.org>
Date: Tue, 14 Apr 2015 11:05:31 -0400
Subject: [PATCH] Removing volunteer signup from the sidebar and adding an ask
 to the image overlay to subscribe for 2016 updates above.

---
 2015/index.html          | 2 +-
 server/2015/sidebar.html | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/2015/index.html b/2015/index.html
index c826609d..0427867e 100755
--- a/2015/index.html
+++ b/2015/index.html
@@ -12,7 +12,7 @@
 	<ul class="carousel-inner list-unstyled">
 			<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 2015 great! <a href="https://www.fsf.org/blogs/community/libreplanet-2015-highlights-and-what-comes-next">Read the wrap-up.</a></p>
+				<p class="carousel-caption-tl" style="font-size: larger; font-weight: bold;">Thanks for making LibrePlanet 2015 great! <a href="https://www.fsf.org/blogs/community/libreplanet-2015-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>
 
 		</ul>
diff --git a/server/2015/sidebar.html b/server/2015/sidebar.html
index 4562c366..2d782e50 100755
--- a/server/2015/sidebar.html
+++ b/server/2015/sidebar.html
@@ -19,6 +19,8 @@
 
       <li><a href="/2015/scholarships">Scholarships (until January 10th)</a></li>
 
+			<li id="volunteer-link"><a href="/2015/volunteer">Volunteer</a></li>
+
       <li><a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2015/Conference_brainstorm">Share Your Conference Ideas</a></li>
 
       <li><a href="http://media.libreplanet.org/">Videos of previous conferences</a></li>
@@ -41,7 +43,6 @@
 
 
       <li><a href="/2015/scholarship_donation">Build the Scholarship Fund</a></li>
-      <li id="volunteer-link"><a href="/2015/volunteer">Volunteer</a></li>
 
       <li id="ahp-link"><a href="/2015/anti-harassment/">Anti-Harassment Policy</a></li>
 
-- 
2.25.1