From: Zak Rogoff <atticus@Amdijefri.office.fsf.org>
Date: Tue, 25 Feb 2014 19:37:20 +0000 (-0500)
Subject: Making separate page for speakers in the program section.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8edc20e9997124af59bb34cb7ed52ed157daa7da;p=libreplanet-static.git

Making separate page for speakers in the program section.
---

diff --git a/server/staging/lpc14/program/index.html b/server/staging/lpc14/program/index.html
index 898c09af..7009c55c 100644
--- a/server/staging/lpc14/program/index.html
+++ b/server/staging/lpc14/program/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, MIT, 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="http://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,7 +47,7 @@
 	  <div class="container"> <!-- start of container -->
 		<div class="row">
 
-<div class="col-sm-3"> <!-- start of nav items -->
+		  <div id="lp-nav" 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
@@ -51,6 +58,7 @@
 			  <!--<li><a href="/2014/volunteer">Help plan LibrePlanet</a></li>-->
 			  <li class="active"><a href="/2014/program">Program</a></li>
 			  <li><a href="/2014/speakers">Speakers</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">
@@ -61,6 +69,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/live">Streaming</a></li>
 		  <li><a href="/2014/scholarship_donation">Donate to the scholarship fund</a></li>
 
 			</ul>
@@ -80,12 +89,12 @@
 			<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 -->
 			<h2>Program</h2>
-			<p>Here's a sneak peek at all the good stuff we've got in store for LibrePlanet 2014. Check back soon for session descriptions and the full schedule!</p>
+			<p><span style="color:grey;">Sessions</span> | <a href="./speakers">Speakers</a></p>
 
 <h2 style="color:grey;"><em>Keynotes</em></h2>
-<p><em>Sue Gardner</em>  </p>
+<p><em>Sue Gardner, Wikimedia Foundation</em>  </p>
 <p><em>Eben Moglen, Software Freedom Law Center</em>  </p>
 <p><em>Karen Sandler, GNOME Foundation</em>  </p>
 <p><em>Richard Stallman, Free Software Foundation</em>  </p>
@@ -103,6 +112,10 @@
 
 <p><em>ginger coons, Kÿra, Femke Snelting</em>  </p>
 
+<h3>Choosing between freedom and security</h3>
+
+<p><em>Matthew Garrett</em></p>  
+
 <h3>Considering the future of copyleft: How will the next generation perceive GPL?</h3>
 
 <p><em>Bradley Kuhn</em>  </p>
@@ -111,13 +124,17 @@
 
 <p><em>Fateh Slavitskaya</em>  </p>
 
+<h3>Diversity Outreach</h3>
+
+<p><em>Karen Sandler, Marina Zhurakhinskaya</em></p> 
+
 <h3>Everybody spies</h3>
 
 <p><em>Kade Crockford, Josh Levy</em></p>
 
 <h3>Free software activism : an European perspective and experience</h3>
 
-<p><em>Frederic Couchet, Loic Dachary</em>  </p>
+<p><em>Lionel Allorge, Frederic Couchet</em>  </p>
 
 <h3>Free software and open science</h3>
 
@@ -175,13 +192,9 @@
 
 <p><em>Christopher Webber</em> </p>
 
-<h3>TPP and free software</h3>
-
-<p><em>Maira Sutton</em>  </p>
-
 <h3>Tracking changes: Activists using free software across movements</h3>
 
-<p><em>April Glaser, Bryan Mercer, Eva Galperin, Emi Kane</em>  </p>
+<p><em>April Glaser, Libby Reinish</em>  </p>
 
 <h3>Update on the circumvention tech community &amp; how to get involved</h3>
 
@@ -210,7 +223,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>
@@ -248,5 +261,27 @@
 			src="/2014/assets/js/jquery-1.10.2.min.js"></script>
 	<script type="text/javascript"
 			src="/2014/assets/js/bootstrap.min.js"></script>
+	<script type="text/javascript"
+			src="/2014/assets/js/jquery-1.10.2.min.js"></script>
+	<script type="text/javascript">
+
+     // @license magnet:?xt=urn:btih:8e4f440f4c65981c5bf93c76d35135ba5064d8b7&dn=apache-2.0.txt
+     // Copyright (C) 2014 Free Software Foundation, Inc
+
+      $(document).load(lpNavPlace);
+
+      $(window).resize(lpNavPlace);
+
+      function lpNavPlace() {
+        screenSize = $(window).width();
+        if(screenSize <= 767) {
+           $("#lp-nav").insertAfter("#lp-content");
+        } else {
+           $("#lp-nav").insertBefore("#lp-content");
+        }
+      }
+
+     // @license-end
+	</script>
   </body>
 </html>
