scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 01:25:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #2812 from benjiwheeler/fix-conferences-2019-page

Browse source 
corrected mail list form; links use _blank; redirect conference url; logo links to main site
This commit is contained in:
Benjamin Wheeler 2019-02-28 11:06:54 -05:00 committed by GitHub
commit 962184f2d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/navigation/conference/2019/navigation.jsx
View file

@ -12,13 +12,20 @@ const Navigation = () => (
<li className="li-left mod-logo mod-2019"> <li className="li-left mod-logo mod-2019">
<a <a
className="logo-a" className="logo-a"
href="/conference" href="https://scratch.mit.edu"
> >
<img <img
alt="Scratch Logo" alt="Scratch Logo"
className="logo-a-image" className="logo-a-image"
src="/images/logo_sm.png" 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"> <p className="logo-a-title">
<FormattedMessage id="general.conferences" /> <FormattedMessage id="general.conferences" />
</p> </p>

6
src/routes.json
View file

@ -24,9 +24,7 @@
"name": "conference-index", "name": "conference-index",
"pattern": "^/conference/?(\\?.*)?$", "pattern": "^/conference/?(\\?.*)?$",
"routeAlias": "/conference(?!/201[4-9])", "routeAlias": "/conference(?!/201[4-9])",
"view": "conference/2019/index/index", "redirect": "/conference/2019"
"title": "Scratch Conference",
"viewportWidth": "device-width"
}, },
{ {
"name": "conference-index-2017", "name": "conference-index-2017",
@ -77,7 +75,7 @@
"pattern": "^/conference/2019/?$", "pattern": "^/conference/2019/?$",
"routeAlias": "/conference(?!/201[4-9])", "routeAlias": "/conference(?!/201[4-9])",
"view": "conference/2019/index/index", "view": "conference/2019/index/index",
"title": "Scratch Conference", "title": "Scratch Conferences",
"viewportWidth": "device-width" "viewportWidth": "device-width"
}, },
{ {

10
src/views/conference/2019/index/index.jsx
View file

@ -135,6 +135,8 @@ const ConferenceSplash = () => (
<a <a
className="button mod-2019-conf mod-2019-conf-website-button" className="button mod-2019-conf mod-2019-conf-website-button"
href="http://www.scratchalsur.org" href="http://www.scratchalsur.org"
rel="noopener noreferrer"
target="_blank"
> >
<FormattedMessage id="conference-2019.website" /> <FormattedMessage id="conference-2019.website" />
</a> </a>
@ -230,6 +232,8 @@ const ConferenceSplash = () => (
<a <a
className="button mod-2019-conf mod-2019-conf-website-button" className="button mod-2019-conf mod-2019-conf-website-button"
href="https://www.scratchafrica.com" href="https://www.scratchafrica.com"
rel="noopener noreferrer"
target="_blank"
> >
<FormattedMessage id="conference-2019.website" /> <FormattedMessage id="conference-2019.website" />
</a> </a>
@ -324,6 +328,8 @@ const ConferenceSplash = () => (
<a <a
className="button mod-2019-conf mod-2019-conf-website-button" className="button mod-2019-conf mod-2019-conf-website-button"
href="https://www.raspberrypi.org/blog/announcing-scratch-conference-europe-2019/" href="https://www.raspberrypi.org/blog/announcing-scratch-conference-europe-2019/"
rel="noopener noreferrer"
target="_blank"
> >
<FormattedMessage id="conference-2019.website" /> <FormattedMessage id="conference-2019.website" />
</a> </a>
@ -340,7 +346,9 @@ const ConferenceSplash = () => (
</h3> </h3>
<a <a
className="button mod-2019-conf mod-2019-conf-maillist-button" className="button mod-2019-conf mod-2019-conf-maillist-button"
href="https://docs.google.com/document/d/1M_LJqOjAxxYFm3j-D8WbvFtWhZJgPCbZ5aNGSA2KZyc/edit?ts=5c65f2c4#" href="https://us9.list-manage.com/subscribe?u=96e741c12c99f46f1f3e95e09&id=149bd1a4c2"
rel="noopener noreferrer"
target="_blank"
> >
<FormattedMessage id="conference-2019.joinMailingListButtonText" /> <FormattedMessage id="conference-2019.joinMailingListButtonText" />
</a> </a>