From 2a4e076339157502517cd67fca7d497a152605d1 Mon Sep 17 00:00:00 2001
From: Ben Wheeler <wheeler.benjamin@gmail.com>
Date: Thu, 28 Feb 2019 10:44:30 -0500
Subject: [PATCH 1/2] corrected mail list form; links use _blank; redirect
 conference url; logo links to main site

---
 .../navigation/conference/2019/navigation.jsx          |  9 ++++++++-
 src/routes.json                                        |  6 ++----
 src/views/conference/2019/index/index.jsx              | 10 +++++++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/components/navigation/conference/2019/navigation.jsx b/src/components/navigation/conference/2019/navigation.jsx
index 6ad073f81..07480c94f 100644
--- a/src/components/navigation/conference/2019/navigation.jsx
+++ b/src/components/navigation/conference/2019/navigation.jsx
@@ -12,13 +12,20 @@ const Navigation = () => (
             <li className="li-left mod-logo mod-2019">
                 <a
                     className="logo-a"
-                    href="/conference"
+                    href="https://scratch.mit.edu"
                 >
                     <img
                         alt="Scratch Logo"
                         className="logo-a-image"
                         src="/images/logo_sm.png"
                     />
+                </a>
+            </li>
+            <li className="li-left mod-logo mod-2019">
+                <a
+                    className="logo-a"
+                    href="/conference/2019"
+                >
                     <p className="logo-a-title">
                         <FormattedMessage id="general.conferences" />
                     </p>
diff --git a/src/routes.json b/src/routes.json
index 24ed6c264..d9dc446eb 100644
--- a/src/routes.json
+++ b/src/routes.json
@@ -24,9 +24,7 @@
         "name": "conference-index",
         "pattern": "^/conference/?(\\?.*)?$",
         "routeAlias": "/conference(?!/201[4-9])",
-        "view": "conference/2019/index/index",
-        "title": "Scratch Conference",
-        "viewportWidth": "device-width"
+        "redirect": "/conference/2019"
     },
     {
         "name": "conference-index-2017",
@@ -77,7 +75,7 @@
         "pattern": "^/conference/2019/?$",
         "routeAlias": "/conference(?!/201[4-9])",
         "view": "conference/2019/index/index",
-        "title": "Scratch Conference",
+        "title": "Scratch Conferences",
         "viewportWidth": "device-width"
     },
     {
diff --git a/src/views/conference/2019/index/index.jsx b/src/views/conference/2019/index/index.jsx
index 199f578e1..63300cbb6 100644
--- a/src/views/conference/2019/index/index.jsx
+++ b/src/views/conference/2019/index/index.jsx
@@ -135,6 +135,8 @@ const ConferenceSplash = () => (
                 <a
                     className="button mod-2019-conf mod-2019-conf-website-button"
                     href="http://www.scratchalsur.org"
+                    rel="noopener noreferrer"
+                    target="_blank"
                 >
                     <FormattedMessage id="conference-2019.website" />
                 </a>
@@ -230,6 +232,8 @@ const ConferenceSplash = () => (
                 <a
                     className="button mod-2019-conf mod-2019-conf-website-button"
                     href="https://www.scratchafrica.com"
+                    rel="noopener noreferrer"
+                    target="_blank"
                 >
                     <FormattedMessage id="conference-2019.website" />
                 </a>
@@ -324,6 +328,8 @@ const ConferenceSplash = () => (
                 <a
                     className="button mod-2019-conf mod-2019-conf-website-button"
                     href="https://www.raspberrypi.org/blog/announcing-scratch-conference-europe-2019/"
+                    rel="noopener noreferrer"
+                    target="_blank"
                 >
                     <FormattedMessage id="conference-2019.website" />
                 </a>
@@ -340,7 +346,9 @@ const ConferenceSplash = () => (
             </h3>
             <a
                 className="button mod-2019-conf mod-2019-conf-maillist-button"
-                href="https://docs.google.com/document/d/1M_LJqOjAxxYFm3j-D8WbvFtWhZJgPCbZ5aNGSA2KZyc/edit?ts=5c65f2c4#"
+                href="http://eepurl.com/cws7_f"
+                rel="noopener noreferrer"
+                target="_blank"
             >
                 <FormattedMessage id="conference-2019.joinMailingListButtonText" />
             </a>

From e6f1a701f19032b8cf79dac942d25b335407eea4 Mon Sep 17 00:00:00 2001
From: Ben Wheeler <wheeler.benjamin@gmail.com>
Date: Thu, 28 Feb 2019 10:57:44 -0500
Subject: [PATCH 2/2] use long version of mailing list url

---
 src/views/conference/2019/index/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/conference/2019/index/index.jsx b/src/views/conference/2019/index/index.jsx
index 63300cbb6..999c5a02e 100644
--- a/src/views/conference/2019/index/index.jsx
+++ b/src/views/conference/2019/index/index.jsx
@@ -346,7 +346,7 @@ const ConferenceSplash = () => (
             </h3>
             <a
                 className="button mod-2019-conf mod-2019-conf-maillist-button"
-                href="http://eepurl.com/cws7_f"
+                href="https://us9.list-manage.com/subscribe?u=96e741c12c99f46f1f3e95e09&id=149bd1a4c2"
                 rel="noopener noreferrer"
                 target="_blank"
             >