diff --git a/server/staging/lpc14/program/speakers.html b/server/staging/lpc14/program/speakers.html
new file mode 100644
index 00000000..d06a844e
--- /dev/null
+++ b/server/staging/lpc14/program/speakers.html
@@ -0,0 +1,168 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+	<meta charset="utf-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
+	<link href="/2014/assets/css/bootstrap.min.css" rel="stylesheet" media="screen" />
+	<link href="/2014/assets/css/custom.css" rel="stylesheet" media="screen" />
+	<link href="https://static.fsf.org/fsforg/img/favicon.ico" rel="shortcut icon">
+	<title>Program &mdash; LibrePlanet 2014</title>
+
+  </head>
+  <body>
+
+	<div id="wrapper"> <!-- start of wrapper -->
+	  <div class="lp-banner"> <!--start of lp banner -->
+		<div class="container"> <!-- start of container -->
+		  <div class="row">
+			<div class="lp-head"> <!-- start of lp header -->
+			  <div class="col-sm-3">
+				<a href="/2014/">
+				  <img src="http://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-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>
+				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 -->
+
+	  <div class="container"> <!-- start of container -->
+		<div class="row">
+
+		  <div id="lp-nav" 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>
+			<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 class="active"><a href="/2014/program">Program</a></li>
+			  <li><a href="/2014/speakers">Speakers</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>
+			 </ul>
+
+			<ul class="nav nav-pills nav-stacked">
+
+			  <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/live">Streaming</a></li>
+		  <li><a href="/2014/scholarship_donation">Donate to the scholarship fund</a></li>
+
+			</ul>
+
+
+			<ul class="nav nav-pills nav-stacked">
+			  <li><a href="http://media.libreplanet.org/">LibrePlanet 2013 videos</a></li>
+			  <li><a href="https://libreplanet.org/wiki/LibrePlanet:Conference">Previous conferences</a></li>
+			  <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>
+			  <li class="fsf-donate">
+				<a href="https://my.fsf.org/associate/support_freedom">
+				  <span class="glyphicon glyphicon-heart"></span>
+				  Become an FSF member
+				</a>
+			  </li>
+			</ul>
+			<p class="text-muted text-center">and attend the conference gratis!</p>
+		  </div> <!-- end of nav items -->
+
+		  <div id="lp-content" class="col-sm-9"> <!-- start of content column -->
+			<h2>Program</h2>
+<p><a href="./speakers">Sessions</a> | <span style="color:grey;">Speakers</span></p>
+		  </div> <!-- end of content column -->
+
+		</div>
+	  </div> <!-- end of container -->
+
+	</div> <!-- end of wrapper -->
+
+	<div id="footer">
+	  <div class="container">
+		<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. 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>
+
+		<p class="text-muted text-center">
+		  <a rel="license"
+			 href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+			<img alt="[ Creative Commons License ]" style="border-width:0"
+				 src="//i.creativecommons.org/l/by-sa/3.0/80x15.png" />
+		  </a>
+		  This page and its images, logos and videos are licensed under a <br />
+		  <a rel="license"
+			 href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+			Creative Commons Attribution-ShareAlike 3.0 US
+		  </a>.
+		  Copyright &copy; 2013 Free Software Foundation.
+		</p>
+
+		<p class="text-muted text-center">
+		  <a href="http://weblabels.fsf.org/libreplanet.org/CURRENT/" rel="jslicense">
+			JavaScript license information
+		  </a>
+		</p>
+
+		<p class="text-muted text-center">
+		  This site, including fonts, CSS, and JavaScript, was built using
+		  <a href="http://getbootstrap.com">Bootstrap</a>,
+		  which is licensed under the
+		  <a href="https://directory.fsf.org/wiki/License:Apache2.0">
+			Apache 2.0 license</a>.
+		</p>
+	  </div>
+	</div>
+	<script type="text/javascript"
+			src="/2014/assets/js/jquery-1.10.2.min.js"></script>
+	<script type="text/javascript"
+			src="/2014/assets/js/bootstrap.min.js"></script>
+	<script type="text/javascript"
+			src="/2014/assets/js/jquery-1.10.2.min.js"></script>
+	<script type="text/javascript">
+
+     // @license magnet:?xt=urn:btih:8e4f440f4c65981c5bf93c76d35135ba5064d8b7&dn=apache-2.0.txt
+     // Copyright (C) 2014 Free Software Foundation, Inc
+
+      $(document).load(lpNavPlace);
+
+      $(window).resize(lpNavPlace);
+
+      function lpNavPlace() {
+        screenSize = $(window).width();
+        if(screenSize <= 767) {
+           $("#lp-nav").insertAfter("#lp-content");
+        } else {
+           $("#lp-nav").insertBefore("#lp-content");
+        }
+      }
+
+     // @license-end
+	</script>
+  </body>
+</html>