Removing links to CFS.

diff --git a/2015/index.html b/2015/index.html
index f7a07848ff4d1ca5d3896b1569f4b4d48373b928..7c7294f61f8a6525c510a9a876055da44ffbbb6a 100755 (executable)
--- 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 f76349111003667892348a66b1f6eedba50c2186..6ff2eda792fced402821e8a7acd37e68fc686f32 100755 (executable)
--- 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>