diff --git a/js/components/funders/fundersModal.js b/js/components/funders/fundersModal.js
index 50b9606c5..567132941 100644
--- a/js/components/funders/fundersModal.js
+++ b/js/components/funders/fundersModal.js
@@ -4,7 +4,7 @@
import React, { memo } from 'react';
import Modal from '../common/Modal';
-import { Grid, makeStyles } from '@material-ui/core';
+import { Grid, makeStyles, Typography } from '@material-ui/core';
const useStyles = makeStyles(theme => ({
image: {
@@ -16,7 +16,7 @@ const useStyles = makeStyles(theme => ({
cursor: 'pointer',
margin: 'auto',
display: 'block',
- maxWidth: '95%',
+ maxWidth: '72%',
maxHeight: '100%'
}
}));
@@ -29,53 +29,68 @@ export const FundersModal = memo(({ openModal, onModalClose }) => {
onModalClose();
}
+ const openLink = link => {
+ // window.location.href = link;
+ window.open(link, 'blank');
+ };
+
+ // funded by
const openXchem = () => {
- // window.location.href = 'https://www.diamond.ac.uk/Instruments/Mx/Fragment-Screening.html';
- window.open('https://www.diamond.ac.uk/Instruments/Mx/Fragment-Screening.html', 'blank');
+ openLink('https://www.diamond.ac.uk/Instruments/Mx/Fragment-Screening.html');
};
const openDls = () => {
- // window.location.href = 'https://www.diamond.ac.uk/Home.html';
- window.open('https://www.diamond.ac.uk/Home.html', 'blank');
+ openLink('https://www.diamond.ac.uk/Home.html');
};
const openSgc = () => {
- // window.location.href = 'https://www.sgc.ox.ac.uk/';
- window.open('https://www.sgc.ox.ac.uk/', 'blank');
+ openLink('https://www.sgc.ox.ac.uk/');
};
const openInext = () => {
- // window.location.href = 'http://www.inext-eu.org/';
- window.open('http://www.inext-eu.org/', 'blank');
+ openLink('http://www.inext-eu.org/');
};
const openJff = () => {
- // window.location.href = 'https://researchsupport.admin.ox.ac.uk/funding/internal/jff';
- window.open('https://researchsupport.admin.ox.ac.uk/funding/internal/jff', 'blank');
+ openLink('https://researchsupport.admin.ox.ac.uk/funding/internal/jff');
};
const openNf = () => {
- // window.location.href = 'https://www.newtonfund.ac.uk/';
- window.open('https://www.newtonfund.ac.uk/', 'blank');
+ openLink('https://www.newtonfund.ac.uk/');
};
const openMrc = () => {
- // window.location.href = 'https://mrc.ukri.org/';
- window.open('https://mrc.ukri.org/', 'blank');
+ openLink('https://mrc.ukri.org/');
};
const openWt = () => {
- // window.location.href = 'https://wellcome.ac.uk/';
- window.open('https://wellcome.ac.uk/', 'blank');
+ openLink('https://wellcome.ac.uk/');
};
const openUltradd = () => {
- // window.location.href = 'https://ultra-dd.org/';
- window.open('https://ultra-dd.org/', 'blank');
+ openLink('https://ultra-dd.org/');
};
const openImi = () => {
- // window.location.href = 'https://www.imi.europa.eu/';
- window.open('https://www.imi.europa.eu/', 'blank');
+ openLink('https://www.imi.europa.eu/');
};
const openHorizon = () => {
- // window.location.href = 'https://ec.europa.eu/programmes/horizon2020/';
- window.open('https://ec.europa.eu/programmes/horizon2020/', 'blank');
+ openLink('https://ec.europa.eu/programmes/horizon2020/');
+ };
+ const openJanssen = () => {
+ openLink('https://www.janssen.com/');
+ };
+ // contributors and collaborators
+ const openM2ms = () => {
+ openLink('https://www.en.m2ms.sk/');
+ };
+ const openInformatics = () => {
+ openLink('https://www.informaticsmatters.com/');
+ };
+ const openAcellera = () => {
+ openLink('https://www.acellera.com/');
+ };
+ const openOxrse = () => {
+ openLink('https://www.rse.ox.ac.uk/');
+ };
+ const openMolsoft = () => {
+ openLink('https://www.molsoft.com/');
};
return (
onModalClose()}>
+ Funded by:
openXchem()} />
@@ -99,10 +114,10 @@ export const FundersModal = memo(({ openModal, onModalClose }) => {
openJff()} />
-
openNf()} />
+
openUltradd()} />
-
openUltradd()} />
+
openNf()} />
openImi()} />
@@ -110,6 +125,34 @@ export const FundersModal = memo(({ openModal, onModalClose }) => {
openHorizon()} />
+
+
openJanssen()} />
+
+
+ Contributors and collaborators:
+
+
+
openM2ms()} />
+
+
+
openInformatics()}
+ />
+
+
+
openAcellera()} />
+
+
+
openOxrse()} />
+
+
+
openMolsoft()} />
+
+
+
openJanssen()} />
+
);
diff --git a/js/components/header/index.js b/js/components/header/index.js
index 8043a8b30..e87e99781 100644
--- a/js/components/header/index.js
+++ b/js/components/header/index.js
@@ -252,7 +252,7 @@ export default memo(
size="small"
onClick={() => setOpenFunders(true)}
>
- Supported by
+ Contributors
@@ -332,7 +332,7 @@ export default memo(
-
+
{authListItem}