Adding grid schedule, assorted small tweaks.

diff --git a/2017/includes/nav-list-1.html b/2017/includes/nav-list-1.html
index 18f37b697d9eed2e468aabcb21fa9780696f12ab..2872d77767bd9d6eee229382c6d6103980e7ba42 100644 (file)
--- a/2017/includes/nav-list-1.html
+++ b/2017/includes/nav-list-1.html
@@ -1,7 +1,7 @@
 <!-- <li><a href="https://my.fsf.org/lp-call-for-sessions">Propose a session</a></li> -->
 <!--<li><a href="https://my.fsf.org/lp-scholarship-application">Apply for a scholarship</a></li>-->
 
-<li class="program-link"><a href="/2017/program">Schedule</a></li>
+<li class="program-link"><a href="/2017/program">Sessions & Schedule</a></li>
 <li class="speakers-link"><a href="/2017/program/speakers.html">Speakers</a></li>
 <li class="social-events-link"><a href="/2017/social.html">Social Events</a></li>
 <li class="exhibit-hall-link"><a href="/2017/exhibit-hall">Exhibit Hall</a></li>

diff --git a/2017/includes/nav-list-2.html b/2017/includes/nav-list-2.html
index 461eddea150f3d84ed844355640ac2d9ae306c7f..0084b1718a4de9282f9397b5ed71eaa98e8741cd 100644 (file)
--- a/2017/includes/nav-list-2.html
+++ b/2017/includes/nav-list-2.html
@@ -1,9 +1,10 @@
 <!-- <li class="volunteer-link"><a href="/2017/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="sponsors-link"><a href="/2017/sponsors">Sponsors</a></li>
+<li class="raffle-link"><a href="/2017/raffle.html">Raffle</a></li>
 <li class="getting-around-link"><a href="/2017/getting-around">Travel Info</a></li>
 <li class="ahp-link"><a href="/2017/safe-space-policy/">Safe Space Policy</a></li>
 <br>
 <li><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=33">Build the scholarship fund</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/program">Session videos from last LibrePlanet</a></li>
+<li class="sponsors-link"><a href="/2017/sponsors">Sponsors</a></li>

diff --git a/2017/includes/raffle_js.html b/2017/includes/raffle_js.html
new file mode 100644 (file)
index 0000000..0f49883
--- /dev/null
+++ b/2017/includes/raffle_js.html
@@ -0,0 +1,3 @@
+<script type="text/javascript">
+ $(".raffle-link").addClass("active");
+</script>

diff --git a/2017/program/grid-schedule.html b/2017/program/grid-schedule.html
index b06193ddd2d6730c4d57667a51705c7e33168e7d..693b9e233ab6d670b18f31e54ea0a4f72352e80b 100755 (executable)
--- a/2017/program/grid-schedule.html
+++ b/2017/program/grid-schedule.html
@@ -6,19 +6,19 @@
 <!--#include virtual="/2017/includes/banner.html"-->
 <!--#include virtual="/2017/includes/sidebar.html"-->
 
-<h1>Program <small>Tabular schedule</small></h1>
+<h1>Program <small>Grid schedule</small></h1>
 
 <!--#include virtual="/2017/includes/program-menu.html"-->
 
 <div class="thumbnail">
   <img class="img-responsive"
-          src="//static.fsf.org/nosvn/libreplanet/2017/satgrid.png"
+          src="//static.fsf.org/nosvn/libreplanet/2017/lp2017-grid-saturday.svg"
           alt="[ Saturday Grid Schedule ]">
 </div>
 
 <div class="thumbnail">
   <img class="img-responsive"
-          src="//static.fsf.org/nosvn/libreplanet/2017/sungrid.png"
+          src="//static.fsf.org/nosvn/libreplanet/2017/lp2017-grid-sunday.svg"
           alt="[ Sunday Grid Schedule ]">
 </div>
 

diff --git a/2017/program/index.html b/2017/program/index.html
index 470e4c1510e166746885b4492d39f0c2840654b2..5f86ad080de1e1329e898916cf7d5eacfe40d62f 100755 (executable)
--- a/2017/program/index.html
+++ b/2017/program/index.html
@@ -8,7 +8,20 @@
 
 <h1>Program <small>Sessions</small></h1>
 
-<!--[ADD BACK # TO ACTIVATE]include virtual="/2017/includes/program-menu.html"-->
+<!--#include virtual="/2017/includes/program-menu.html"-->
+
+<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>
+Contents
+</h2>
+</div>
+<div class="panel-body">
+<p><a href="#day-1-program">Saturday sessions</a></p>
+<p><a href="#day-2-program">Sunday sessions</a></p>
+</div>
+</div>
 
 <div class="program-session-details-toggle-all">
     <button class="btn btn-default btn-xs">Expand all</button>

diff --git a/2017/raffle.html b/2017/raffle.html
new file mode 100755 (executable)
index 0000000..bff73e0
--- /dev/null
+++ b/2017/raffle.html
@@ -0,0 +1,17 @@
+<!--#include virtual="/2017/includes/header.html"-->
+
+<title>LibrePlanet &mdash; Raffle </title>
+
+<!--#include virtual="/2017/includes/banner.html"-->
+<!--#include virtual="/2017/includes/sidebar.html"-->
+<h1>Raffle</small></h1>
+
+<p>This year we have a raffle with awesome prizes donated by generous supporters, including Technoethical, Aleph Objects, ThinkPenguin, and No Starch Press. $2 raffle tickets can be purchased at the GNU Press table during LibrePlanet as well as at the Friday Open House and Saturday evening social events. Enter to win!</p>
+
+<!--#include virtual="/2017/includes/footer.html"-->
+<!--#include virtual="/2017/includes/common_js.html"-->
+<!--#include virtual="/2017/includes/raffle_js.html"-->
+<script type="text/javascript">
+$(".raffle").addClass("active").text("Raffle");
+</script>
+<!--#include virtual="/2017/includes/close.html" -->