Adding LibreLuna sidebar item and carousel feature.

diff --git a/2016/includes/sidebar.html b/2016/includes/sidebar.html
index e75bb0f8fc4eafb0f2cc68553db52ab56af10c80..5c0eb59ee649998c43f86281a5d984143430cf3d 100755 (executable)
--- a/2016/includes/sidebar.html
+++ b/2016/includes/sidebar.html
@@ -31,8 +31,9 @@
 
                <ul class="nav nav-pills nav-stacked">
                        <li id="volunteer-link"><a href="/2016/volunteer">Volunteer</a></li>
+                       <li><a href="https://my.fsf.org/civicrm/event/register?id=43&reset=1">Host a streaming party</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="/2016/exhibit">Exhibit tables</a></li>
+                       <li><a href="/2016/exhibit">Reserve an exhibit table</a></li>
                        <li><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=33">Build the scholarship fund</a></li>
                        <li id="sponsors-link"><a href="/2016/sponsors">Sponsors</a></li>
 

diff --git a/2016/index.html b/2016/index.html
index 921f234e253ff2d2183cf1119a3ff04a1935e111..d1ae2a1ce730dbd8ad096863c9af77bc18f50683 100755 (executable)
--- a/2016/index.html
+++ b/2016/index.html
@@ -17,6 +17,13 @@
                                View the <a href="program/index.html">conference program</a>.</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">
                        <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-printer.jpg"
                        alt="[ Aleph Objects' Lulzbot 3D printer ]">
@@ -26,16 +33,16 @@
                                </p>
                        </li>
 
+                               </ul>
+
+                               <!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT
+
                                <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
-
                                <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>