updated includes folder content to 2020 - added home-content.mdwn

diff --git a/2020/includes/banner.html b/2020/includes/banner.html
index 98092d41032a96257e1f3fd8dda446c72d8ea9c0..577a63fb5867cff93b635caddcd845569570163f 100644 (file)
--- a/2020/includes/banner.html
+++ b/2020/includes/banner.html
@@ -7,21 +7,21 @@
                  <div class="row">
                        <div class="lp-head"> <!-- start of lp header -->
                          <div class="lp-logo col-sm-3 col-xs-5">
-                               <a href="/2019/">
-                                 <img src="/2019/assets/img/lp-logo-2019.svg"
+                               <a href="/2020/">
+                                 <img src="/2020/assets/img/lp-logo-2019.svg"
                                           class="img-responsive"
-                                          alt="[ LibrePlanet 2019 ]" />
+                                          alt="[ LibrePlanet 2020 ]" />
                                </a>
                          </div>
                          <div class="lp-date-place col-sm-5 col-xs-2">
                             <!-- Heads up! When updating this date and place information,
                                  remember to update it in the small
                                  screen navbar too (see below) -->
-                     <p><br><strong>March 23rd - 24th<br />
-                             Stata Center<br>Massachusetts Institute of Technology<br>Cambridge, MA</strong></p>
+                     <p><br><strong>Spring 2020<br />
+                             Boston area, MA</strong></p>
                          </div>
                           <!-- #top-right-desktop start -->
-                          <!--#include virtual="/2019/includes/join-list.html"-->
+                          <!--#include virtual="/2020/includes/join-list.html"-->
                           <!-- #top-right-desktop end -->
                        </div><!-- end of lp header -->
 
@@ -41,27 +41,27 @@
               <span class="icon-bar"></span>
               <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="/2019/">
-              <img src="/2019/assets/img/lp-logo-2019.svg"
+            <a class="navbar-brand" href="/2020/">
+              <img src="/2020/assets/img/lp-logo-2019.svg"
                    style="max-width: 100px"
                    class="img-responsive"
-                   alt="[ LibrePlanet 2019 ]" />
+                   alt="[ LibrePlanet 2020 ]" />
             </a>
             <p class="navbar-text">
                <!-- Heads up! When updating date place, remember to
                update it in the lp banner too (see above) -->
-               <strong>March 23rd - 24th<br />Greater Boston area</strong>
+               <strong>Spring 2020<br />Greater Boston area</strong>
            </p>
           </div>
 
           <div class="collapse navbar-collapse" id="lp-navbar-collapse">
 
             <ul class="nav navbar-nav">
-              <!--#include virtual="/2019/includes/nav-list-1.html"-->
+              <!--#include virtual="/2020/includes/nav-list-1.html"-->
             </ul>
 
             <ul class="nav navbar-nav">
-              <!--#include virtual="/2019/includes/nav-list-2.html"-->
+              <!--#include virtual="/2020/includes/nav-list-2.html"-->
             </ul>
           </div><!-- navbar-collapse end -->
         </div><!-- navbar container-fluid end -->

diff --git a/2020/includes/boilerplate.html b/2020/includes/boilerplate.html
index 583b33112c349fc919c6e89b13728a3ebaa57f33..0c0b43cdb45032684d8ad1346af4ab6eb244a876 100644 (file)
--- a/2020/includes/boilerplate.html
+++ b/2020/includes/boilerplate.html
@@ -1,11 +1,11 @@
-<!--#include virtual="/2019/includes/header.html"-->
+<!--#include virtual="/2020/includes/header.html"-->
 
-<title>LibrePlanet 2019 &mdash; Title here</title>
+<title>LibrePlanet 2020 &mdash; Free the Future</title>
 
-<!--#include virtual="/2019/includes/banner.html"-->
-<!--#include virtual="/2019/includes/sidebar.html"-->
+<!--#include virtual="/2020/includes/banner.html"-->
+<!--#include virtual="/2020/includes/sidebar.html"-->
 
 <!-- Content comes here -->
 
