From 635dd00777d691f321e0da6a970f5943fa91afd6 Mon Sep 17 00:00:00 2001
From: Michael McMahon <michael@fsf.org>
Date: Fri, 19 Mar 2021 11:28:35 -0400
Subject: [PATCH] Fix validation warnings and errors on main page and js.

---
 2021/assets/js/piwik.js              | 2 +-
 2021/includes/common_js.html         | 9 +++------
 2021/includes/getting_around_js.html | 2 +-
 2021/includes/livestream_js.html     | 2 +-
 2021/includes/program_js.html        | 2 +-
 2021/includes/safe_space_js.html     | 2 +-
 2021/includes/sidebar.html           | 2 +-
 2021/includes/workshops_js.html      | 2 +-
 2021/live/index.html                 | 6 +++---
 2021/program/index.html              | 2 +-
 2021/speakers/index.html             | 2 +-
 11 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/2021/assets/js/piwik.js b/2021/assets/js/piwik.js
index 29af5916..527cbaa4 100644
--- a/2021/assets/js/piwik.js
+++ b/2021/assets/js/piwik.js
@@ -6,6 +6,6 @@ _paq.push(["enableLinkTracking"]);
   var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.fsf.org/";
   _paq.push(["setTrackerUrl", u+"piwik.php"]);
   _paq.push(["setSiteId", "10"]);
-  var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+  var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0];
   g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
 })();
diff --git a/2021/includes/common_js.html b/2021/includes/common_js.html
index 9cedb4b9..e4438dcb 100644
--- a/2021/includes/common_js.html
+++ b/2021/includes/common_js.html
@@ -1,9 +1,6 @@
-<script type="text/javascript"
-		src="/2021/assets/js/jquery-1.11.3.min.js"></script>
-<script type="text/javascript"
-        src="/2021/assets/js/piwik.js"></script>
-<script type="text/javascript"
-	src="/2021/assets/js/bootstrap-3.3.5.min.js"></script>
+<script src="/2021/assets/js/jquery-1.11.3.min.js"></script>
+<script src="/2021/assets/js/piwik.js"></script>
+<script src="/2021/assets/js/bootstrap-3.3.5.min.js"></script>
 <script>
 $(document).ready(logoTextStack);
 
diff --git a/2021/includes/getting_around_js.html b/2021/includes/getting_around_js.html
index 00434585..010c8384 100644
--- a/2021/includes/getting_around_js.html
+++ b/2021/includes/getting_around_js.html
@@ -1,3 +1,3 @@
-<script type="text/javascript">
+<script>
  $(".getting-around-link").addClass("active");
 </script>
diff --git a/2021/includes/livestream_js.html b/2021/includes/livestream_js.html
index 32598ed9..25329548 100644
--- a/2021/includes/livestream_js.html
+++ b/2021/includes/livestream_js.html
@@ -1,3 +1,3 @@
-<script type="text/javascript">
+<script>
  $(".livestream-link").addClass("active");
 </script>
diff --git a/2021/includes/program_js.html b/2021/includes/program_js.html
index 02e6ad57..3b4a320f 100644
--- a/2021/includes/program_js.html
+++ b/2021/includes/program_js.html
@@ -128,6 +128,6 @@
  }
 </script>
 
-<script type="text/javascript">
+<script>
  $(".program-link").addClass("active");
 </script>
diff --git a/2021/includes/safe_space_js.html b/2021/includes/safe_space_js.html
index 98cc3a53..3e1b5aee 100644
--- a/2021/includes/safe_space_js.html
+++ b/2021/includes/safe_space_js.html
@@ -1,3 +1,3 @@
-<script type="text/javascript">
+<script>
  $(".safe-space-policy-link").addClass("active");
 </script>
diff --git a/2021/includes/sidebar.html b/2021/includes/sidebar.html
index 012d2aec..10e7a070 100644
--- a/2021/includes/sidebar.html
+++ b/2021/includes/sidebar.html
@@ -20,7 +20,7 @@
 
 	    <ul class="nav nav-pills nav-stacked">
 		<li class="fsf-donate">
-		    <a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&id=60"></span>
+		    <a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&id=60">
 			<span class="glyphicon glyphicon-heart"></span>
             Support the organization by making a donation
             </a>
diff --git a/2021/includes/workshops_js.html b/2021/includes/workshops_js.html
index 8c32ce73..7a140440 100644
--- a/2021/includes/workshops_js.html
+++ b/2021/includes/workshops_js.html
@@ -1,3 +1,3 @@
-<script type="text/javascript">
+<script>
  $(".workshops-link").addClass("active");
 </script>
diff --git a/2021/live/index.html b/2021/live/index.html
index bb863fe1..57717db6 100755
--- a/2021/live/index.html
+++ b/2021/live/index.html
@@ -63,9 +63,9 @@ ffplay https://live.fsf.org/stream-room-neptune.webm
 
 <!--#include virtual="/2021/includes/footer.html"-->
 <!--#include virtual="/2021/includes/common_js.html"-->
-<script type="text/javascript" src="/2021/assets/js/mithril.min.js"></script>
-<script type="text/javascript" src="/2021/assets/js/stream.js"></script>
-<script type="text/javascript">
+<script src="/2021/assets/js/mithril.min.js"></script>
+<script src="/2021/assets/js/stream.js"></script>
+<script>
 $("#p-sessions").addClass("active").text("Sessions");
 </script>
 <!--#include virtual="/2021/includes/livestream_js.html"-->
diff --git a/2021/program/index.html b/2021/program/index.html
index 99e39238..f6ccd5c1 100755
--- a/2021/program/index.html
+++ b/2021/program/index.html
@@ -34,7 +34,7 @@
 
 <!--#include virtual="/2021/includes/footer.html"-->
 <!--#include virtual="/2021/includes/common_js.html"-->
-<script type="text/javascript">
+<script>
 $("#p-sessions").addClass("active").text("Sessions");
 </script>
 <!--#include virtual="/2021/includes/program_js.html"-->
diff --git a/2021/speakers/index.html b/2021/speakers/index.html
index c8a1f2d5..ba7db2c1 100755
--- a/2021/speakers/index.html
+++ b/2021/speakers/index.html
@@ -11,7 +11,7 @@
 </div>
 	<!--#include virtual="/2021/includes/footer.html"-->
 	<!--#include virtual="/2021/includes/common_js.html"-->
-	<script type="text/javascript">
+	<script>
 	$("#speakers").addClass("active").text("Speakers");
 	</script>
 	<!--#include virtual="/2021/includes/close.html" -->
-- 
2.25.1