Many edits.

diff --git a/2016/includes/nav-list-2.html b/2016/includes/nav-list-2.html
index 77d8872bcceed83909cac546e2ca3dd94791cfd0..20c61d35f88b0463c5cfa7cb76bddec38b5dd683 100644 (file)
--- a/2016/includes/nav-list-2.html
+++ b/2016/includes/nav-list-2.html
@@ -1,7 +1,5 @@
 <li class="volunteer-link"><a href="/2016/volunteer">Volunteer</a></li>
 <li><a href="https://my.fsf.org/civicrm/event/register?id=43&amp;reset=1">Host a streaming party</a></li>
 <li class="mailing-list-link"><a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the discussion list</a></li>
-<li><a href="/2016/exhibit">Reserve an exhibit table</a></li>
 <li><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=33">Build the scholarship fund</a></li>
 <li class="sponsors-link"><a href="/2016/sponsors">Sponsors</a></li>
-

diff --git a/2016/includes/program-menu.html b/2016/includes/program-menu.html
index a9e22268ca3f4940f3152424fc1853cf0ac53701..84a8d533239c0e05b1339b0b3ced332ee3b8a7d8 100644 (file)
--- a/2016/includes/program-menu.html
+++ b/2016/includes/program-menu.html
@@ -1,8 +1,8 @@
 
 <div class="contain-fluid">
   <div class="row margin-top">
-    <div class="col-sm-9">
-      <h3><a href="index.html">SESSIONS</a> <!--/ <a href="grid-schedule.html">Schedule</a> -->/ <a href="speakers.html">SPEAKERS</a> / <a href="social.html">SOCIAL & COMMUNITY EVENTS</a><!-- / <a href="exhibit-hall.html">Exhibit Hall</a>--></h3>
+    <div class="col-sm-12">
+      <h3><a href="index.html">SESSIONS</a> | <a href="grid-schedule.html">GRID SCHEDULE</a> | <a href="speakers.html">SPEAKERS</a> | <a href="social.html">SOCIAL & COMMUNITY EVENTS</a><!-- | <a href="exhibit-hall.html">Exhibit Hall</a>--></h3>
   </div>
 </div>
 </div>

diff --git a/2016/includes/sidebar.html b/2016/includes/sidebar.html
index 7441a5a589d1b75ea48344ddced6b6e0831d0619..11176ae506db8b61e62d68eb53aab1ffbb69f8da 100755 (executable)
--- a/2016/includes/sidebar.html
+++ b/2016/includes/sidebar.html
@@ -18,7 +18,8 @@
                        <li><a href="https://www.libreplanet.org/2015/program">Last year's program</a></li>
                        <li><a href="/2016/program/social.html">Social Events</a></li>
                        <li id="exhibit-link"><a href="/2016/program/exhibit-hall.html">Exhibit Hall</a></li>
-            <li id="cfs-link"><a href="https://my.fsf.org/civicrm/profile/create?gid=325&amp;reset=1">Propose a session</a></li>
+      <li id="cfs-link"><a href="https://my.fsf.org/civicrm/profile/create?gid=325&amp;reset=1">Propose a session</a></li>
+                       <li><a href="/2016/exhibit">Reserve an exhibit table</a></li>
                -->
 
 
@@ -44,12 +45,12 @@
                        <li class="list-group-item">
                                <strong>Recent Updates</strong>
                        </li>
+                       <li class="list-group-item">
+                                       <strong>03/15/2016:</strong> <a href="http://www.fsf.org/blogs/community/what-you-need-to-know-for-libreplanet-2016-wherever-you-are">What you need to know for LibrePlanet 2016, wherever you are </a></li>
                        <li class="list-group-item">
                                <strong>02/17/2016:</strong> <a href="https://www.fsf.org/blogs/community/get-ready-to-fork-the-system-at-libreplanet">Program announced: Get ready to Fork the System at LibrePlanet</a></li>
                        <li class="list-group-item">
                                <strong>01/27/2016:</strong> <a href="https://www.fsf.org/blogs/community/edward-snowden-will-kick-off-libreplanet-2016-will-you-be-there"> Edward Snowden will kick off LibrePlanet 2016: Will you be there?</a></li>
-                       <li class="list-group-item">
-                               <strong>12/18/2015:</strong> <a href="https://www.fsf.org/blogs/community/help-put-the-planet-in-libreplanet">Help put the Planet in LibrePlanet by sponsoring an attendee </a></li>
                                        </ul>
                                </div> <!-- end of sidebar column -->
                                <div id="lp-content" class="col-sm-9"> <!-- start of content column -->

diff --git a/2016/program/grid-schedule.html b/2016/program/grid-schedule.html
new file mode 100755 (executable)
index 0000000..5b83ed5
--- /dev/null
+++ b/2016/program/grid-schedule.html
@@ -0,0 +1,43 @@
+
+<!--#include virtual="/2016/includes/header.html"-->
+
+<title>LibrePlanet &mdash; Sessions </title>
+
+<!--#include virtual="/2016/includes/banner.html"-->
+<!--#include virtual="/2016/includes/sidebar.html"-->
+
+<h1>Program <small>Tabular schedule</small></h1>
+
+<!--#include virtual="/2016/includes/program-menu.html"-->
+
+<div class="thumbnail">
+  <img class="img-responsive"
+          src="//static.fsf.org/nosvn/libreplanet/2016/satgrid.png"
+          alt="[ Saturday Grid Schedule ]">
+</div>
+
+<div class="thumbnail">
+  <img class="img-responsive"
+          src="//static.fsf.org/nosvn/libreplanet/2016/sungrid.png"
+          alt="[ Sunday Grid Schedule ]">
+</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="#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>
+
+
+<!--#include virtual="/2016/includes/footer.html"-->
+<!--#include virtual="/2016/includes/common_js.html"-->
+<script type="text/javascript">
+$("#p-sessions").addClass("active").text("Sessions");
+</script>
+<!--#include virtual="/2016/includes/program_js.html"-->
+<!--#include virtual="/2016/includes/close.html" -->