makefile update and permissions fix

diff --git a/2019/fun/index.html b/2019/fun/index.html
index 8180b27036b29bccaf542fc1fa32b3a568623d30..d281870cbb3122ebac7fd2f8e27fe6ac7f0b8831 100755 (executable)
--- a/2019/fun/index.html
+++ b/2019/fun/index.html
@@ -1,39 +1,29 @@
 <!--#include virtual="/2019/includes/header.html"-->
 
-<title>LibrePlanet 2019 &mdash; Fun </title>
-
+<p><title>LibrePlanet 2019 &mdash; Fun </title></p>
 <!--#include virtual="/2019/includes/banner.html"-->
-<!--#include virtual="/2019/includes/sidebar.html"-->
-<h1>Program <small>Fun</small></h1>
 
-<h3>Fun Times at LibrePlanet!</h3>
+<!--#include virtual="/2019/includes/sidebar.html"-->
 
-<p>
-  LibrePlanet is full of opportunities for fun!
-</p>
-<strong>Friday night</strong>
+<h1>Program Fun</h1>
+<h2>Fun Times at LibrePlanet!</h2>
+<p>LibrePlanet is full of opportunities for fun!</p>
+<h4>Friday night</h4>
 <ul>
-<li><i>Friday night open house, 17:00-19:30:</i> On Friday evening, the FSF is hosting an open house at the FSF office. You'll be able to pick up your conference badge (and purchase raffle tickets), allowing you to skip the line on Saturday morning! The FSF office is a short walk from the Downtown Crossing, State, and Park Street MBTA stops. The FSF office is an accessible space. 51 Franklin Street, 5th Floor, Boston, MA 02110.</li>
+<li>Friday night open house, 17:00-19:30:</i> On Friday evening, the FSF is hosting an open house at the FSF office. You'll be able to pick up your conference badge (and purchase raffle tickets), allowing you to skip the line on Saturday morning! The FSF office is a short walk from the Downtown Crossing, State, and Park Street MBTA stops. The FSF office is an accessible space. 51 Franklin Street, 5th Floor, Boston, MA 02110.</li>
 <li>After the open house, all women, genderqueer, non-binary, and gender non-conforming people interested in free software are invited to the Welcome Dinner. Details TBA.</li>
-  <li>You can plan your own dinner with fellow LibrePlanet attendees <a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2019/friday_dinner">using the LibrePlanet wiki</a>.</li>
+<li>You can plan your own dinner with fellow LibrePlanet attendees <a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2019/friday_dinner">using the LibrePlanet wiki</a>.</li>
 </ul>
-<strong>Saturday night</strong>
+<h4>Saturday night</h4>
 <ul>
-  <li><i>Saturday night party, 19:00-22:00:</i>
-    Join us Saturday night after the Free Software Awards to celebrate free software in Downtown Boston! We will have gratis snacks, and your first drink is on us. A full dinner menu is available for purchase. The venue is accessible, and all ages are welcome! The party is at Scholars Bistro, 25 School Street, Boston, MA 02108.</li>
-  <li>
-    <i>Saturday, 19:00-21:30:</i> Looking for a little quieter social time? The FSF office will be open late for hacking and hanging out. Snacks, non-alcoholic drinks, and power will be provided. This is an alcohol-free event. The office is at 51 Franklin Street, Fifth Floor, Boston, MA 02110.</li>
+<li><em>Saturday night party, 19:00-22:00:</em> Join us Saturday night after the Free Software Awards to celebrate free software in Downtown Boston! We will have gratis snacks, and your first drink is on us. A full dinner menu is available for purchase. The venue is accessible, and all ages are welcome! The party is at Scholars Bistro, 25 School Street, Boston, MA 02108.</li>
+<li><em>Saturday, 19:00-21:30:</em> Looking for a little quieter social time? The FSF office will be open late for hacking and hanging out. Snacks, non-alcoholic drinks, and power will be provided. This is an alcohol-free event. The office is at 51 Franklin Street, Fifth Floor, Boston, MA 02110.</li>
 </ul>
