Trying new snowden image.
authorZak Rogoff <zak@fsf.org>
Wed, 27 Jan 2016 22:15:35 +0000 (17:15 -0500)
committerZak Rogoff <zak@fsf.org>
Wed, 27 Jan 2016 22:15:35 +0000 (17:15 -0500)
2016/includes/program_js.html
2016/includes/sidebar.html
2016/index.html
2016/program/index.html
2016/program/speakers.html

index ba6dfdf62956c98527bfc3ff63c9874817fdc360..36e7ae3f4f5ecb77a6cfedadcb9aeb37e80ba5cf 100755 (executable)
@@ -4,3 +4,7 @@
 <script>
   $('.collapse').removeClass('in');
 </script>
+
+<script type="text/javascript">
+ $("#program-link").addClass("active");
+</script>
index 6bddd25b2adf974b840fcff199d19362cf93827a..d3ee17bc5e29d06ca50a4d420160fecf7827a28c 100755 (executable)
@@ -25,7 +25,7 @@
 
 
                <ul class="nav nav-pills nav-stacked">
-                       <li><a href="/2016/program">Program</a></li>
+                       <li id="program-link"><a href="/2016/program">Program</a></li>
                        <li><a href="https://media.libreplanet.org/">Videos of previous conferences</a></li>
 
                        <li id="mailing-list-link"><a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the discussion list</a></li>
                        <li class="list-group-item">
                                <strong>Recent Updates</strong>
                        </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>
                        <li class="list-group-item">
                                <strong>10/02/2015:</strong> <a href="https://www.fsf.org/blogs/community/what-do-you-have-to-say-share-it-at-libreplanet-2016">LibrePlanet 2016 call for proposals is open until November 23rd</a></li>
-                       <li class="list-group-item">
-                               <strong>09/10/2015:</strong> <a href="https://www.fsf.org/blogs/community/who-is-improving-the-world-through-free-software-nominate-them-now">Nominate your heroes for a free software award!</a></li>
                                        </ul>
                                </div> <!-- end of sidebar column -->
                                <div id="lp-content" class="col-sm-9"> <!-- start of content column -->
index 6661dfb93048d81a6b0d565656b8435ec2326bdb..805988993fa0eaf064875256a853d4e306d46736 100755 (executable)
        <!-- wrapper for slides -->
        <ul class="carousel-inner list-unstyled">
                <li class="item active">
+                       <img src="//http://static.fsf.org/nosvn/libreplanet/feature-images/snowden-feature.png"
+                       alt="[ The Expanding the Tent panel at LibrePlanet 2013 ]">
+                       <p class="carousel-caption-bottom">
+                               <a href="https://media.libreplanet.org/">Watch videos</a> of great sessions from previous LibrePlanets.</p>
+                       </li>
+
+               <li class="item">
                        <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-printer.jpg"
                        alt="[ Aleph Objects' Lulzbot 3D printer ]">
                        <p class="carousel-caption-bottom">
                                <a href="https://my.fsf.org/civicrm/profile/create?gid=326&reset=1">
                                        Apply for an exhibition table</a> for your free software business or project.
-                       </p>
-               </li>
-
-               <li class="item">
-                       <img src="//static.fsf.org/nosvn/images/best-event-photos/lp2013-expand-the-tent-848x477.jpg"
-                       alt="[ The Expanding the Tent panel at LibrePlanet 2013 ]">
-                       <p class="carousel-caption-bottom">
-                               <a href="https://media.libreplanet.org/">Watch videos</a> of great sessions from previous LibrePlanets.</a></p>
+                               </p>
                        </li>
 
-                       <li class="item ">
-                               <img src="//static.fsf.org/nosvn/images/best-event-photos/fsf30-crypto-session-848x477.jpg"
-                               alt="[ Crypto panel at the FSF 30th Anniversary User Freedom Summit ]">
-                               <p class="carousel-caption-bottom">
-                                       <a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the discussion list now</a> and meet the people you'll spend time with at LibrePlanet.</p>
-                               </li>
-                       </ul>
+                               <li class="item ">
+                                       <img src="//static.fsf.org/nosvn/images/best-event-photos/fsf30-crypto-session-848x477.jpg"
+                                       alt="[ Crypto panel at the FSF 30th Anniversary User Freedom Summit ]">
+                                       <p class="carousel-caption-bottom">
+                                               <a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the discussion list now</a> and meet the people you'll spend time with at LibrePlanet.</p>
+                                       </li>
+                               </ul>
 
