updated the nav box in /2015/program/ -- it is fixed; so always visible while scrolling.

[libreplanet-static.git] / 2015 / program / index.html

diff --git a/2015/program/index.html b/2015/program/index.html
index f774d0363e43c7697c186e982c42b68a91a9a197..792840975025697feffccb7c3d566b651c136f8b 100755 (executable)
--- a/2015/program/index.html
+++ b/2015/program/index.html
@@ -17,7 +17,7 @@ Fixed nav
 
 <!--#include virtual="/server/2015/program-menu.html"-->
 
-<div id="lp-panel" class="panel panel-default">
+<div id="lp-panel" class="panel panel-default hidden-xs">
        <div class="panel-heading">
                <h2 class="panel-title">
                        <span class="glyphicon glyphicon-list"></span>
@@ -30,10 +30,10 @@ Fixed nav
        </div>
 </div>
 
-<p>All times are in Eastern Daylight Time (EDT), which is UTC - 4 hours. In room numbers, "32-" refers to MIT Building 32 (the Stata Center), where all conference rooms are located.</p>
-
 <div class="row"> <!-- session row start -->
        <div class="col-sm-9"> <!-- session column start -->
+         <p>All times are in Eastern Daylight Time (EDT), which is UTC - 4 hours. In room numbers, "32-" refers to MIT Building 32 (the Stata Center), where all conference rooms are located.</p>
+
                <h1 id="saturday">Saturday, March 21</h1>
                <hr>
                <h2><small>09:00 - 09:45: Registration and Breakfast</small></h2>
@@ -67,7 +67,7 @@ Fixed nav
                <div class="session">
                        <h3 id="lightning-talks">Lightning talks (until 12:35)</h3>
                        <span class="label label-default">Room 32-144</span> Facilitator: <span class="session-speaker"><a href="https://www.fsf.org/about/staff-and-board#donald">Donald Robertson</a></span>
-                       <p>Lightning talks are short presentations given by conference attendees on free software topics they're passionate about. Come to talk or just listen.<!-- <a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2015/Lightning_Talks">Register to give a talk</a>.--> If you have slides, bring them on a flash drive before you plan to talk.</p>
+                       <p>Lightning talks are short presentations given by conference attendees on free software topics they're passionate about. Come to talk or just listen. Register to give a talk at <a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2015/Lightning_Talks">https://libreplanet.org/wiki/LibrePlanet:Conference/2015/Lightning_Talks</a>. If you have slides, bring them on a flash drive before you plan to talk.</p>
                </div>
 
                <h2><small>11:40 - 11:50: Break</small></h2>
@@ -94,7 +94,7 @@ Fixed nav
 
                <div class="session">
                        <h3>Lightning talks (continued)</h3>
-                       <span class="label label-default">Room 32-144</span> <span class "speakers">Donald Robertson</span>
+                       <span class="label label-default">Room 32-144</span> <span class="speakers">Donald Robertson</span>
                        <p><a href="#lighting-talks">Description above.</a></p>
                </div>
 
@@ -378,7 +378,8 @@ Fixed nav
                <div class="session">
                        <h3>Document Freedom Day: Let freedom ring!</h3>
                        <span class="label label-default">Room 32-155</span>    <span class="session-speaker"><a href="/2015/program/speakers.html#tryon">Robinson Tryon</a></span>
-                       <p>Events celebrating Document Freedom Day (DFD) are kicking off this week across the globe. Free formats and protocols are essential to free software, but many people around the world haven't heard about the importance and benefits of free standards. At this strategy session we'll
+                       <p>Events celebrating Document Freedom Day (DFD) are kicking off this week across the globe. Free formats and protocols are essential to free software, but many people around the world haven't heard about the importance and benefits of free standards. At this strategy session we'll</p>
+
                                <ul>
                                        <li>Discuss DFD events planned for 2015</li>
                                        <li>Sign you up to run your own DFD event</li>
@@ -386,7 +387,6 @@ Fixed nav
                                        <li>Review what outreach methods have been most effective</li>
                                        <li>Brainstorm new ideas to promote free formats</li>
                                </ul>
-                       </p>
                </div>
 
                <div class="session">
@@ -397,12 +397,21 @@ Fixed nav
 
                <h2><small>17:40 - 17:50: Break</small></h2>
                <h2>17:50 - 18:35: Closing Keynote: <a href="/2015/program/speakers.html#sandler">Karen Sandler</a></h2>
-                       <div class="session">
-                               <span class="label label-default">Room 32-123</span>
-                       </div>
+                               <div class="session">
+                                       <h3>Stand up for the GNU GPL</h3>
+                                       <span class="label label-default">Room 32-123</span>
+                                       <p>Karen will discuss Conservancy's work with Christoph Hellwig and the suit against VMware to defend the GNU General Public License.</p>
+                               </div>
 </div> <!-- session column end -->
 </div> <!-- session row end -->
 
+<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>
+  </ul>
+</div>
+
 
 <!--#include virtual="/server/2015/footer.html"-->
 <!--#include virtual="/server/2015/common_js.html"-->