From 0ddb3901918f0282c6f7982f31a7dbdeac761731 Mon Sep 17 00:00:00 2001 From: Zak Rogoff <zak@fsf.org> Date: Wed, 27 Jan 2016 15:26:12 -0500 Subject: [PATCH] Program launch. --- 2016/includes/sidebar.html | 8 ++++++-- 2016/program/index.html | 2 ++ 2016/program/speakers.html | 6 ++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/2016/includes/sidebar.html b/2016/includes/sidebar.html index 5c5deffd..ecdc75b2 100755 --- a/2016/includes/sidebar.html +++ b/2016/includes/sidebar.html @@ -16,7 +16,7 @@ <li id="volunteer-link"><a href="/2016/volunteer">Volunteer</a></li> <li><a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2016/Conference_brainstorm">Share Your Conference Ideas</a></li> <li><a href="/2016/live">Livestream & Chat</a></li> - <li><a href="/2016/program">Program</a></li> + <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><a href="/2016/sponsors">Sponsors</a></li> @@ -25,8 +25,9 @@ <ul class="nav nav-pills nav-stacked"> + <li><a href="/2016/program">Program</a></li> <li><a href="https://media.libreplanet.org/">Videos of previous conferences</a></li> - <li><a href="https://www.libreplanet.org/2015/program">Last year's program</a></li> + <li id="mailing-list-link"><a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the discussion list</a></li> <li><a href="https://my.fsf.org/civicrm/profile/create?gid=326&reset=1">Apply to exhibit</a></li> </ul> @@ -60,3 +61,6 @@ </ul> </div> <!-- end of sidebar column --> <div id="lp-content" class="col-sm-9"> <!-- start of content column --> + + +https://www.fsf.org/blogs/community/edward-snowden-will-kick-off-libreplanet-2016-will-you-be-there diff --git a/2016/program/index.html b/2016/program/index.html index e9c1b189..63d97059 100755 --- a/2016/program/index.html +++ b/2016/program/index.html @@ -26,6 +26,8 @@ <div class="row"> <!-- session row start --> <div class="col-sm-9"> <!-- session column start --> +<p>The program is still being filled in, so check back for updates. <a href="https://libreplanet.org/2015/program/index.html">See last year's full program</a>.</p> + <div class="session"> <h3>The last lighthouse: Free software in dark times </h3> diff --git a/2016/program/speakers.html b/2016/program/speakers.html index e6a5b0a8..e9c45b3a 100755 --- a/2016/program/speakers.html +++ b/2016/program/speakers.html @@ -5,10 +5,10 @@ <!--#include virtual="../includes/banner.html"--> <!--#include virtual="../includes/sidebar.html"--> -<h1>Program <small>Speakers</small></h1> +<h1>Program <small>Keynote Speakers</small></h1> <!--#include virtual="../includes/program-menu.html"--> - +<p>The program is still being filled in, so check back for updates. <a href="https://libreplanet.org/2015/program/speakers.html">See last year's full program</a>.</p> <div class="row speaker-bio"> <div class="col-md-3 col-sm-4 col-xs-5"> <img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/dkg.jpg" alt="[ Daniel Kahn Gillmor - Photo ]"/> @@ -41,6 +41,8 @@ </div> </div> +<h1>Program <small>Session Speakers</small></h1> + <!-- <h2>Session speakers</h2> <div class="row speaker-bio"> -- 2.25.1