From 343726f4f38f907e1d34676591824941dbf98346 Mon Sep 17 00:00:00 2001
From: Greg Farough <gregf@fsf.org>
Date: Tue, 5 Nov 2019 12:29:15 -0500
Subject: [PATCH] registration push

---
 2020/includes/banner.html       |  3 +++
 2020/includes/nav-list-1.html   | 10 ++++------
 2020/includes/nav-list-2.html   |  6 +++---
 2020/includes/register-now.html |  4 ++--
 2020/index.html                 | 10 +++++-----
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/2020/includes/banner.html b/2020/includes/banner.html
index 23e78630..fcf3d0b5 100644
--- a/2020/includes/banner.html
+++ b/2020/includes/banner.html
@@ -20,6 +20,9 @@
 			      spring 2020</strong></p>
 			  </div>
                           <!-- #top-right-desktop start -->
+                          <!--#include virtual="/2020/includes/register-now.html"-->
+                          <!-- #top-right-desktop end -->
+                          <!-- #top-right-desktop start -->
                           <!--#include virtual="/2020/includes/join-list.html"-->
                           <!-- #top-right-desktop end -->
 			</div><!-- end of lp header -->
diff --git a/2020/includes/nav-list-1.html b/2020/includes/nav-list-1.html
index 6478ea9f..26e21149 100644
--- a/2020/includes/nav-list-1.html
+++ b/2020/includes/nav-list-1.html
@@ -1,9 +1,7 @@
 <li><a href="https://my.fsf.org/lp-call-for-sessions">Submit a Session!</a></li>
-<!--
 <li><a href="https://my.fsf.org/civicrm/event/info?id=87&reset=1">Register!</a></li>
-<li><a href="https://my.fsf.org/node/34/webform-results">Apply for a Scholarship</a></li>
-<li class="livestream-link"><a href="/2020/live">Live Video Recordings <span class="glyphicon glyphicon-globe"></span></a></li>
-<li><a href="https://libreplanet.org/2020/speakers">Speakers</a></li>
-<li><a href="https://libreplanet.org/2020/program">Schedule</a></li>
--->
+<li><a href="https://my.fsf.org/lp-scholarship-application">Apply for a Scholarship</a></li>
+<!-- <li class="livestream-link"><a href="/2020/live">Live Video Recordings <span class="glyphicon glyphicon-globe"></span></a></li> -->
+<!-- <li><a href="https://libreplanet.org/2020/speakers">Speakers</a></li> -->
+<!-- <li><a href="https://libreplanet.org/2020/program">Schedule</a></li> -->
 
diff --git a/2020/includes/nav-list-2.html b/2020/includes/nav-list-2.html
index dc98c0d5..8cfb44b8 100644
--- a/2020/includes/nav-list-2.html
+++ b/2020/includes/nav-list-2.html
@@ -1,8 +1,8 @@
 <li><a href="https://media.libreplanet.org/u/libreplanet/tag/libreplanet-2019-video//">2019 Session Videos</a></li>
-<li><a href="/2020/getting-around">Lodging & Travel</a></li>
+<!-- <li><a href="/2020/getting-around">Lodging & Travel</a></li> -->
 <li><a href="/2020/safe-space-policy/">Safe Space Policy</a></li>
-<!-- <li><a href="https://libreplanet.org/2020/sponsors">Sponsors and Exhibitors</a></li>
+<li><a href="https://libreplanet.org/2020/sponsors">Sponsors and Exhibitors</a></li>
 <li><a href="https://libreplanet.org/2020/volunteer/">Volunteer</a></li>
-  -->
+
 <li><a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the discussion list</a></li>
 
diff --git a/2020/includes/register-now.html b/2020/includes/register-now.html
index c8920dbd..b10f0cf2 100644
--- a/2020/includes/register-now.html
+++ b/2020/includes/register-now.html
@@ -1,9 +1,9 @@
 <div class="register-block col-sm-offset-2 col-sm-4">
     <a class="btn btn-register btn-lg btn-block register-now"
-       href="https://my.fsf.org/civicrm/event/info?reset=1&id=71">
+       href="https://my.fsf.org/civicrm/event/info?id=87&reset=1">
         Register now
     </a>
     <p class="text-muted text-center">
-        gratis for members and students!
+        gratis for FSF associate members and students!
     </p>
 </div>
diff --git a/2020/index.html b/2020/index.html
index db810d04..f7148cf3 100755
--- a/2020/index.html
+++ b/2020/index.html
@@ -27,11 +27,11 @@
 	</li>
         
         <li class="item">
-	    <img src="//static.fsf.org/nosvn/libreplanet/2020/assets/award_site_image.png" 
-		 alt="[ Award graphic for 2019 FSF Awards ]">
+	    <img src="//static.fsf.org/nosvn/libreplanet/2020/assets/registration.png" 
+		 alt="[ Graphic announcing registration opening for LibrePlanet 2020. ]">
 	    <p class="carousel-caption-center">
-	        2019 FSF Awards are now open. <br>
-	        <a href="https://fsf.org/awards">Nominate someone today!</a>
+	        Registration for LibrePlanet 2020 is now open! <br>
+	        <a href="https://fsf.org/awards">Register today and help us free the future.</a>
             </p>
         </li>
         <li class="item">
@@ -44,7 +44,7 @@
         </li>
 
 	<li class="item">
-	    <img src="https://static.fsf.org/nosvn/libreplanet/2020/assets/general1-2.jpg" 
+	    <img src="//static.fsf.org/nosvn/libreplanet/2020/assets/general1-2.jpg" 
 		      alt="[ Edward Platt, Valerie Young, Christopher Webber, Amy Zhang sitting together as co-panelists at LibrePlanet 2019.  ]">
 	    <p class="carousel-caption-center">
 
-- 
2.25.1