#1465 changed some logos for bigger ones, added tooltip also for head…

…er logos, removed duplicate of openDiscourseLink

js/components/funders/constants.js

@@ -20,7 +20,7 @@ export const COMPANIES = {
  asap: {
  title: 'AI-driven Structure-enabled Antiviral Platform',
  link: 'https://asapdiscovery.org/',
- image: 'asapLogo.jpg'
+ image: 'asapLogo.png'
  },
  xchem: {
  title: 'XChem',
@@ -45,7 +45,7 @@ export const COMPANIES = {
  niaid: {
  title: 'National Institute of Allergy and Infectious Diseases',
  link: 'https://www.niaid.nih.gov/',
- image: 'niaidLogo.png'
+ image: 'niaidLogo.svg'
  },
  iEric: {
  title: 'Instruct-ERIC',
@@ -64,8 +64,8 @@ export const COMPANIES = {
  },
  inext: {
  title: 'iNEXT-Discovery',
- link: 'http://www.inext-eu.org/',
- image: 'inextLogo.png'
+ link: 'https://inext-discovery.eu/',
+ image: 'inextLogo2.png'
  },
  jff: {
  title: 'John Fell Fund',
@@ -85,7 +85,7 @@ export const COMPANIES = {
  wellcome: {
  title: 'Wellcome',
  link: 'https://wellcome.org',
- image: 'welcomeLogo.jpg'
+ image: 'welcomeLogo.png'
  },
  ultradd: {
  title: 'Unrestricted Leveraging of Targets for Research Advancement and Drug Discovery',
@@ -100,7 +100,7 @@ export const COMPANIES = {
  ukRIstfc: {
  title: 'Science and Technology Facilities Council',
  link: 'https://www.ukri.org/councils/stfc/',
- image: 'ukRIstfcLogo.jpg'
+ image: 'ukRIstfcLogo.png'
  },
  rosetrees: {
  title: 'Rosetrees',
@@ -155,7 +155,7 @@ export const COMPANIES = {
  informaticsmatters: {
  title: 'Informatics Matters',
  link: 'https://www.informaticsmatters.com/',
- image: 'informaticsLogo.png'
+ image: 'informaticsLogo.svg'
  },
  // company: {
  // link: 'https://www.acellera.com/',

js/components/header/index.js

@@ -65,7 +65,7 @@ import { activateSnapshotDialog } from '../snapshot/redux/dispatchActions';
 import { setAddButton, setProjectModalIsLoading } from '../projects/redux/actions';
 import { getVersions } from '../../utils/version';
 import { AddProjectDetail } from '../projects/addProjectDetail';
-import { ServicesStatus, ServicesStatusWrapper } from '../services';
+import { ServicesStatusWrapper } from '../services';
 import { COMPANIES, get_logo } from '../funders/constants';
 
 const useStyles = makeStyles(theme => ({
@@ -154,10 +154,6 @@ export default memo(
  window.open(link, '_blank');
  };
 
- const openDiscourseLink = url => {
- window.open(url, '_blank');
- };
-
  let authListItem;
 
  let username = null;
@@ -437,44 +433,54 @@ export default memo(
  <IssueReport />
  </Grid>
  <Grid item>
- <img
- src={get_logo(COMPANIES.xchem.image)}
- height="20"
- className={classes.clickableImage}
- onClick={() => openLink(COMPANIES.xchem.link)}
- />
+ <Tooltip title={COMPANIES.xchem.title}>
+ <img
+ src={get_logo(COMPANIES.xchem.image)}
+ height="20"
+ className={classes.clickableImage}
+ onClick={() => openLink(COMPANIES.xchem.link)}
+ />
+ </Tooltip>
  </Grid>
  <Grid item>
- <img
- src={get_logo(COMPANIES.diamond.image)}
- height="20"
- className={classes.clickableImage}
- onClick={() => openLink(COMPANIES.diamond.link)}
- />
+ <Tooltip title={COMPANIES.diamond.title}>
+ <img
+ src={get_logo(COMPANIES.diamond.image)}
+ height="20"
+ className={classes.clickableImage}
+ onClick={() => openLink(COMPANIES.diamond.link)}
+ />
+ </Tooltip>
  </Grid>
  <Grid item>
- <img
- src={get_logo(COMPANIES.asap.image)}
- height="20"
- className={classes.clickableImage}
- onClick={() => openLink(COMPANIES.asap.link)}
- />
+ <Tooltip title={COMPANIES.asap.title}>
+ <img
+ src={get_logo(COMPANIES.asap.image)}
+ height="20"
+ className={classes.clickableImage}
+ onClick={() => openLink(COMPANIES.asap.link)}
+ />
+ </Tooltip>
  </Grid>
  <Grid item>
- <img
- src={get_logo(COMPANIES.fragmentScreen.image)}
- height="20"
- className={classes.clickableImage}
- onClick={() => openLink(COMPANIES.fragmentScreen.link)}
- />
+ <Tooltip title={COMPANIES.fragmentScreen.title}>
+ <img
+ src={get_logo(COMPANIES.fragmentScreen.image)}
+ height="20"
+ className={classes.clickableImage}
+ onClick={() => openLink(COMPANIES.fragmentScreen.link)}
+ />
+ </Tooltip>
  </Grid>
  <Grid item>
- <img
- src={get_logo(COMPANIES.cmd.image)}
- height="20"
- className={classes.clickableImage}
- onClick={() => openLink(COMPANIES.cmd.link)}
- />
+ <Tooltip title={COMPANIES.cmd.title}>
+ <img
+ src={get_logo(COMPANIES.cmd.image)}
+ height="20"
+ className={classes.clickableImage}
+ onClick={() => openLink(COMPANIES.cmd.link)}
+ />
+ </Tooltip>
  </Grid>
  <Grid item>
  <Button