-<!--#include virtual="/2019/includes/footer.html"-->
-<!--#include virtual="/2019/includes/close.html" -->
+<!--#include virtual="/2020/includes/footer.html"-->
+<!--#include virtual="/2020/includes/close.html" -->

diff --git a/2020/includes/common_js.html b/2020/includes/common_js.html
index 73ccabaf09c27b9dfdc540b7c1aafda4cc31b6db..21e810f474728e0370b5658b3273dad33bb0cc5b 100644 (file)
--- a/2020/includes/common_js.html
+++ b/2020/includes/common_js.html
@@ -1,9 +1,9 @@
 <script type="text/javascript"
-               src="/2019/assets/js/jquery-1.11.3.min.js"></script>
+               src="/2020/assets/js/jquery-1.11.3.min.js"></script>
 <script type="text/javascript"
-        src="/2019/assets/js/piwik.js"></script>
+        src="/2020/assets/js/piwik.js"></script>
 <script type="text/javascript"
-       src="/2019/assets/js/bootstrap-3.3.5.min.js"></script>
+       src="/2020/assets/js/bootstrap-3.3.5.min.js"></script>
 <script>
 $(document).ready(logoTextStack);
 

diff --git a/2020/includes/footer.html b/2020/includes/footer.html
index 16ea0b421c6a9485e260e2270eba771e74ad92ce..beb5b9f1a0ea40367576261235145c50fdd3c028 100644 (file)
--- a/2020/includes/footer.html
+++ b/2020/includes/footer.html
@@ -12,7 +12,7 @@
       <a rel="license"
         href="http://creativecommons.org/licenses/by-sa/4.0/">
        Creative Commons Attribution-ShareAlike 4.0</a>.
-      Copyright &copy; 2014-2019 Free Software Foundation. It was built using
+      Copyright &copy; 2014-2020 Free Software Foundation. It was built using
       <a href="https://github.com/twbs/bootstrap/tree/v3.3.5">Bootstrap 3.3.5</a>,
       which is licensed under <a href="http://www.gnu.org/licenses/license-list.html#Expat">
        Expat</a>. The JavaScript is free software with