-<strong>Sunday night</strong>
+<h4>Sunday night</h4>
 <ul>
-  <li><i>Sunday, 21:00-23:30:</i> A Cambridge tradition! Rather than an official LibrePlanet event, this is a regular, unofficial gathering. Feel free to join Boston area free software enthusiasts and your new friends at Grendel's Den, located in Harvard Square. 89 Winthrop St, Cambridge, MA.
-    </li>
+<li>Sunday, 21:00-23:30:</i> A Cambridge tradition! Rather than an official LibrePlanet event, this is a regular, unofficial gathering. Feel free to join Boston area free software enthusiasts and your new friends at Grendel's Den, located in Harvard Square. 89 Winthrop St, Cambridge, MA.</li>
 </ul>
-
-<p>
-  You can also <a href="http://events.mit.edu/">Check out the MIT events calendar</a>.
-</p>
-</div>
-
+<p>You can also <a href="http://events.mit.edu/">Check out the MIT events calendar</a>.</p>
 <!--#include virtual="/2019/includes/footer.html"-->
-<!--#include virtual="/2019/includes/close.html" -->
+
+<!--#include virtual="/2019/includes/close.html" -->
\ No newline at end of file

diff --git a/2020/Makefile b/2020/Makefile
index 5eafb30fe3ce9053fbcf66702f8f97df1dc1c298..4f28977ad441b7aed188654c5fce067ab23cc189 100644 (file)
--- a/2020/Makefile
+++ b/2020/Makefile
@@ -27,7 +27,8 @@ SESSIONS_HTML = program/generated-sessions.html
 
 all:
        @echo "Give me something to make."
-
+# for f in $(find -name '*.mdwn' -type f); do python -m markdown $f > ${f%mdwn}html; done
+# todo: edit below command so it translates ALL markdown files. use above command instead until then.
 wikipages:
        for dir in fun getting-around raffle safe-space-policy speaker-release sponsors volunteer;      do \
                if [ -f $$dir/index.mdwn ] ; then \

diff --git a/2020/confirmation.html b/2020/confirmation.html
old mode 100755 (executable)
new mode 100644 (file)
index b4f2f11..c411378
--- a/2020/confirmation.html
+++ b/2020/confirmation.html
@@ -1,22 +1,17 @@
-<!--#include virtual="/2019/includes/header.html"-->
+<!--#include virtual="/2020/includes/header.html"-->
 
-<title>LibrePlanet &mdash; Announcements List Confirmation</title>
+<h1>LibrePlanet - Announcements List Confirmation</h1>
+<!--#include virtual="/2020/includes/banner.html"-->
 
-<!--#include virtual="/2019/includes/banner.html"-->
-<!--#include virtual="/2019/includes/sidebar.html"-->
-
-<h2>
-    <span class="glyphicon glyphicon-inbox"></span>
-    Please check for our confirmation email
-</h2>
-<br/>
+<!--#include virtual="/2020/includes/sidebar.html"-->
 
+<h2>Please check for our confirmation email</h2>
 <p>For your protection and to prevent spam, we don't process form
 submissions until you click the link in the confirmation email.</p>
-
 <p>If you don't see the email, please check your spam folder. Still
-can't find it? Let us know at <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a>.</p>
-
+can't find it? Let us know at <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#99;&#97;&#109;&#112;&#97;&#105;&#103;&#110;&#115;&#64;&#102;&#115;&#102;&#46;&#111;&#114;&#103;">&#99;&#97;&#109;&#112;&#97;&#105;&#103;&#110;&#115;&#64;&#102;&#115;&#102;&#46;&#111;&#114;&#103;</a>.</p>
 <!--#include virtual="/2019/includes/footer.html"-->
+
 <!--#include virtual="/2019/includes/common_js.html"-->
-<!--#include virtual="/2019/includes/close.html" -->
+
+<!--#include virtual="/2019/includes/close.html" -->
\ No newline at end of file