-                       <!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT
+                               <!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT
 
-                       <li class="item active">
-                       <img src="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/carousel/lp2015-open-house-carousel.jpg" alt="[ The Friday open house before the conference ]">
-                       <p class="carousel-caption-tl" style="font-size: larger; font-weight: bold;">Thanks for making LibrePlanet 2016 great! <a href="https://www.fsf.org/blogs/community/libreplanet-2016-highlights-and-what-comes-next">Read the wrap-up</a> or use the form above to subscribe for updates on the 2016 conference.</p>
-               </li>
-               <li class="item">
-               <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
-               alt="[ Apply for a scholarship ]">
-               <p class="lead carousel-caption-tl"><a href="https://www.libreplanet.org/2016/scholarship_donation">Donate to the scholarship fund</a> to help us bring new people to LibrePlanet.
-       </p>
-</li>
-
-<li class="item">
-<img src="//static.fsf.org/nosvn/images/best-event-photos/lp2015-open-house-848x477.jpg"
-alt="[ Open house at LibrePlanet 2015 ]">
-<p class="carousel-caption-bottom"> <a href="https://crm.fsf.org/join">Join the Free Software Foundation</a> and get gratis conference admission and other perks.
+                               <li class="item active">
+                               <img src="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/carousel/lp2015-open-house-carousel.jpg" alt="[ The Friday open house before the conference ]">
+                               <p class="carousel-caption-tl" style="font-size: larger; font-weight: bold;">Thanks for making LibrePlanet 2016 great! <a href="https://www.fsf.org/blogs/community/libreplanet-2016-highlights-and-what-comes-next">Read the wrap-up</a> or use the form above to subscribe for updates on the 2016 conference.</p>
+                       </li>
+                       <li class="item">
+                       <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
+                       alt="[ Apply for a scholarship ]">
+                       <p class="lead carousel-caption-tl"><a href="https://www.libreplanet.org/2016/scholarship_donation">Donate to the scholarship fund</a> to help us bring new people to LibrePlanet.
+               </p>
+       </li>
+
+       <li class="item">
+       <img src="//static.fsf.org/nosvn/images/best-event-photos/lp2015-open-house-848x477.jpg"
+       alt="[ Open house at LibrePlanet 2015 ]">
+       <p class="carousel-caption-bottom"> <a href="https://crm.fsf.org/join">Join the Free Software Foundation</a> and get gratis conference admission and other perks.
 </p>
 </li>
 
index 63d97059549d66abb62d666fc05e0563e701727c..b9b198ebd8b9b1d64c5f560ee9d03f25659833ab 100755 (executable)
@@ -32,7 +32,7 @@
                        <h3>The last lighthouse: Free software in dark times
 </h3>
                         <span class="program-session-speaker"><a href="speakers.html#snowden">Edward Snowden</a>, <a href="speakers.html#dkg">Daniel Kahn Gillmor</a></span>
-                       <p>Join NSA Whistleblower Edward Snowden and ACLU Technologist Daniel Kahn Gillmor for a discussion about free software, surveillance, power, and control of the future.</p>
+                       <p>Join NSA Whistleblower Edward Snowden (who will appear via a free software video call) and ACLU Technologist Daniel Kahn Gillmor for a discussion about free software, surveillance, power, and control of the future.</p>
                </div>
 
                <div class="session">
@@ -53,6 +53,7 @@
 
 <!--#include virtual="/2016/includes/footer.html"-->
 <!--#include virtual="/2016/includes/common_js.html"-->
+<!--#include virtual="../includes/program_js.html"-->
 <script type="text/javascript">
 $("#p-sessions").addClass("active").text("Sessions");
 </script>
index e9c45b3a307d7b7fe43f0b7a081c5b94d7c03d8e..a9f25d93811a71a133b6b873fbb90b7f315b4a7e 100755 (executable)
@@ -41,9 +41,9 @@
        </div>
 </div>
 
+<!--
 <h1>Program <small>Session Speakers</small></h1>
 
-<!--
 <h2>Session speakers</h2>
 <div class="row speaker-bio">
        <div class="col-md-2 col-sm-3 col-xs-4">
@@ -57,6 +57,7 @@
 -->
 <!--#include virtual="../includes/footer.html"-->
 <!--#include virtual="../includes/common_js.html"-->
+<!--#include virtual="../includes/program_js.html"-->
 <script type="text/javascript">
 $("#p-speakers").addClass("active").text("Speakers");
 </script>