craigt trivia description, thursday

[libreplanet-static.git] / 2017 / index.html

diff --git a/2017/index.html b/2017/index.html
index 1931c2ef91d55961873d7cdbd288fc4210185cb8..540f8512587b160be2aa2c4a7350abf63322a284 100755 (executable)
--- a/2017/index.html
+++ b/2017/index.html
@@ -12,25 +12,23 @@
        <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: 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 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>
-
+                       <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://my.fsf.org/civicrm/event/register?id=67&reset=1">Register your party</a> with the FSF.</p>
+               </li>
 
+               <li class="item">
+                       <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>
 
                                </ul>
 
@@ -42,6 +40,13 @@
                        </p>
                </li>
 
+               <li class="item">
+                       <img src="https://static.fsf.org/nosvn/libreplanet/feature-images/sumana-speaking-with-cables.png"
+                       alt="[ Sumana Harihareswara speaking at a podium at LibrePlanet 2016. Between her and the camera is a table strewn with cables and computer equipment. ]"></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>
@@ -49,14 +54,6 @@
                                <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. ]">
-               <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>