From e24f7f923870cec60eaa40de0df3176537dd130b Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@montage.office.fsf.org>
Date: Mon, 10 Nov 2014 17:28:55 -0500
Subject: [PATCH] Removing links to CFS.

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

diff --git a/2015/index.html b/2015/index.html
index f7a07848..7c7294f6 100755
--- a/2015/index.html
+++ b/2015/index.html
@@ -13,6 +13,28 @@
 			  <ul class="carousel-inner list-unstyled">
 
 
+				</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>
+
+				<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/2015/volunteer">
+					  Join the planning committee
+					</a>
+				</li>
+
+</ul>
+<!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT -->
+
+<!--
 <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]">
@@ -24,18 +46,8 @@
 					   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]">
@@ -100,15 +112,7 @@
 				  </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>
@@ -118,13 +122,13 @@
 			  </a>
 			</div> <!-- end of carousel -->
 
-
+	
 <!-- start of notification area -->
 
-<!--fill out the feedback survey-->
+<!--fill out the feedback survey
 <div class="alert alert-success margin-top">
 				<p style="text-align:center;"><strong><a href="call_for_sessions" style="color:black; text-decoration:underline; font-size:150%;">The call for sessions deadline is extended! Propose your session by Sunday, November 9th at 19:59 EST (23:59 UTC).</a></strong></p>
-</div>
+</div>-->
 
 
 <!-- // fill out the feedback survey
diff --git a/server/2015/sidebar.html b/server/2015/sidebar.html
index f7634911..6ff2eda7 100755
--- a/server/2015/sidebar.html
+++ b/server/2015/sidebar.html
@@ -10,7 +10,7 @@
             <!--#endif -->
 
             <ul class="nav nav-pills nav-stacked" style="padding-top: 0 !important;">
-              <li id="cfs-link"><a href="/2015/call_for_sessions">Propose a Session</a></li>
+              <!--<li id="cfs-link"><a href="/2015/call_for_sessions">Propose a Session</a></li>-->
               <!--<li><a href="/2015/program">Program</a></li>-->
               <!--<li><a href="/2015/program/exhibit_hall.html">Exhibit hall</a></li>-->
               <li id="exhibit-link"><a href="/2015/exhibit">Join the Exhibit Hall</a></li>
-- 
2.25.1