X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=2014%2Fanti-harassment%2Findex.html;h=5f982eec005f0f23023a8bbc40479a0c01a4cae4;hb=ae464f5e0c4bdafee80787ce0d4d60e0afcd653a;hp=47ba8afe0ccbc77bcce191c953c0ef67181d8294;hpb=1fa4e2f2cb43949e90615124c878be49666e643b;p=libreplanet-static.git

diff --git a/2014/anti-harassment/index.html b/2014/anti-harassment/index.html
index 47ba8afe..5f982eec 100644
--- a/2014/anti-harassment/index.html
+++ b/2014/anti-harassment/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="//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>
@@ -41,7 +48,7 @@
 
 		<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
@@ -49,23 +56,25 @@
 			</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><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>
+			  <li><a href="/2014/program">Program</a></li>
+			  <li><a href="/2014/program/exhibit_hall.html">Exhibit hall</a></li>
+              <li><a href="/2014/live">Participate online</a></li>
+			  <li><a href="/2014/video/">Watch the video</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/volunteer">Volunteer</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="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+				  Share your ideas</a></li>
 			  <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 class="active"><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>
@@ -79,11 +88,11 @@
 			<p class="text-muted text-center">and attend the conference gratis!</p>
 		  </div> <!-- end of nav items -->
 
-		  <div class="col-sm-9"> <!-- start of anti-harassment column -->
+		  <div id="lp-content" class="col-sm-9"> <!-- start of anti-harassment column -->
 
 			<h2> Anti-harassment policy </h2>
 
-			<p><i>Libby Reinish, FSF campaigns manager, is the contact person for any reports of violations of the anti-harassment policy during LibrePlanet 2013. If you need to file a report, find Libby or call her at <b>413-275-4786</b></i>
+			<p><i>Libby Reinish, FSF campaigns manager, is the contact person for any reports of violations of the anti-harassment policy during LibrePlanet 2014. If you need to file a report, find Libby or call her at <b>413-275-4786</b></i>
 </p><p>The FSF is dedicated to providing a harassment-free LibrePlanet experience for everyone. 
 </p>
 <ul><li> We do not tolerate harassment of conference participants in any form. Offensive or graphic sexual language and imagery is not appropriate for any conference venue, including talks. 
@@ -118,7 +127,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>
@@ -153,5 +162,28 @@
 
 	  </div>
 	</div> <!-- end of footer -->
+	<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).ready(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>