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

diff --git a/2014/index.html b/2014/index.html
index d5c71f86..4d236415 100644
--- a/2014/index.html
+++ b/2014/index.html
@@ -16,14 +16,21 @@
 	  <div class="lp-banner"> <!--start of lp banner -->
 		<div class="container"> <!-- start of container -->
 		  <div class="row">
-			<div class="col-sm-9"> <!-- start of lp header -->
-			  <div class="lp-head">
-				<h1><a href="/2014/"> LibrePlanet <small>2014</small></a></h1>
-				<p><strong>March 22nd-23rd 2014 in Cambridge, MA</strong></p>
-				<p class="text-muted">Free software, free society</p>
+			<div class="lp-head"> <!-- start of lp header -->
+			  <div class="col-sm-3">
+				<a href="/2014/">
+				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/logo/lp_2014_logo.png"
+					   class="img-responsive"
+					   alt="[ LibrePlanet 2014 &mdash; Free Software, free society ]" />
+				</a>
+			  </div>
+			  <div class="col-sm-3">
+				<p class="text-muted">
+				  March 22<sup>nd</sup>-23<sup>rd</sup><br />
+				  MIT, Cambridge, MA</p>
 			  </div>
 			</div><!-- end of lp header -->
-			<div class="col-sm-3"> <!-- start of Register button -->
+			<div class="col-sm-offset-3 col-sm-3"> <!-- start of Register button -->
 			  <a class="btn btn-register-lp14 btn-lg btn-block"
 				 href="https://libreplanet.org/2014/register">
 				<span class="glyphicon glyphicon-ok"></span>
@@ -40,16 +47,11 @@
 	  <div class="container"> <!-- start of container -->
 		<div class="row"> 
 
-<div class="col-sm-3"> <!-- start of nav items -->
-			<p class="text-center lp-home">
-			  <a class="text-muted" href="/2014/">
-				<span class="glyphicon glyphicon-chevron-left"></span> Home
-			  </a>
-			</p>
+		  <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/exhibit">Promotional opportunities</a></li>
+			  <li><a href="/2014/program">Program</a></li>
+			  <li><a href="/2014/video/">Watch the video</a></li>
 			  <li>
 				<a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
 				  Share your ideas</a></li>
@@ -57,8 +59,10 @@
 
 			<ul class="nav nav-pills nav-stacked">
 
-			  <li><a href="/2014/logistics">Lodging</a></li>
-		  <li><a href="/2014/scholarships">Scholarships (until January 10th)</a></li>
+			  <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>
 
 			</ul>
@@ -78,25 +82,58 @@
 			<p class="text-muted text-center">and attend the conference gratis!</p>
 		  </div> <!-- end of nav items -->
 
-		  <div class="col-sm-9"> <!-- start of content column -->
+		  <div id="lp-content" class="col-sm-9"> <!-- start of content column -->
 
 			<!-- start of carousel -->
 			<div id="lpc-carousel" class="carousel slide">
 			  
 			  <!-- wrapper for slides -->
 			  <ul class="carousel-inner list-unstyled">
-                <li class="item active">
+<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/scholarships">Apply for a scholarship before January 10th</a><br>or<br><a class="btn btn-default"
-					   href="https://libreplanet.org/2014/scholarship_donation">donate to our scholarship fund.</a>
+<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>		
 
-<!--
 				<li class="item">
 				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-room-110.jpg"
 					   alt="[ LibrePlanet 2013 discussion ]">
@@ -110,46 +147,49 @@
 
 				  </p>
 				</li>
--->
-                		<li class="item">
+				
+				<li class="item active">
+				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp14_keynotes.png"
+					   alt="[ Keynote speakers]">
+				  <p class="carousel-caption-tl">
+					<a class="btn btn-default btn-carousel" href="https://libreplanet.org/2014/speakers">
+					  Get excited for our keynote speakers!
+					</a></p>
+				</li>
+
+                <li class="item">
 				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-expand-the-tent.jpg"
 					   alt="[ The Expanding the Tent panel ]">
-				  <p class="lead carousel-caption-tr">
-					<a class="btn btn-default"
+				  <p class="carousel-caption-tr">
+					<a class="btn btn-default btn-carousel"
 					   href="https://libreplanet.org/2014/register">
-					  <strong>Register now</strong>
+					  Register now
 					</a>
 					and be part of LibrePlanet 2014!
 				  </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="lead carousel-caption-tr">
+				  <p class="carousel-caption-tr">
 					LibrePlanet is a great place to spread the word about your free software business or organization<br>
-					<a class="btn btn-default" href="https://libreplanet.org/2014/exhibit">
+					<a class="btn btn-default btn-carousel" href="https://libreplanet.org/2014/exhibit">
 					  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"
 					   alt="[ A presentation at LibrePlanet 2013]">
-				  	  <p class="lead carousel-caption-tr">
+				  <p class="carousel-caption-tr">
 					Volunteers are crucial in planning LibrePlanet<br>
-					<a class="btn btn-default" href="https://libreplanet.org/2014/volunteer">
+					<a class="btn btn-default btn-carousel" href="https://libreplanet.org/2014/volunteer">
 					  Join the planning committee
 					</a>
-				</li>
-<!-- Commented out until registration opens, at which point it will get the overlay for that and become the first in the carousel
-				<li class="item">
-				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-room-110.jpg"
-					   alt="[ LibrePlanet 2013 discussion ]">
-				  
-				</li>
-				-->
-			  </ul>
+				</li> -->
 			  <!-- controls -->
 			  <a class="left carousel-control" href="#lpc-carousel" data-slide="prev">
 				<span class="glyphicon glyphicon-chevron-left"></span>
@@ -165,7 +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> <a href="https://libreplanet.org/2014/scholarships">Scholarships are also avalaible.</a></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>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 -->
@@ -180,7 +222,7 @@
 		<p class="text-muted text-center">
 		  The <a href="http://www.fsf.org/">Free Software
 		  Foundation</a> is a nonprofit with a worldwide mission to
-		  advance software freedom.
+		  advance software freedom. LibrePlanet 2014 is produced in partnership by the <a href="https://www.fsf.org">Free Software Foundation</a> with the <a href="http://sipb.mit.edu/">Student Information Processing Board (SIPB)</a> at MIT.
 		  <a href="https://my.fsf.org/associate/support_freedom">
 			Donate</a>.
 		</p>
@@ -222,7 +264,7 @@
 	  /**
 	  * @licstart  The following is the entire license notice for the JavaScript code in this page.
 	  *
-	  * Copyright (C) 2013 Free Software Foundation, Inc
+	  * Copyright (C) 2013, 2014 Free Software Foundation, Inc
 
 	  * Licensed under the Apache License, Version 2.0 (the
 	  * "License"); you may not use this file except in compliance
@@ -245,6 +287,19 @@
 	    $('.glyphicon-chevron-left').css('display','inline-block');
 	    $('.glyphicon-chevron-right').css('display','inline-block');
 	  });
+
+      $(document).ready(lpNavPlace);
+
+      $(window).resize(lpNavPlace);
+
+      function lpNavPlace() {
+        screenSize = $(window).width();
+        if(screenSize <= 767) {
+           $("#lp-nav").insertAfter("#lp-content");
+        } else {
+           $("#lp-nav").insertBefore("#lp-content");
+        }
+      }
 	</script>
 
 	<!-- Piwik -->