Adding scholarship application to sidebar, updating news section and removing an...

diff --git a/2017/includes/nav-list-1.html b/2017/includes/nav-list-1.html
index c2cbfd13459c7997e4ade1942f894a187a411ebc..4469a2a412b5ae58d39faa7b41178723c04bb2f9 100644 (file)
--- a/2017/includes/nav-list-1.html
+++ b/2017/includes/nav-list-1.html
@@ -1,7 +1,4 @@
-<!-- <li><a href="/2017/streaming">Livestream</a></li> -->
-
-
 <li><a href="https://my.fsf.org/lp-call-for-sessions">Propose a session</a></li>
+<li><a href="https://my.fsf.org/lp-scholarship-application">Apply for a scholarship</a></li>
 <li class="program-link"><a href="/2016/program">Video sessions from last LibrePlanet</a></li>
-<li class="getting-around-link"><a href="/2017/getting-around">Travel info</a></li>
-<li class="ahp-link"><a href="/2017/safe-space-policy/">Safe Space Policy</a></li>
+<!-- <li><a href="/2017/streaming">Livestream</a></li> -->

diff --git a/2017/includes/nav-list-2.html b/2017/includes/nav-list-2.html
index 1d9145562267718489ffd385e06d683b5e243ce4..b95cc6c49179a0baf6eb366b1bed2761a62b579b 100644 (file)
--- a/2017/includes/nav-list-2.html
+++ b/2017/includes/nav-list-2.html
@@ -1,5 +1,7 @@
 <!-- <li class="volunteer-link"><a href="/2017/volunteer">Volunteer</a></li> -->
 <!-- <li><a href="https://my.fsf.org/civicrm/event/register?id=43&amp;reset=1">Host a streaming party</a></li> -->
+<li class="getting-around-link"><a href="/2017/getting-around">Travel info</a></li>
+<li class="ahp-link"><a href="/2017/safe-space-policy/">Safe Space Policy</a></li>
 <li class="mailing-list-link"><a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the discussion list</a></li>
 <li><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=33">Build the scholarship fund</a></li>
 <!-- <li class="sponsors-link"><a href="/2017/sponsors">Sponsors</a></li> -->

diff --git a/2017/includes/sidebar.html b/2017/includes/sidebar.html
index 7679560833c750617d6d3df9cdbe150fbb605879..a0da4e94c904783b679fe2878b0a35a99a5eca77 100755 (executable)
--- a/2017/includes/sidebar.html
+++ b/2017/includes/sidebar.html
@@ -45,6 +45,8 @@
                        <li class="list-group-item">
                                <strong>Recent Updates</strong>
                        </li>
+                       <li class="list-group-item">
+                                       <strong>09/27/2016:</strong> <a href="https://www.fsf.org/news/libreplanet-returns-march-25-26-2017-call-for-proposals-for-annual-free-software-conference-now-open">Call for proposals open until November 14th</a></li>
                        <li class="list-group-item">
                                        <strong>06/21/2016:</strong> <a href="https://www.fsf.org/blogs/community/building-a-better-libreplanet-what-we-learned-from-the-conference-surveys">Building a better LibrePlanet: What we learned from the conference surveys</a></li>
                        <li class="list-group-item">

diff --git a/2017/index.html b/2017/index.html
index 5fad55502025d67ab9c280a93858e4a1a87b48d4..3f6b22d3f06c64ca183368539846f15ce07b99b2 100755 (executable)
--- a/2017/index.html
+++ b/2017/index.html
@@ -192,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"-->