From 9ca57b8f4d97755ebdd3f0fa6770e6c6389c09a8 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 12 Jan 2024 14:02:37 +0200 Subject: [PATCH] [develop | DONE | CHANGED]: explore-assets/funders/logos: Renamed all funder logos by using only their shortnames | funders.component.ts: For static logos, split funder id and get only their shortname, to get the static logo - Special characters where causing problems in pulling the project in Windows environment. --- explore/src/app/funders/funders.component.ts | 4 +++- ...lian Research Council (ARC)||ARC.png => ARC.png} | Bin ...cience Across Parkinson's||ASAP.png => ASAP.png} | Bin ...itutes of Health Research||CIHR.png => CIHR.png} | Bin ...European Environment Agency||EEA.png => EEA.png} | Bin ...stitut National du Cancer||INCa.png => INCa.png} | Bin ...esearch Council (NHMRC)||NHMRC.png => NHMRC.png} | Bin ...tional Institutes of Health||NIH.png => NIH.png} | Bin ...earch Council of Canada||NSERC.png => NSERC.png} | Bin ...National Science Foundation||NSF.png => NSF.png} | Bin ...nities Research Council||SSHRC.png => SSHRC.png} | Bin ...ra Expeditions Foundation||TARA.png => TARA.png} | Bin ...K Research and Innovation||UKRI.png => UKRI.png} | Bin ..._________::WT||Wellcome Trust||WT.png => WT.png} | Bin 14 files changed, 3 insertions(+), 1 deletion(-) rename explore/src/assets/explore-assets/funders/logos/{arc_________::ARC||Australian Research Council (ARC)||ARC.png => ARC.png} (100%) rename explore/src/assets/explore-assets/funders/logos/{asap________::ASAP||Aligning Science Across Parkinson's||ASAP.png => ASAP.png} (100%) rename explore/src/assets/explore-assets/funders/logos/{cihr________::CIHR||Canadian Institutes of Health Research||CIHR.png => CIHR.png} (100%) rename explore/src/assets/explore-assets/funders/logos/{euenvagency_::EEA||European Environment Agency||EEA.png => EEA.png} (100%) rename explore/src/assets/explore-assets/funders/logos/{inca________::INCA||Institut National du Cancer||INCa.png => INCa.png} (100%) rename explore/src/assets/explore-assets/funders/logos/{nhmrc_______::NHMRC||National Health and Medical Research Council (NHMRC)||NHMRC.png => NHMRC.png} (100%) rename explore/src/assets/explore-assets/funders/logos/{nih_________::NIH||National Institutes of Health||NIH.png => NIH.png} (100%) rename explore/src/assets/explore-assets/funders/logos/{nserc_______::NSERC||Natural Sciences and Engineering Research Council of Canada||NSERC.png => NSERC.png} (100%) rename explore/src/assets/explore-assets/funders/logos/{nsf_________::NSF||National Science Foundation||NSF.png => NSF.png} (100%) rename explore/src/assets/explore-assets/funders/logos/{sshrc_______::SSHRC||Social Sciences and Humanities Research Council||SSHRC.png => SSHRC.png} (100%) rename explore/src/assets/explore-assets/funders/logos/{taraexp_____::tara||Tara Expeditions Foundation||TARA.png => TARA.png} (100%) rename explore/src/assets/explore-assets/funders/logos/{ukri________::UKRI||UK Research and Innovation||UKRI.png => UKRI.png} (100%) rename explore/src/assets/explore-assets/funders/logos/{wt__________::WT||Wellcome Trust||WT.png => WT.png} (100%) diff --git a/explore/src/app/funders/funders.component.ts b/explore/src/app/funders/funders.component.ts index 0a08b32e..800b8ced 100644 --- a/explore/src/app/funders/funders.component.ts +++ b/explore/src/app/funders/funders.component.ts @@ -220,7 +220,9 @@ export class FundersComponent implements OnInit { value.openAccessPercentage = Math.round((value.openAccessResearchProducts / value.researchProducts) * 100); } if(!value.logoUrl && this.staticLogos.has(value.id)) { - value.logoUrl = "assets/explore-assets/funders/logos/"+value.id+".png"; + let split = value.id.split("||"); + let shortname = (split && split.length==3) ? value.id.split("||")[2] : value.id; + value.logoUrl = "assets/explore-assets/funders/logos/"+shortname+".png"; } }); // convert funders map into an array diff --git a/explore/src/assets/explore-assets/funders/logos/arc_________::ARC||Australian Research Council (ARC)||ARC.png b/explore/src/assets/explore-assets/funders/logos/ARC.png similarity index 100% rename from explore/src/assets/explore-assets/funders/logos/arc_________::ARC||Australian Research Council (ARC)||ARC.png rename to explore/src/assets/explore-assets/funders/logos/ARC.png diff --git a/explore/src/assets/explore-assets/funders/logos/asap________::ASAP||Aligning Science Across Parkinson's||ASAP.png b/explore/src/assets/explore-assets/funders/logos/ASAP.png similarity index 100% rename from explore/src/assets/explore-assets/funders/logos/asap________::ASAP||Aligning Science Across Parkinson's||ASAP.png rename to explore/src/assets/explore-assets/funders/logos/ASAP.png diff --git a/explore/src/assets/explore-assets/funders/logos/cihr________::CIHR||Canadian Institutes of Health Research||CIHR.png b/explore/src/assets/explore-assets/funders/logos/CIHR.png similarity index 100% rename from explore/src/assets/explore-assets/funders/logos/cihr________::CIHR||Canadian Institutes of Health Research||CIHR.png rename to explore/src/assets/explore-assets/funders/logos/CIHR.png diff --git a/explore/src/assets/explore-assets/funders/logos/euenvagency_::EEA||European Environment Agency||EEA.png b/explore/src/assets/explore-assets/funders/logos/EEA.png similarity index 100% rename from explore/src/assets/explore-assets/funders/logos/euenvagency_::EEA||European Environment Agency||EEA.png rename to explore/src/assets/explore-assets/funders/logos/EEA.png diff --git a/explore/src/assets/explore-assets/funders/logos/inca________::INCA||Institut National du Cancer||INCa.png b/explore/src/assets/explore-assets/funders/logos/INCa.png similarity index 100% rename from explore/src/assets/explore-assets/funders/logos/inca________::INCA||Institut National du Cancer||INCa.png rename to explore/src/assets/explore-assets/funders/logos/INCa.png diff --git a/explore/src/assets/explore-assets/funders/logos/nhmrc_______::NHMRC||National Health and Medical Research Council (NHMRC)||NHMRC.png b/explore/src/assets/explore-assets/funders/logos/NHMRC.png similarity index 100% rename from explore/src/assets/explore-assets/funders/logos/nhmrc_______::NHMRC||National Health and Medical Research Council (NHMRC)||NHMRC.png rename to explore/src/assets/explore-assets/funders/logos/NHMRC.png diff --git a/explore/src/assets/explore-assets/funders/logos/nih_________::NIH||National Institutes of Health||NIH.png b/explore/src/assets/explore-assets/funders/logos/NIH.png similarity index 100% rename from explore/src/assets/explore-assets/funders/logos/nih_________::NIH||National Institutes of Health||NIH.png rename to explore/src/assets/explore-assets/funders/logos/NIH.png diff --git a/explore/src/assets/explore-assets/funders/logos/nserc_______::NSERC||Natural Sciences and Engineering Research Council of Canada||NSERC.png b/explore/src/assets/explore-assets/funders/logos/NSERC.png similarity index 100% rename from explore/src/assets/explore-assets/funders/logos/nserc_______::NSERC||Natural Sciences and Engineering Research Council of Canada||NSERC.png rename to explore/src/assets/explore-assets/funders/logos/NSERC.png diff --git a/explore/src/assets/explore-assets/funders/logos/nsf_________::NSF||National Science Foundation||NSF.png b/explore/src/assets/explore-assets/funders/logos/NSF.png similarity index 100% rename from explore/src/assets/explore-assets/funders/logos/nsf_________::NSF||National Science Foundation||NSF.png rename to explore/src/assets/explore-assets/funders/logos/NSF.png diff --git a/explore/src/assets/explore-assets/funders/logos/sshrc_______::SSHRC||Social Sciences and Humanities Research Council||SSHRC.png b/explore/src/assets/explore-assets/funders/logos/SSHRC.png similarity index 100% rename from explore/src/assets/explore-assets/funders/logos/sshrc_______::SSHRC||Social Sciences and Humanities Research Council||SSHRC.png rename to explore/src/assets/explore-assets/funders/logos/SSHRC.png diff --git a/explore/src/assets/explore-assets/funders/logos/taraexp_____::tara||Tara Expeditions Foundation||TARA.png b/explore/src/assets/explore-assets/funders/logos/TARA.png similarity index 100% rename from explore/src/assets/explore-assets/funders/logos/taraexp_____::tara||Tara Expeditions Foundation||TARA.png rename to explore/src/assets/explore-assets/funders/logos/TARA.png diff --git a/explore/src/assets/explore-assets/funders/logos/ukri________::UKRI||UK Research and Innovation||UKRI.png b/explore/src/assets/explore-assets/funders/logos/UKRI.png similarity index 100% rename from explore/src/assets/explore-assets/funders/logos/ukri________::UKRI||UK Research and Innovation||UKRI.png rename to explore/src/assets/explore-assets/funders/logos/UKRI.png diff --git a/explore/src/assets/explore-assets/funders/logos/wt__________::WT||Wellcome Trust||WT.png b/explore/src/assets/explore-assets/funders/logos/WT.png similarity index 100% rename from explore/src/assets/explore-assets/funders/logos/wt__________::WT||Wellcome Trust||WT.png rename to explore/src/assets/explore-assets/funders/logos/WT.png