Adding new shirt promotion carousel feature.

diff --git a/2017/includes/sidebar.html b/2017/includes/sidebar.html
index f63d87f9622fc673daffa78b09dfe9764715e170..45c6560c4d52fc5a94b499d119caeb8487f7105f 100755 (executable)
--- a/2017/includes/sidebar.html
+++ b/2017/includes/sidebar.html
@@ -45,11 +45,11 @@
                        <li class="list-group-item">
                                <strong>Recent Updates</strong>
                        </li>
+                                       <li class="list-group-item"><strong>03/01/2017:</strong> <a href="https://www.fsf.org/blogs/community/meet-the-libreplanet-2017-speakers-gordon-hall-1">Meet the LibrePlanet 2017 Speakers: Gordon Hall</a></li>
                        <li class="list-group-item">
                                <strong>02/06/2017:</strong><a href="https://www.fsf.org/news/aclu-technology-for-liberty-director-kade-crockford-at-libreplanet-2017"> Kade Crockford will give keynote at LibrePlanet 2017</a></li>
                                <li class="list-group-item">
                                        <strong>01/02/2017:</strong> <a href="https://www.fsf.org/news/sumana-harihareswaras-keynote-will-close-libreplanet-2017">Sumana Harihareswara will give closing keynote at LibrePlanet 2017</a></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>
                                                        </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 7edda3ea008fd7b0fa47515446544ffd5aee7370..1931c2ef91d55961873d7cdbd288fc4210185cb8 100755 (executable)
--- a/2017/index.html
+++ b/2017/index.html
@@ -10,27 +10,27 @@
 
        <!-- wrapper for slides -->
        <ul class="carousel-inner list-unstyled">
+
                <li class="item active">
+                       <a href="https://shop.fsf.org/tshirts-hoodies/libreplanet-2017"><img src="https://static.fsf.org/nosvn/libreplanet/2017/lp2017-shirt/lp2017-shirt-feature.png"
+                       alt="[ The LibrePlanet shirt. The shirt is red with the text 'Roots of Freedom' and a design in tan. ]"></img>
+                       <p class="carousel-caption-bottom" style="background-color: white;"><br></p></a>
+               </li>
+
+               <li class="item">
                        <img src="https://static.fsf.org/nosvn/libreplanet/feature-images/keynotes-2017.png"
-                       alt="[ 2017 Keynote Speakers ]"></img>
+                       alt="[ 2017 Keynote Speakers: Cory Doctorow, Kade Crockford, Richard Stallman, Sumana Harihareswara ]"></img>
                        <p class="carousel-caption-bottom" style="background-color: white;"><br></p>
                        </li>
 
                        <li class="item">
                                <img src="https://static.fsf.org/nosvn/libreplanet/feature-images/sumana-speaking-with-cables.png"
-                               alt="[ Crypto Session at FSF30 ]"></img>
+                               alt="[ Crypto Session at the Free Software Foundation 30th Anniversary User Freedom Summit ]"></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/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>
 
@@ -42,6 +42,13 @@
                        </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>
+
                <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. ]">