X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=2014%2Findex.html;h=a0c7ba532492b788469f4991f8a9e3553367ef39;hb=dcdf6f4a764881e269b7f3a40f8ce56e2b672c80;hp=cf6c251f49e63892ad419b45c860b4ffc3af2c48;hpb=0c48380a40faac8344ccea44ff5d192efd0df5d8;p=libreplanet-static.git

diff --git a/2014/index.html b/2014/index.html
index cf6c251f..a0c7ba53 100644
--- a/2014/index.html
+++ b/2014/index.html
@@ -15,66 +15,23 @@
 	  <div class="lp-banner"> <!--start of lp banner -->
 		<div class="container"> <!-- start of container -->
 		  <div class="row">
-			<div class="col-sm-7"> <!-- start of lp header -->
+			<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 2014 in Cambridge, MA</strong></p>
+				<p><strong>March 22nd-23rd 2014 in Cambridge, MA</strong></p>
 				<p class="text-muted">Free software, free society</p>
 			  </div>
 			</div><!-- end of lp header -->
-			<div class="col-sm-5"> <!-- start of signup form -->
-			  <form role="form" class="margin-top lp-signup"
-					action="https://crm.fsf.org/civicrm/profile/create?gid=234&amp;reset=1"
-					method="post" name="Edit" id="Edit">
-				<div>
-				  <input name="postURL" type="hidden" value="" />
-				  <input name="cancelURL" type="hidden"
-						 value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=234" />
-				  <input name="add_to_group" type="hidden" value="306" />
-				  <input name="_qf_default" type="hidden" value="Edit:cancel" />
-				</div>
-
-				<div id="crm-container" lang="en" xml:lang="en">
-				  <p>Registration has not yet opened. Sign up for updates!</p>
-				  <div id="editrow-email-Primary"
-					   class="form-group">
-					<label class="sr-only" for="email-Primary">
-					  Email
-					</label>
-					<div class="input-group">
-					  <input class="form-control"
-							 name="email-Primary"
-							 id="email-Primary"
-							 type="email"
-							 placeholder="Your email address" required>
-					  <span class="input-group-btn">
-						<button type="submit" class="btn btn-default"
-								accesskey="S" name="_qf_Edit_next" value="Save"
-								id="_qf_Edit_next">
-						  Receive updates
-						</button>
-					  </span>
-					</div>
-				  </div>
-				  <div id="editrow-custom_79">
-					<div class="checkbox">
-					  <input
-						 type="hidden" name="custom_79[yes]" value="" />
-					  <label class="lp-label-news" for="custom_79_yes">
-						<input id="custom_79_yes"
-							   name="custom_79[yes]" type="checkbox" value="1" checked="checked"
-							   class="checkbox" />
-						  Also subscribe to the FSF's newsletter and updates.
-					  </label>
-					  &middot;
-					  <p class="help-block">
-						<a href="https://my.fsf.org/donate/privacypolicy.html">
-						  Privacy policy</a></p>
-					</div>
-				  </div>
-				</div>
-			  </form>
-			</div> <!-- end of signup form -->
+			<div class="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>
+				Register now
+			  </a>
+			  <p class="text-muted text-center">
+				gratis for members and students!
+			  </p>
+			</div> <!-- end of Register button -->
 		  </div>
 		</div> <!-- end of header container -->
 	  </div> <!-- end of lp banner -->
@@ -84,9 +41,9 @@
 
 		  <div 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/call_for_sessions">Propose a session</a></li>-->
 			  <li><a href="/2014/volunteer">Help plan LibrePlanet</a></li>
-			  <li><a href="/2014/exhibit">Exhibition tables</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>
@@ -112,16 +69,32 @@
 			  
 			  <!-- 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/lp13-room-110.jpg"
+					   alt="[ LibrePlanet 2013 discussion ]">
+				  <p class="lead carousel-caption-bl">				
+					We're collecting suggestions for<br>LibrePlanet 2014
+					
+					<a class="btn btn-default"
+					   href="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+					  Share your ideas
+					</a>
+
+				  </p>
+				</li>
+                		<li class="item active">
 				  <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 call-for-proposal">
-					Call for sessions now open! <a class="btn btn-default" href="https://libreplanet.org/2014/call_for_sessions">
-					  Propose a session
+				  <p class="lead carousel-caption-tr">
+					<a class="btn btn-default"
+					   href="https://libreplanet.org/2014/register">
+					  <strong>Register now</strong>
 					</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">
@@ -131,27 +104,22 @@
 					</a>
 				  </p>
 				</li>
-				<li class="item">
-				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-room-110.jpg"
-					   alt="[ LibrePlanet 2013 discussion ]">
-				  <p class="lead carousel-caption-bl">
-					We're collecting suggestions for LibrePlanet 2014
-					
-					<a class="btn btn-default"
-					   href="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
-					  Share your ideas
-					</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-tl">
-					Volunteers are crucial in planing LibrePlanet<br>
+				  	  <p class="lead carousel-caption-tr">
+					Volunteers are crucial in planning LibrePlanet<br>
 					<a class="btn btn-default" 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>
 			  <!-- controls -->
 			  <a class="left carousel-control" href="#lpc-carousel" data-slide="prev">
@@ -166,9 +134,9 @@
 			  <p class="lead">
 				 LibrePlanet is an annual conference for free software enthusiasts. LibrePlanet brings together software developers, policy experts, activists and computer users to learn skills, share accomplishments and face challenges to software freedom. Newcomers are always welcome, and LibrePlanet 2014 will feature programming for all ages and experience levels.</p>
 			  <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. 
+				 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>Students receive discounted admission and FSF members attend LibrePlanet at no cost! <a href="https://my.fsf.org/associate/support_freedom">Become a member now.</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></p>
 			</div> <!-- end of LP14 text -->
 
 		  </div> <!-- end of content column -->
@@ -249,5 +217,41 @@
 	    $('.glyphicon-chevron-right').css('display','inline-block');
 	  });
 	</script>
+
+	<!-- Piwik -->
+	<script type="text/javascript">
+	  /*
+	   * |@licstart The following is the entire license notice for the JavaScript code in this page.|
+
+       * Copyright 2012 Matthieu Aubry.
+
+       * This program is free software: you can redistribute it and/or modify
+       * it under the terms of the GNU General Public License as published by
+       * the Free Software Foundation, either version 3 of the License, or
+       * (at your option) any later version.
+
+       * This program is distributed in the hope that it will be useful,
+       * but WITHOUT ANY WARRANTY; without even the implied warranty of
+       * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       * GNU General Public License for more details.
+
+       * You should have received a copy of the GNU General Public License
+       * along with this program.  If not, see http://www.gnu.org/licenses/.
+
+	   * |@licend The above is the entire license notice for the JavaScript code in this page.|
+	  */
+	  var _paq = _paq || [];
+	  _paq.push(["trackPageView"]);
+	  _paq.push(["enableLinkTracking"]);
+
+	  (function() {
+		  var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
+		  _paq.push(["setTrackerUrl", u+"piwik.php"]);
+		  _paq.push(["setSiteId", "7"]);
+		  var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+		  g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+	  })();
+	</script>
+	<!-- End Piwik Code -->
   </body>
 </html>