Removing scholarship app from sidebar.

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

diff --git a/2017/index.html b/2017/index.html
index 0cfda2e883862626757576cfbc55c1a57a2d8f97..3f6b22d3f06c64ca183368539846f15ce07b99b2 100755 (executable)
--- a/2017/index.html
+++ b/2017/index.html
@@ -11,24 +11,26 @@
        <!-- wrapper for slides -->
        <ul class="carousel-inner list-unstyled">
 
-                               <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-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/feature-images/snowden-feature.png"
-                               alt="[ Snowden Keynote ]">
+                       <li class="item active">
+                               <img src="https://static.fsf.org/nosvn/libreplanet/feature-images/sumana-speaking-with-cables.png"
+                               alt="[ Crypto Session at FSF30 ]">
                                <p class="carousel-caption-bottom">
-                                       Explore a wealth of <a href="program/index.html">session videos and slides</a>.</p>
+                                       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="[ Apply for a scholarship ]">
+                       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>
+
 
                                </ul>
 
@@ -40,12 +42,6 @@
                                                <a href="https://www.libreplanet.org/conference/libreluna">Register your party</a> with the FSF.</p>
                                        </li>
 
-               <li class="item">
-                       <a href="https://media.libreplanet.org/u/libreplanet/m/libreplanet-2017-fork-the-system/"><img src="//static.fsf.org/nosvn/libreplanet/feature-images/lp2017-video.png"
-                       alt="[ LibrePlanet 2017 promotional video ]"></a>
-                       <p class="carousel-caption-bottom"><a href="https://media.libreplanet.org/u/libreplanet/m/libreplanet-2017-fork-the-system/">Watch the video for a taste of what's to come at LibrePlanet</a></p>
-                       </li>
-
 
                        <li class="item">
                        <a href="streaming"><img src="//static.fsf.org/nosvn/libreplanet/feature-images/remote_participation.png"
@@ -63,6 +59,12 @@
                                                                </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/2014/site/carousel/gnu30_hackers.jpg"
 alt="[ Apply for a scholarship ]">
@@ -149,7 +151,7 @@ Get excited for our keynote speakers!
 -->
 
 
-<!-- These are the controls fors the carousel. Comment them in if you want the little navigation chevrons and the skrims that appear when you mouse over the edges of the active image.-->
+<!-- These are the controls for the carousel. Comment them in if you want the little navigation chevrons and the skrims that appear when you mouse over the edges of the active image.-->
 
 
 <a class="left carousel-control" href="#lpc-carousel" data-slide="prev">
@@ -190,7 +192,7 @@ Get excited for our keynote speakers!
 
 <!--Theme paragraph.-->
 
-<p>FSF members and students attend LibrePlanet at no cost! <a href="https://crm.fsf.org/join">Become a member now</a>. Registration opens soon - sign up above to receive updates.</p>
+<!--<p>FSF members and students attend LibrePlanet at no cost! <a href="https://crm.fsf.org/join">Become a member now</a>. Registration opens soon - sign up above to receive updates.</p>-->
 
 <!--#include virtual="/2017/includes/footer.html"-->
 <!--#include virtual="/2017/includes/common_js.html"-->