From 76dd93155fd71494aa013a9fdc92d618ec056d0d Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@fsf.org>
Date: Wed, 9 Mar 2016 14:16:12 -0500
Subject: [PATCH] Moving map to top of Getting Around page, tweaking DRM in
 HTML session description, putting nav back into program.

---
 2016/getting_around/index.html       | 29 ++++++++++++++--------------
 2016/program/generated-sessions.html | 10 +++++-----
 2016/program/index.html              | 16 +++++++--------
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/2016/getting_around/index.html b/2016/getting_around/index.html
index 19b7f1a1..e74c46e3 100755
--- a/2016/getting_around/index.html
+++ b/2016/getting_around/index.html
@@ -9,6 +9,15 @@
 
 <p><strong>LibrePlanet 2016 will held at the Stata Center at the Massachusetts Institute for Technology (32 Vassar St, Cambridge, MA 02139). Check out the <a href="#map">map</a> with restaurants and the Subway station near the conference.</strong></p>
 
+<h2 id="map">Map</h2>
+
+<div class="thumbnail">
+  <img class="img-responsive"
+	   src="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/map_final.svg"
+	   alt="[Venue Map]"
+	   style="width:100%">
+</div>
+
 <div id="lp-panel" class="panel panel-default margin-top">
   <div class="panel-heading">
     <h2 class="panel-title">
@@ -18,14 +27,15 @@
   </div>
 
   <div class="panel-body">
-
+    <p><a href="#map">Map</a></p>
     <p><a href="#lodging">Where to stay</a></p>
     <p><a href="#arriving">Arriving in Boston</a></p>
     <p><a href="#getting_around">Getting to the event locations</a></p>
     <p><a href="#eating">Where to eat</a></p>
-    <p><a href="#map">Map</a></p>
   </div>
 </div>
+
+
 <h2 id="lodging">Where to stay</h2>
 
 <p>Prices range from $ (inexpensive) to $$$ (expensive).</p>
@@ -100,7 +110,7 @@
         The Stata Center was famously designed by Frank Gehry; its <a href="http://upload.wikimedia.org/wikipedia/commons/c/ce/MIT_Stata_Center-20070224.jpg">unique look</a> makes it easy to spot.</li>
       </ul>
 
-<p>The <a href="#map">map</a> below is useful for finding your way from the station to the conference.</p>
+<p>Our <a href="#map">map</a> is useful for finding your way from the station to the conference.</p>
 
       <h3 id="office">Getting to the Free Software Foundation office</h3>
 
@@ -139,7 +149,7 @@
       <h2 id="eating">Where to Eat</h2>
 
       <h3>Kendall Square</h3>
-      <p>See the <a href="#map">map</a> below for the location of restaurants relative to the conference.</p>
+      <p>See the <a href="#map">map</a> for the location of restaurants relative to the conference.</p>
 
       <ul>
         <li><a href="http://www.emmaspizza.com/">Emma's Pizza</a> has served up great organic pizza for Cambridge for over 50 years. Vegetarian options.</li>
@@ -180,17 +190,6 @@
         <li><a href="http://www.samlagrassas.com/">Sam Lagrassa's</a> is famous for its sandwiches. Vegetarian options.</li>
       </ul>
 
-<h2 id="map">Map</h2>
-
-<div class="thumbnail">
-  <img class="img-responsive"
-	   src="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/map_final.svg"
-	   alt="[Venue Map]"
-	   style="width:100%">
-</div>
-
-
-
       <!--#include virtual="/2016/includes/footer.html"-->
       <!--#include virtual="/2016/includes/common_js.html"-->
       <!--#include virtual="/2016/includes/getting_around_js.html"-->
diff --git a/2016/program/generated-sessions.html b/2016/program/generated-sessions.html
index 153b892a..100d919f 100755
--- a/2016/program/generated-sessions.html
+++ b/2016/program/generated-sessions.html
@@ -782,20 +782,20 @@ knowledgeable people. Make sure everything is backed up first!</p>
 <section class="program-session" id="day-2-timeslot-4-session-1">
 <header class="program-session-header">
 <hgroup>
-<h2>Library Freedom Project: the long overdue partnership between libraries</h2>
+<h2>Library Freedom Project: the long overdue partnership between libraries and free software</h2>
 </hgroup>
 </header>
 <span class="program-session-speaker">
-        and free software
+<a href="speakers.html#macrina">Alison Macrina</a> and <a href="speakers.html#fatemi">Nima Fatemi</a>,
+        Library Freedom Project
   </span>
 <p class="program-session-room-details">
-<span class="label label-default"><a href="speakers.html#macrina">Alison Macrina</a> and <a href="speakers.html#fatemi">Nima Fatemi</a>, Library Freedom Project</span>
+<span class="label label-default">Room 32-123</span>
 <button aria-controls="day-2-timeslot-4-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-4-session-1-collapse" data-toggle="collapse">
                 Details
         </button>
 </p>
 <div class="collapse in" id="day-2-timeslot-4-session-1-collapse">
-<p>Room 32-123</p>
 <p>Librarians have long been defenders of democratic ideals like free
 speech and privacy, not only providing access to information and
 technology freely, but also by fighting back against threats to civil
@@ -1555,7 +1555,7 @@ live-streaming).</p>
 <section class="program-session" id="day-2-timeslot-14-session-4">
 <header class="program-session-header">
 <hgroup>
-<h2>Stop DRM in HTML! Campaign briefing, signmaking and demonstration prep</h2>
+<h2>Stop DRM in HTML! Briefing and prep for the evening's demonstration</h2>
 </hgroup>
 </header>
 <span class="program-session-speaker">
diff --git a/2016/program/index.html b/2016/program/index.html
index 21ce802b..20ce88da 100755
--- a/2016/program/index.html
+++ b/2016/program/index.html
@@ -10,7 +10,7 @@
 
 <!--#include virtual="/2016/includes/program-menu.html"-->
 
-<!--NOTE: when you comment this in, also comment in the mini-nav at the bottom of the file. <div id="lp-panel-fixed" class="panel panel-default hidden-xs">
+<div id="lp-panel-fixed" class="panel panel-default hidden-xs">
 <div class="panel-heading">
 <h2 class="panel-title">
 <span class="glyphicon glyphicon-list"></span>
@@ -18,10 +18,10 @@ Contents
 </h2>
 </div>
 <div class="panel-body">
-<p><a href="#saturday">Saturday sessions</a></p>
-<p><a href="#sunday">Sunday sessions</a></p>
+<p><a href="#day-1-program">Saturday sessions</a></p>
+<p><a href="#day-2-program">Sunday sessions</a></p>
+</div>
 </div>
-</div>-->
 
 <div class="row"> <!-- session row start -->
 	<div class="col-sm-9"> <!-- session column start -->
@@ -31,12 +31,12 @@ Contents
 </div> <!-- session column end -->
 </div> <!-- session row end -->
 
-<!--<div id="lp-mini-nav" class="visible-xs">
+<div id="lp-mini-nav" class="visible-xs">
 <ul class="list-inline">
-<li><a class="btn btn-default btn-xs" href="#saturday">Saturday sessions</a></li>
-<li><a class="btn btn-default btn-xs" href="#sunday">Sunday sessions</a></li>
+<li><a class="btn btn-default btn-xs" href="#day-1-program">Saturday sessions</a></li>
+<li><a class="btn btn-default btn-xs" href="#day-2-program">Sunday sessions</a></li>
 </ul>
-</div>-->
+</div>
 
 
 <!--#include virtual="/2016/includes/footer.html"-->
-- 
2.25.1