X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=2014%2Findex.html;h=4d236415d5c34f4b47cd4e27ecba8beeb5c68651;hb=43c661858ee3d4f2a00e922e443aedce9d99aa47;hp=6d26f8be47025e8b23f27c0cbf2f6a7c809eccf0;hpb=bb8c2e6fb6d160583f784b8f3390fac09fd77266;p=libreplanet-static.git

diff --git a/2014/index.html b/2014/index.html
index 6d26f8be..4d236415 100644
--- a/2014/index.html
+++ b/2014/index.html
@@ -50,10 +50,8 @@
 		  <div id="lp-nav" class="col-sm-3"> <!-- start of nav items -->
 			<ul class="nav nav-pills nav-stacked">
 			  <!--<li><a href="/2014/call_for_sessions">Propose a session</a></li>-->
-			  <!--<li><a href="/2014/volunteer">Help plan LibrePlanet</a></li>-->
 			  <li><a href="/2014/program">Program</a></li>
 			  <li><a href="/2014/video/">Watch the video</a></li>
-			  <li><a href="/2014/exhibit">Promotional opportunities</a></li>
 			  <li>
 				<a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
 				  Share your ideas</a></li>
@@ -63,6 +61,7 @@
 
 			  <li><a href="/2014/logistics">Getting around Cambridge</a></li>
 		  <!--<li><a href="/2014/scholarships">Scholarships (until January 10th)</a></li>-->
+			  <li><a href="/2014/volunteer">Volunteer</a></li>
               <li><a href="/2014/live">Participate online</a></li>
 		  <li><a href="/2014/scholarship_donation">Donate to the scholarship fund</a></li>
 
@@ -90,16 +89,51 @@
 			  
 			  <!-- wrapper for slides -->
 			  <ul class="carousel-inner list-unstyled">
+<li class="item">
+				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/volunteer_helping.png"
+					   alt="[ A presentation at LibrePlanet 2013]">
+				  <p class="carousel-caption-tr">
+					Volunteers make LibrePlanet great<br>(and get gratis admission and a t-shirt!)<br>
+					<a class="btn btn-default btn-carousel" href="https://libreplanet.org/2014/volunteer">Volunteer</a></p>
+				</li>
+
+				<li class="item">
+				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/remote_participation.png" 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="https://libreplanet.org/2014/live">Bookmark the remote participation page</a></p>
+				</li>
+
+				<li class="item active">
+				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/stata_center.png"
+					   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">
+				  <a href="https://libreplanet.org/2014/video"><img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/video.png"
+					   alt="[A video screenshot of two free software advocates talking.]"></a>
+				  <p class="carousel-caption-tl">
+Watch and share our volunteer-created LibrePlanet video<br>
+					<a class="btn btn-default btn-carousel" href="https://libreplanet.org/2014/video">Watch now!</a></p>
+				</li>
+
+</ul>
+<!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT -->
+
+<!--
+
+
+
                  <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 class="btn btn-default" href="https://libreplanet.org/2014/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="[ LibrePlanet 2013 discussion ]">
@@ -113,7 +147,7 @@
 
 				  </p>
 				</li>
-				-->
+				
 				<li class="item active">
 				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp14_keynotes.png"
 					   alt="[ Keynote speakers]">
@@ -122,7 +156,7 @@
 					  Get excited for our keynote speakers!
 					</a></p>
 				</li>
-<!-- Commented this out when adding the Keynote speaker slide
+
                 <li class="item">
 				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-expand-the-tent.jpg"
 					   alt="[ The Expanding the Tent panel ]">
@@ -135,8 +169,8 @@
 				  </p>
 				
 				</li>				
--->
-               			<li class="item">
+
+    			<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">
@@ -145,6 +179,7 @@
 					  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"
@@ -154,9 +189,7 @@
 					<a class="btn btn-default btn-carousel" href="https://libreplanet.org/2014/volunteer">
 					  Join the planning committee
 					</a>
-				</li>
-
-			  </ul>
+				</li> -->
 			  <!-- controls -->
 			  <a class="left carousel-control" href="#lpc-carousel" data-slide="prev">
 				<span class="glyphicon glyphicon-chevron-left"></span>
@@ -172,9 +205,9 @@
 			  <p>
 				 This year, the theme of LibrePlanet is "Free Software, Free Society." How can free software protect journalists, whistleblowers, activists, and regular computer users from government and corporate surveillance? How can free software, or free software values like copyleft, community development, and transparency, be used by people fighting to create free societies around the world? What challenges are standing between us and our goal of free software ubiquity? With your help, we'll tackle these questions and more at LibrePlanet 2014, March 22-23 in Cambridge, MA. 
 			  </p>
-<p>FSF members and students attend LibrePlanet at no cost! <a href="https://my.fsf.org/associate/support_freedom">Become a member now.</a> We encourage you to <a href="https://crm.fsf.org/civicrm/event/register?reset=1&id=13">register in advance</a>, but registration will be available at the door on both days of the conference.</p>
+<p>FSF members and students attend LibrePlanet at no cost! <a href="https://my.fsf.org/associate/support_freedom">Become a member now</a>. We encourage you to <a href="https://crm.fsf.org/civicrm/event/register?reset=1&amp;id=13">register in advance</a>, but registration will be available at the door on both days of the conference.</p>
 
-<p>On Monday, March 24th after the conference, the Free Software Foundation's Seminar will hold a GPL Enforcement and Legal Ethics seminar at Suffolk University. <a href="https://www.fsf.org/events/seminar-on-gpl-enforcement-and-legal-ethics">This is a separate event and requires separate registration</a>.</p>
+<p>There are two other events, with separate registration, taking place before and after the conference. On Friday, March 21st, community-members will hold the <a href="https://www.fsf.org/blogs/community/the-0th-spinachcon">0th SpinachCon</a>, where users and developers will improve the user experience of free software programs. On Monday, March 24th (the day after LibrePlanet), the Free Software Foundation will hold a <a href="https://www.fsf.org/events/seminar-on-gpl-enforcement-and-legal-ethics">GPL Enforcement and Legal Ethics seminar</a> at Suffolk University in Boston.</p>
 			</div> <!-- end of LP14 text -->
 
 		  </div> <!-- end of content column -->