From 10e47b7e3178cbd44c27515665d9846b25c05313 Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@fsf.org>
Date: Thu, 16 Mar 2017 13:01:56 -0400
Subject: [PATCH] Many more additions.
---
2017/exhibit-hall/index.html | 35 ++++++++++++++++++++++++++
2017/includes/exhibit_js.html | 20 +--------------
2017/includes/nav-list-1.html | 5 ++--
2017/includes/nav-list-2.html | 6 ++---
2017/includes/program-menu.html | 8 +++---
2017/includes/social-events_js.html | 3 +++
2017/includes/speakers_js.html | 3 +++
2017/program/grid-schedule.html | 39 +++++++++++++++++++++++++++++
2017/program/index.html | 2 +-
2017/program/speakers.html | 5 ++--
2017/social.html | 3 ++-
2017/sponsors/index.html | 17 +++++++++++++
12 files changed, 112 insertions(+), 34 deletions(-)
create mode 100755 2017/exhibit-hall/index.html
create mode 100644 2017/includes/social-events_js.html
create mode 100644 2017/includes/speakers_js.html
create mode 100755 2017/program/grid-schedule.html
diff --git a/2017/exhibit-hall/index.html b/2017/exhibit-hall/index.html
new file mode 100755
index 00000000..ad985e0a
--- /dev/null
+++ b/2017/exhibit-hall/index.html
@@ -0,0 +1,35 @@
+<!--#include virtual="/2017/includes/header.html"-->
+
+<title>LibrePlanet — Exhibit hall </title>
+
+<!--#include virtual="/2017/includes/banner.html"-->
+<!--#include virtual="/2017/includes/sidebar.html"-->
+<h1>Program <small>Exhibit hall</small></h1>
+<div class="row"> <!-- session row start -->
+ <div class="col-sm-9"> <!-- session column start -->
+
+<div class="session"><p>The exhibit hall at LibrePlanet will be open from 09:00 - 18:00 on both conference days, and will have something for everyone. Be sure to take a stroll around and chat with our friends from:</p>
+
+<ul>
+<li><a href="https://civicactions.com/">CivicActions</a></li>
+<li><a href="https://shop.fsf.org">GNU Press</a></li>
+<li><a href="http://informatics.mit.edu/">MIT Libraries' Program on Information Science</a></li>
+<li><a href="https://puri.sm/">Purism</a></li>
+<li><a href="https://www.savoirfairelinux.com/en/">Savoir-faire Linux</a></li>
+<li><a href="https://sfconservancy.org/">Software Freedom Conservancy</a></li>
+<li><a href="https://sipb.mit.edu">SIPB</a></li>
+<li><a href="https://tehnoetic.com/">Technoethical</a></li>
+<li><a href="https://www.thinkpenguin.com">ThinkPenguin</a></li>
+<li><a href="https://www.torproject.org/">Tor Project</a></li>
+</ul>
+
+</div> <!-- session column end -->
+</div> <!-- session row end -->
+
+<!--#include virtual="/2017/includes/footer.html"-->
+<!--#include virtual="/2017/includes/common_js.html"-->
+<!--#include virtual="/2017/includes/exhibit_js.html"-->
+<script type="text/javascript">
+$("#exhibit").addClass("active").text("Exhibit Hall");
+</script>
+<!--#include virtual="/2017/includes/close.html" -->
diff --git a/2017/includes/exhibit_js.html b/2017/includes/exhibit_js.html
index 0f33f9fc..3553cac9 100644
--- a/2017/includes/exhibit_js.html
+++ b/2017/includes/exhibit_js.html
@@ -1,21 +1,3 @@
-<script type="text/javascript"
- src="/2017/assets/js/civicrm-4.4.jquery.chainedSelects.js">
-</script>
-
-<script type="text/javascript"
- src="/2017/assets/js/jquery.form-3.25.0.js">
-</script>
-
-<script type="text/javascript">
- var cj = jQuery.noConflict(); $ = cj;
-
- cj(function() {
- countryID = "#country-Primary"
- stateProvinceID = "#state_province-Primary"
- callbackURL = "https://my.fsf.org/civicrm/ajax/jqState"
- cj(countryID).chainSelect(stateProvinceID, callbackURL, null);
- });
-</script>
<script type="text/javascript">
- $("#exhibit-link").addClass("active");
+ $(".exhibit-hall-link").addClass("active");
</script>
diff --git a/2017/includes/nav-list-1.html b/2017/includes/nav-list-1.html
index ff16bf02..18f37b69 100644
--- a/2017/includes/nav-list-1.html
+++ b/2017/includes/nav-list-1.html
@@ -2,6 +2,7 @@
<!--<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/speakers.html">Speakers</a></li>
-<li class="social-link"><a href="/2017/social.html">Social Events</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>
<!-- <li><a href="/2017/streaming">Livestream</a></li> -->
diff --git a/2017/includes/nav-list-2.html b/2017/includes/nav-list-2.html
index 5b2ae2bc..461eddea 100644
--- a/2017/includes/nav-list-2.html
+++ b/2017/includes/nav-list-2.html
@@ -1,9 +1,9 @@
<!-- <li class="volunteer-link"><a href="/2017/volunteer">Volunteer</a></li> -->
<!-- <li><a href="https://my.fsf.org/civicrm/event/register?id=43&reset=1">Host a streaming party</a></li> -->
<li class="sponsors-link"><a href="/2017/sponsors">Sponsors</a></li>
-<li><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&id=33">Build the scholarship fund</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>
-<li class="sponsors-link"><a href="/2017/sponsors/">Sponsorship & exhibit hall</a></li>
-<li class="getting-around-link"><a href="/2017/getting-around">Travel info</a></li>
+<br>
+<li><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&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>
diff --git a/2017/includes/program-menu.html b/2017/includes/program-menu.html
index aa952015..fbd7b973 100644
--- a/2017/includes/program-menu.html
+++ b/2017/includes/program-menu.html
@@ -5,11 +5,9 @@
<ol class="breadcrumb text-center">
<li id="p-sessions"><a href="/2017/program/index.html">Sessions</a></li>
- <li id="p-speakers"><a href="/2017/program/speakers.html">Speakers</a></li>
- <!--<li id="p-social"><a href="/2017/program/social.html">Social & Community Events</a>
- <li id="p-exhibit"><a href="/2017/program/exhibit-hall.html">Exhibit Hall</a></li>
- <li id="p-grid-sch"><a href="/2017/program/grid-schedule.html">Grid Schedule</a></li>-->
-
+ <li id="p-grid-sch"><a href="/2017/program/grid-schedule.html">Grid Schedule</a></li>
+ <!--<li id="p-speakers"><a href="/2017/program/speakers.html">Speakers</a></li>-->
+ <!--<li id="p-social"><a href="/2017/program/social.html">Social & Community Events</a>-->
</ol>
</div>
diff --git a/2017/includes/social-events_js.html b/2017/includes/social-events_js.html
new file mode 100644
index 00000000..e86b0312
--- /dev/null
+++ b/2017/includes/social-events_js.html
@@ -0,0 +1,3 @@
+<script type="text/javascript">
+ $(".social-events-link").addClass("active");
+</script>
diff --git a/2017/includes/speakers_js.html b/2017/includes/speakers_js.html
new file mode 100644
index 00000000..c5845d3f
--- /dev/null
+++ b/2017/includes/speakers_js.html
@@ -0,0 +1,3 @@
+<script type="text/javascript">
+ $(".speakers-link").addClass("active");
+</script>
diff --git a/2017/program/grid-schedule.html b/2017/program/grid-schedule.html
new file mode 100755
index 00000000..b06193dd
--- /dev/null
+++ b/2017/program/grid-schedule.html
@@ -0,0 +1,39 @@
+
+<!--#include virtual="/2017/includes/header.html"-->
+
+<title>LibrePlanet — Sessions </title>
+
+<!--#include virtual="/2017/includes/banner.html"-->
+<!--#include virtual="/2017/includes/sidebar.html"-->
+
+<h1>Program <small>Tabular 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"
+ alt="[ Saturday Grid Schedule ]">
+</div>
+
+<div class="thumbnail">
+ <img class="img-responsive"
+ src="//static.fsf.org/nosvn/libreplanet/2017/sungrid.png"
+ alt="[ Sunday Grid Schedule ]">
+</div>
+
+<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="/2017/includes/footer.html"-->
+<!--#include virtual="/2017/includes/common_js.html"-->
+<!--#include virtual="/2017/includes/program_js.html"-->
+<script type="text/javascript">
+$("#p-grid-sch").addClass("active").text("Grid Schedule");
+</script>
+<!--#include virtual="/2017/includes/close.html" -->
diff --git a/2017/program/index.html b/2017/program/index.html
index c13c8fdd..470e4c15 100755
--- a/2017/program/index.html
+++ b/2017/program/index.html
@@ -8,7 +8,7 @@
<h1>Program <small>Sessions</small></h1>
-<!--#include virtual="/2017/includes/program-menu.html"-->
+<!--[ADD BACK # TO ACTIVATE]include virtual="/2017/includes/program-menu.html"-->
<div class="program-session-details-toggle-all">
<button class="btn btn-default btn-xs">Expand all</button>
diff --git a/2017/program/speakers.html b/2017/program/speakers.html
index dfb1ad78..3f0d1eea 100755
--- a/2017/program/speakers.html
+++ b/2017/program/speakers.html
@@ -7,14 +7,13 @@
<h1>Program <small>Speakers</small></h1>
- <!--#include virtual="/2017/includes/program-menu.html"-->
<!--#include virtual="generated-bios.html"-->
<!--#include virtual="/2017/includes/footer.html"-->
<!--#include virtual="/2017/includes/common_js.html"-->
- <!--#include virtual="/2017/includes/program_js.html"-->
+ <!--#include virtual="/2017/includes/speakers_js.html"-->
<script type="text/javascript">
- $("#p-speakers").addClass("active").text("Speakers");
+ $("#speakers").addClass("active").text("Speakers");
</script>
<!--#include virtual="/2017/includes/close.html" -->
diff --git a/2017/social.html b/2017/social.html
index 658a29ae..4c4fd5f7 100755
--- a/2017/social.html
+++ b/2017/social.html
@@ -60,7 +60,8 @@
<!--#include virtual="/2017/includes/footer.html"-->
<!--#include virtual="/2017/includes/common_js.html"-->
+<!--#include virtual="/2017/includes/social-events_js.html"-->
<script type="text/javascript">
-$("#social").addClass("active").text("Social Events");
+$("#social-events").addClass("active").text("Social Events");
</script>
<!--#include virtual="/2017/includes/close.html" -->
diff --git a/2017/sponsors/index.html b/2017/sponsors/index.html
index cb8e86c4..48b28365 100755
--- a/2017/sponsors/index.html
+++ b/2017/sponsors/index.html
@@ -5,6 +5,23 @@
<!--#include virtual="/2017/includes/banner.html"-->
<!--#include virtual="/2017/includes/sidebar.html"-->
+<!-- FOR EARLY IN THE CONFERENCE LIFECYCLE
+<h1>Sponsorship and Exhibit Hall</h1>
+
+<p>We are currently accepting sponsors and exhibitors for LibrePlanet 2017. Your sponsorship will help sustain, energize, and inspire the free software community.
+Sponsoring provides you the unique opportunity to engage hundreds of legal and policy
+experts, developers, students, activists, and free software and technology enthusiasts
+with your brand, message, and organization.</p>
+
+<p>Please contact Georgia Young at <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a> or 617-542-5942 with questions. All sponsorship materials must be delivered to the FSF by March 5th in order to be included in the program.</p>
+
+<p>Please refer to our sponsorship prospectus PDF for more information:</p>
+<ul>
+ <li><a href="https://static.fsf.org/nosvn/libreplanet/2017/lp2017-sponsorship.pdf">PDF with high-resolution images</a> (suitable for printing)</li>
+ <li><a href="https://static.fsf.org/nosvn/libreplanet/2017/lp2017-sponsorship-lowres.pdf"> PDF with low-resolution images</a> (smaller file size)</li>
+</ul>
+-->
+
<h1>Thank you to our sponsors!</h1>
<br><br>
--
2.25.1