Adding Doctorow homepage feature and Recent Updates item.

diff --git a/2017/includes/sidebar.html b/2017/includes/sidebar.html
index 5dccf5447d6c69342dcb245050b9b3e39eca3593..415f349c667d6b6bdc1f3959dca7afd305b0bf94 100755 (executable)
--- a/2017/includes/sidebar.html
+++ b/2017/includes/sidebar.html
@@ -45,12 +45,12 @@
                        <li class="list-group-item">
                                <strong>Recent Updates</strong>
                        </li>
+                       <li class="list-group-item">
+                                       <strong>12/22/2016:</strong> <a href="https://www.fsf.org/blogs/community/boing-boings-cory-doctorow-will-speak-at-libreplanet-2017-register-to-attend-today">Boing Boing's Cory Doctorow will speak at LibrePlanet 2017</a></li>
                        <li class="list-group-item">
                                        <strong>12/07/2016:</strong> Conference location announced: the Stata Center at MIT.</li>
                        <li class="list-group-item">
                                        <strong>11/16/2016:</strong> Call for proposals closed. Thank you for your submissions!</li>
-                       <li class="list-group-item">
-                                       <strong>06/21/2016:</strong> <a href="https://www.fsf.org/blogs/community/building-a-better-libreplanet-what-we-learned-from-the-conference-surveys">Building a better LibrePlanet: What we learned from the conference surveys</a></li>
                </ul>
                                </div> <!-- end of sidebar column -->
                                <div id="lp-content" class="col-sm-9"> <!-- start of content column -->

diff --git a/2017/index.html b/2017/index.html
index 3f6b22d3f06c64ca183368539846f15ce07b99b2..05737756a0a223fd33cc3b2c53619ee96196c534 100755 (executable)
--- a/2017/index.html
+++ b/2017/index.html
@@ -10,59 +10,67 @@
 
        <!-- wrapper for slides -->
        <ul class="carousel-inner list-unstyled">
+               <li class="item active">
+                       <img src="https://static.fsf.org/nosvn/libreplanet/feature-images/doctorow-feature.png"
+                       alt="[ Cory Doctorow ]"></img>
+                       <p class="carousel-caption-bottom">
+                               <a href="https://secure.flickr.com/photos/doctorow/8059328633/in/album-72157622138315932/">Photo</a> courtesy of <a href="http://www.schoenfeldt.com">Alex Schoenfeldt Photography</a> CC-BY.</p>
+                       </li>
 
-                       <li class="item active">
+                       <li class="item">
                                <img src="https://static.fsf.org/nosvn/libreplanet/feature-images/sumana-speaking-with-cables.png"
-                               alt="[ Crypto Session at FSF30 ]">
+                               alt="[ Crypto Session at FSF30 ]"></img>
                                <p class="carousel-caption-bottom">
                                        Explore a wealth of <a href="https://www.libreplanet.org/2016/program/index.html">session videos and slides</a> from LibrePlanet 2016.</p>
                                </li>
 
-                       <li class="item">
-                       <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
-                       alt="[ Hackers at the GNU 30th anniversary hackathon ]">
-                       <p class="carousel-caption-bottom"><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&id=33">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/libreplanet/2015/site/graphics/carousel/lp2015-open-house-carousel.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>
+
+                               <li class="item ">
+                                       <img src="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/carousel/lp2015-open-house-carousel.jpg"
+                                       alt="[ Crypto panel at the FSF 30th Anniversary User Freedom Summit ]"></img>
+                                       <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. Their formatting might not be quite right, but reusing them is much faster than making them from scratch.
                                <li class="item">
-                                       <img src="//static.fsf.org/nosvn/libreplanet/feature-images/libreluna-feature.png"
-                                       alt="[ Can't come to the conference? Host a LibreLuna viewing party. ]">
-                                       <p class="carousel-caption-bottom">
-                                               <a href="https://www.libreplanet.org/conference/libreluna">Register your party</a> with the FSF.</p>
-                                       </li>
+                               <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
+                               alt="[ Hackers at the GNU 30th anniversary hackathon ]">
+                               <p class="carousel-caption-bottom"><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&id=33">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/libreplanet/feature-images/libreluna-feature.png"
+               alt="[ Can't come to the conference? Host a LibreLuna viewing party. ]">
+               <p class="carousel-caption-bottom">
+               <a href="https://www.libreplanet.org/conference/libreluna">Register your party</a> with the FSF.</p>
+       </li>
 
 
-                       <li class="item">
-                       <a href="streaming"><img src="//static.fsf.org/nosvn/libreplanet/feature-images/remote_participation.png"
-                       alt="[ A globe. ]"></a>
-                       <p class="carousel-caption-bottom">Wherever you are, we invite you to participate in LibrePlanet via livestream</a>.
-                       </li>
+       <li class="item">
+       <a href="streaming"><img src="//static.fsf.org/nosvn/libreplanet/feature-images/remote_participation.png"
+       alt="[ A globe. ]"></a>
+       <p class="carousel-caption-bottom">Wherever you are, we invite you to participate in LibrePlanet via livestream</a>.
+</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/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/libreplanet/2015/site/graphics/carousel/lp2015-open-house-carousel.jpg" alt="[ The Friday open house before the conference ]">
-                               <p class="carousel-caption-bottom">Thanks for making LibrePlanet 2016 great! <a href="https://www.fsf.org/news/hundreds-explore-ways-to-fork-the-system-with-free-software-at-libreplanet-2016">Read the recap</a>.</p>
-                       </li>
+<li class="item">
+<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-bottom">Thanks for making LibrePlanet 2016 great! <a href="https://www.fsf.org/news/hundreds-explore-ways-to-fork-the-system-with-free-software-at-libreplanet-2016">Read the recap</a>.</p>
+</li>
 
 
 <li class="item">
@@ -72,12 +80,12 @@ alt="[ Apply for a scholarship ]">
 </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>
+<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>
 
 
 
@@ -88,10 +96,10 @@ alt="[ Apply for a scholarship ]">
 </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">
+<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>