diff --git a/2020/confirmation.mdwn b/2020/confirmation.mdwn
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/feedback-closed.html b/2020/feedback-closed.html
old mode 100755 (executable)
new mode 100644 (file)
index 87603ec..797b69c
--- a/2020/feedback-closed.html
+++ b/2020/feedback-closed.html
@@ -1,17 +1,15 @@
 <!--#include virtual="/2019/includes/header.html"-->
 
-<title>LibrePlanet &mdash; Feedback Survey Closed</title>
-
+<h1>LibrePlanet - Feedback Survey Closed</h1>
 <!--#include virtual="/2019/includes/banner.html"-->
-<!--#include virtual="/2019/includes/sidebar.html"-->
 
-<h2> Sorry, the feedback survey is now closed</h2>
+<!--#include virtual="/2019/includes/sidebar.html"-->
 
-<p>
-    <a href="/2019/">
-       Return to the homepage.
-    </a>
-</p>
+<h2>Sorry, the feedback survey is now closed</h2>
+<pre><code>[Return to the homepage](https://www.libreplanet.org/2020)
+</code></pre>
 <!--#include virtual="/2019/includes/footer.html"-->
+
 <!--#include virtual="/2019/includes/common_js.html"-->
-<!--#include virtual="/2019/includes/close.html" -->
+
+<!--#include virtual="/2019/includes/close.html" -->
\ No newline at end of file

diff --git a/2020/feedback-closed.mdwn b/2020/feedback-closed.mdwn
old mode 100755 (executable)
new mode 100644 (file)
index 54bd139..b0873e7
--- a/2020/feedback-closed.mdwn
+++ b/2020/feedback-closed.mdwn
@@ -7,8 +7,8 @@
 
 ## Sorry, the feedback survey is now closed         
        
-       Return to the homepage.
-    test   
+    [Return to the homepage](https://www.libreplanet.org/2020)
+    
 
 <!--#include virtual="/2019/includes/footer.html"-->
 <!--#include virtual="/2019/includes/common_js.html"-->

diff --git a/2020/feedback-confirmation.html b/2020/feedback-confirmation.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/fun/index.html b/2020/fun/index.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/fun/index.mdwn b/2020/fun/index.mdwn
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/getting-around/index.html b/2020/getting-around/index.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/includes/banner.html b/2020/includes/banner.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/includes/boilerplate.html b/2020/includes/boilerplate.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/includes/close.html b/2020/includes/close.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/includes/common_js.html b/2020/includes/common_js.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/includes/footer.html b/2020/includes/footer.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/includes/header.html b/2020/includes/header.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/includes/live_sidebar.html b/2020/includes/live_sidebar.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/includes/program_js.html b/2020/includes/program_js.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/includes/recent-updates.html b/2020/includes/recent-updates.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/includes/registration-full.html b/2020/includes/registration-full.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/includes/sidebar.html b/2020/includes/sidebar.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/index.html b/2020/index.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/js-labels/index.html b/2020/js-labels/index.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/live/index.html b/2020/live/index.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/live/menu.html b/2020/live/menu.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/live/room123.html b/2020/live/room123.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/live/room144.html b/2020/live/room144.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/live/room155.html b/2020/live/room155.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/program/app.html b/2020/program/app.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/program/grid-schedule.html b/2020/program/grid-schedule.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/program/index.html b/2020/program/index.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/raffle/index.html b/2020/raffle/index.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/registration-full.html b/2020/registration-full.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/safe-space-policy/index.html b/2020/safe-space-policy/index.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/speaker-release/index.html b/2020/speaker-release/index.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/speakers/index.html b/2020/speakers/index.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/sponsors/index.html b/2020/sponsors/index.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/tv/index.html b/2020/tv/index.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/volunteer/index.html b/2020/volunteer/index.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/2020/walkup-registration.html b/2020/walkup-registration.html
old mode 100755 (executable)
new mode 100644 (file)