diff --git a/2020/includes/header.html b/2020/includes/header.html
index 4e3fff65528bc7a6ce2dbfc9f602fe3a601a8d9c..0edcfac42b49745088f14efe6513476fd77cc7c3 100644 (file)
--- a/2020/includes/header.html
+++ b/2020/includes/header.html
@@ -4,10 +4,10 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 
-    <link href="/2019/assets/css/bootstrap.min.css" rel="stylesheet" media="screen" />
-    <link href="/2019/assets/css/jquery-ui-1.9.0.custom.css" rel="stylesheet" media="screen" />
-    <link href="/2019/assets/css/custom.css" rel="stylesheet" media="screen" />
-    <link href="/2019/assets/img/favicon.ico" rel="shortcut icon">
+    <link href="/2020/assets/css/bootstrap.min.css" rel="stylesheet" media="screen" />
+    <link href="/2020/assets/css/jquery-ui-1.9.0.custom.css" rel="stylesheet" media="screen" />
+    <link href="/2020/assets/css/custom.css" rel="stylesheet" media="screen" />
+    <link href="/2020/assets/img/favicon.ico" rel="shortcut icon">
 
        <script>
          /**

diff --git a/2020/includes/home-content.mdwn b/2020/includes/home-content.mdwn
new file mode 100644 (file)
index 0000000..c7578b3
--- /dev/null
+++ b/2020/includes/home-content.mdwn
@@ -0,0 +1,3 @@
+LibrePlanet is an annual conference hosted by the [Free Software Foundation](https://www.fsf.org">Free Software Foundation) for free software enthusiasts and anyone who cares about the intersection of technology and social justice.  LibrePlanet brings together software developers, law and policy experts, activists, students, and computer users to learn skills, celebrate free software accomplishments, and face challenges to software freedom. Newcomers are always welcome, and LibrePlanet 2020 will feature programming for all ages and experience levels.
+
+LibrePlanet 2020's theme is "**Free the Future**.” 

diff --git a/2020/includes/join-list.html b/2020/includes/join-list.html
index 8f49294ac1cbc1a1d77d9bc394545c9848ba4de8..ec5644151ab61c918d4ea8d8321c9835efcb5775 100644 (file)
--- a/2020/includes/join-list.html
+++ b/2020/includes/join-list.html
@@ -5,7 +5,7 @@
         method="post" name="Edit" id="Edit">
     <div>
       <input name="postURL" type="hidden"
-             value="https://libreplanet.org/2019/confirmation.html" />
+             value="https://libreplanet.org/2020/confirmation.html" />
       <input name="cancelURL" type="hidden"
              value="https://my.fsf.org/civicrm/profile?reset=1&amp;gid=507" />
       <input name="add_to_group" type="hidden" value="619" />

diff --git a/2020/includes/live_menu.html b/2020/includes/live_menu.html
index 4dd43427d1afe5fc1dbee0a4fb40027e6671ce2a..fdbeef7961ebdd59cf847d715d0aa6b50a88ae8d 100644 (file)
--- a/2020/includes/live_menu.html
+++ b/2020/includes/live_menu.html
@@ -1,3 +1,7 @@
+Livestream not available yet.
+<li><a href="/2020/program">Warm up with the 2019 LibrePlanet videos!</a>
+
+<!--
 <div class="row">
   <div class="col-sm-offset-1 col-sm-10">
        <ol class="breadcrumb text-center">
@@ -7,3 +11,4 @@
        </ol>
   </div>
 </div>
+-->

diff --git a/2020/includes/live_sidebar.html b/2020/includes/live_sidebar.html
index 1e25306f2f63028c3f3b55f637697911dc9e4397..e4f734f14fec0b61ab6449f0259e0d4e9856bb91 100644 (file)
--- a/2020/includes/live_sidebar.html
+++ b/2020/includes/live_sidebar.html
@@ -4,7 +4,7 @@
   </div>
   <div class="panel-body">
        <p>Hard-working FSF hackers are running our
-         advanced free software streaming system for LibrePlanet 2019. We
+         advanced, fully free, software streaming system for LibrePlanet 2020. We
          appreciate your support to help cover labor and equipment.</p>
 
        <p><a href="https://my.fsf.org/associate/support_freedom/join_fsf" style="border-bottom: none !important;">
@@ -29,7 +29,7 @@
     </div>
   </div> <!-- end librejs box -->
 
-<div class="panel panel-default"> <!-- start LP15 signup -->
+<div class="panel panel-default"> <!-- start LP20 signup -->
   <div class="panel-heading">
        <h3 class="panel-title">Stay in the loop</h3>
   </div>
@@ -84,4 +84,4 @@
     </form>
        <p class="text-center"> <a class="alt-a" href="https://my.fsf.org/donate/privacypolicy.html">Privacy policy</a></p>
   </div>
-</div> <!-- end LP15 signup -->
+</div> <!-- end LP20 signup -->

diff --git a/2020/includes/nav-list-1.html b/2020/includes/nav-list-1.html
index 8b2b4df6bb70868fdcd1d3055712fe07e38116f2..fa937923c34c30b725fd3d6f5af5e2ac4d2811ac 100644 (file)
--- a/2020/includes/nav-list-1.html
+++ b/2020/includes/nav-list-1.html
@@ -1,5 +1,9 @@
-<li><a href="https://libreplanet.org/2019/speakers">Speakers</a></li>
-<li><a href="https://libreplanet.org/2019/program">Schedule</a></li>
-<li class="livestream-link"><a href="/2019/live">Video Recordings <span class="glyphicon glyphicon-globe"></span></a></li>
-<li><a href="https://libreplanet.org/2019/fun">Events</a></li>
-<!-- li><a href="https://libreplanet.org/2019/raffle">Raffle</a></li -->
+<li><a href="FIXME SPEAKER FORM">Submit a Session!</a></li>
+<!--
+<li><a href="FIXME GENERAL REGISTRATION">Register!</a></li>
+<li><a href="FIXME SCHOLARSHIP FORM NODE17">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="FIXME SCHOLARSHIP donation, was: https://my.fsf.org/civicrm/contribute/transact?reset=1&id=60">Donate to the Travel Fund

diff --git a/2020/includes/nav-list-2.html b/2020/includes/nav-list-2.html
index 4f4ed32559858784a811ea66f4c5f01860b6b20c..8e547bb66787a178872ba71ff71d210dee0a4df1 100644 (file)
--- a/2020/includes/nav-list-2.html
+++ b/2020/includes/nav-list-2.html
@@ -1,5 +1,8 @@
-<li class="getting-around-link"><a href="/2019/getting-around">Travel, Food & Lodging</a></li>
-<li class="sponsorship-and-exhibitor-link"><a href="https://libreplanet.org/2019/sponsors">Sponsors and Exhibitors</a></li>
-<li class="safe-space-policy-link"><a href="/2019/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://media.libreplanet.org/u/libreplanet/tag/libreplanet-2018-video/">Session videos from last year</a></li>
+<li><a href="https://media.libreplanet.org/u/libreplanet/tag/libreplanet-2019-video//">2019 Session videos</a></li>
+<li><a href="/2020/getting-around">Travel, Lodging & Food</a></li>
+<li><a href="/20/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/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/program-menu.html b/2020/includes/program-menu.html
index 29cae4c98ee8b2b7587cfab3ab2c3a0451a091de..f7900862d04e2c73ba4344ea1bf333f20f1977a9 100644 (file)
--- a/2020/includes/program-menu.html
+++ b/2020/includes/program-menu.html
@@ -1,17 +1,21 @@
+Program will be updated as soon as we finish the schedule!
+<li><a href="/2020/program">Warm up with the 2019 LibrePlanet videos!</a>
 
+<!--
 <div class="contain-fluid">
   <div class="row margin-top">
     <div>
 
       <ol class="breadcrumb text-center">
-        <li id="p-sessions"><a href="/2019/program">Sessions</a></li>
-        <li id="p-grid-sch"><a href="/2019/program/grid-schedule.html">Grid Schedule</a></li>
+        <li id="p-sessions"><a href="/2020/program">Sessions</a></li>
+        <li id="p-grid-sch"><a href="/2020/program/grid-schedule.html">Grid Schedule</a></li>
        <li><a href="app.html">Other ways to use the schedule</a></li>
-        <li id="p-speakers"><a href="/2019/speakers">Speakers</a></li>
-        <!--<li id="p-social"><a href="/2019/program/social.html">Social &amp; Community Events</a>-->
+        <li id="p-speakers"><a href="/2020/speakers">Speakers</a></li>
+        <li id="p-social"><a href="/2020/program/social.html">Social &amp; Community Events</a>
       </ol>
 
   </div>
 </div>
 </div>
 <br>
+-->

diff --git a/2020/includes/recent-updates.html b/2020/includes/recent-updates.html
index e28ed30ac76213e3e15488338a38adf5059d9f35..f9c1ced3d4f12e0fcd74a68cc750c54d113969fd 100644 (file)
--- a/2020/includes/recent-updates.html
+++ b/2020/includes/recent-updates.html
@@ -14,22 +14,6 @@
            <strong>03/23/2019:</strong> <a href="https://www.fsf.org/blogs/community/libreplanet-day-1-trailblazing-free-software-together">LibrePlanet Day 1: Trailblazing free software together</a>
          </li>
          <li>
-           <strong>03/21/2019:</strong> <a href="https://www.fsf.org/blogs/community/libreplanet-is-coming-in-two-days-heres-how-you-can-participate">LibrePlanet is coming in two days! Here's how you can participate</a>
-         </li>
-         <li>
-           <strong>03/18/2019:</strong> <a href="https://www.fsf.org/blogs/community/your-guide-to-libreplanet-2019-march-23-24">Your guide to LibrePlanet 2019, March 23-24!</a>
-         </li>
-         <li>
-           <strong>03/07/2019:</strong> <a href="https://www.fsf.org/blogs/community/what-talks-will-you-attend-at-libreplanet-2019">What talks will you attend at LibrePlanet 2019?"</a>
-         </li>
-         <li>
-           <strong>03/01/2019:</strong> <a href="https://www.fsf.org/blogs/gnu-press/new-libreplanet-2019-tees-explore-new-frontiers-of-free-software">New LibrePlanet 2019 tees: explore new frontiers of free software</a>
-         </li>
-         <li>
-           <strong>02/21/2019:</strong> <a href="https://www.fsf.org/blogs/community/libreplanet-2019-coming-to-cambridge-ma">LibrePlanet 2019: Coming to Cambridge, MA</a>
-         </li>
-         <li>
-           <strong>10/23/2018:</strong> <a href="https://www.fsf.org/blogs/community/libreplanet-2019-call-for-sessions-deadline-extended-until-nov-9th">LibrePlanet 2019 Call for Sessions deadline extended until Nov 9th</a>
                  </li>
         </ul>
 </ul>

diff --git a/2020/includes/registration-full.html b/2020/includes/registration-full.html
index 30eaa8d5db9ee48a331400db05cff17c46d15165..aff8c818a6bb93c47ebe16b51f53de52bffd98f4 100644 (file)
--- a/2020/includes/registration-full.html
+++ b/2020/includes/registration-full.html
@@ -1 +1 @@
-<p style="text-align: right; margin-top: 15px; margin-bottom: 40px;">Pre-registration is full, but we will do<br>our best to accomodate <a href="/2019/walkup-registration.html">walk-ups</a>.</p>
+<p style="text-align: right; margin-top: 15px; margin-bottom: 40px;">Pre-registration is now closed, but we will do<br>our best to accomodate <a href="/2020/walkup-registration.html">walk-ups</a>.</p>

diff --git a/2020/includes/sidebar.html b/2020/includes/sidebar.html
index 180fc6fd0c29692c51702b122ef1705d8a4900c6..4a0ef6253d5f4d8ea297d06dba03c774ae64a75c 100644 (file)
--- a/2020/includes/sidebar.html
+++ b/2020/includes/sidebar.html
@@ -1,9 +1,9 @@
 <div class="container"> <!-- start of container -->
     <div class="row">
        <div id="lp-nav" class="col-sm-3"> <!-- start of sidebar column -->
-           <!--#if expr="'${REQUEST_URI}' != '/2019/'" -->
+           <!--#if expr="'${REQUEST_URI}' != '/2020/'" -->
                <p class="text-center lp-home">
-                   <a class="text-muted" href="/2019/">
+                   <a class="text-muted" href="/2020/">
                        <span class="glyphicon glyphicon-chevron-left"></span> Home
                    </a>
                </p>
@@ -11,11 +11,11 @@
 
 
            <ul class="nav nav-pills nav-stacked hidden-xs">
-                <!--#include virtual="/2019/includes/nav-list-1.html"-->
+                <!--#include virtual="/2020/includes/nav-list-1.html"-->
            </ul>
 
            <ul class="nav nav-pills nav-stacked hidden-xs">
-                <!--#include virtual="/2019/includes/nav-list-2.html"-->
+                <!--#include virtual="/2020/includes/nav-list-2.html"-->
            </ul>
 
            <ul class="nav nav-pills nav-stacked">
@@ -28,7 +28,7 @@
            </ul>
 
             <!-- Replace 'include' -> '#include' when recent updates is non-empty -->
-            <!--#include virtual="/2019/includes/recent-updates.html"-->
+            <!--#include virtual="/2020/includes/recent-updates.html"-->
 
        </div> <!-- end of sidebar column -->
        <div id="lp-content" class="col-sm-9"> <!-- start of content column -->