home: add eosc logo in search bar, add eosc intro text

remove navbar
disable recaptcha for eosc
This commit is contained in:
argirok 2022-03-08 15:31:13 +02:00
parent 21b67013ed
commit 120983b937
5 changed files with 90 additions and 14 deletions

View File

@ -18,7 +18,7 @@ import {Router} from "@angular/router";
selector: 'app-root',
template: `
<div *ngIf="agg">
<navbar *ngIf="properties && loginCheck && header " portal="aggregator" [properties]=properties [onlyTop]=false
<navbar *ngIf="properties && loginCheck && header && agg.menuId != 'eosc'" portal="aggregator" [properties]=properties [onlyTop]=false
[user]="user" [userMenuItems]="userMenuItems"
[communityId]="properties.adminToolsCommunity" [menuItems]=menuItems
[userMenu]="agg.enableLogin" [header]="header"></navbar>
@ -148,6 +148,63 @@ export class AppComponent {
css = css.concat('}');
let css2 = `
#searchImage{
background: url('https://marketplace.eosc-portal.eu/packs/media/images/eosc-logo-color-883f208671ef77b15b9cd067ecdc369b.png') no-repeat center left;
width: 250px;
height: 80px;
background-size: 250px 80px;
margin-left: 80px;
margin-bottom: 37px;
}
#searchForm advanced-search-form{
float:right;
}
#searchForm{
padding:0;
width:100%;
max-width:100%;
}
search-filter h6::after{
border-bottom: 1px solid gray;
}
search-filter h6{
text-transform: uppercase !important;
font-size: 12px;
}
search-filter .tm-child-list-divider > ul > li:nth-child(n+2), .uk-list-divider > li:nth-child(n+2){
border: none;
}
.filterHeader{
border-bottom:1px solid #ced4da;
}
.matSelection.mat-select {
padding: 4px;
border: 1px solid #ced4da;
}
.search-results .uk-card-default.uk-card-hover:hover{
box-shadow: none;
}
.search-results .uk-card-default {
border: 1px solid #ced4da;
box-shadow:none;
}
element {
}
.uk-pagination > .uk-active > *, .uk-pagination > .uk-active > :hover {
border-radius: 0px;
}
.uk-button-primary:not(.uk-icon-button), .portal-button:not(.uk-icon-button) {
color: #fff !important;
background-color: #0c2bd5 !important;
@ -224,7 +281,9 @@ background-color: white;
`;
css = css.concat(css2);
if(this.agg.menuId == 'eosc') {
css = css.concat(css2);
}
try {
if( this.document.getElementById('customStyle')){
try {

View File

@ -1,9 +1,10 @@
<div class="image-front-topbar">
<div class="uk-section mainPageSearchForm">
<div class="uk-container">
<div class="search_box_bg uk-flex uk-flex-center">
<div>
<form class="uk-margin">
<div class="">
<div class="search_box_bg ">
<div id="searchForm" class="uk-grid uk-flex uk-flex-center">
<div id="searchImage" class="uk-margin-small-top "></div>
<form class="uk-margin ">
<div class="uk-grid uk-margin-small-left">
<div class="uk-margin-small-top uk-padding-remove-left">
<entities-selection [simpleView]="true" currentEntity="all" [selectedEntity]="selectedEntity"
@ -65,6 +66,19 @@
</div>
</div>
</div>
</div>
<div *ngIf="aggregatorId == 'eosc'" class="uk-grid uk-child-width-1-2@m uk-child-width-1-1@s">
<div>
<div class="uk-margin-large-left">
<h1 class=" uk-text-bold">Welcome to EOSC research discovery portal!</h1>
<div class="uk-margin-large-top uk-text-large">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc a
ligula ante. Interdum et malesuada
fames ac ante ipsum primis in faucibus. Vivamus vitae sagittis metus, eget fringilla lectus. Sed sit amet nisi odio. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Ut sed diam sem. Phasellus fermentum vulputate mi, non mollis sem dictum ut. Ut quis vestibulum mauris. </div>
</div>
</div>
<img src="https://marketplace.eosc-portal.eu/packs/media/images/gfx_whole_illustation_desktop-fc94d4f7e15455d1785ef4793e1573fb.png">
</div>
<div class="uk-section graph-background" *ngIf="aggregator.graphSectionText && aggregator.graphSectionTitle">
<div class="uk-container">
@ -95,9 +109,9 @@
</div>
</div>
</div>
<!-- Funders Cards -->
<ng-container *ngIf="this.customFilter && this.customFilter.valueId == 'CA'">
<div *ngIf=" funders.length" class="uk-section uk-padding-remove-bottom" style="background: linear-gradient(180deg, #FAFAFA 50%, #FFFFFF 55%);">
<!-- Funders Cards -->
<div *ngIf=" funders.length" class="uk-section uk-padding-remove-bottom" style="background: linear-gradient(180deg, #FAFAFA 50%, #FFFFFF 55%);">
<h3 class="uk-text-center uk-margin-medium-bottom">Our Canadian <span class="uk-text-bold">Funders</span></h3>
<!-- TODO: individual component -->
<div class="uk-section uk-container uk-container-large">
@ -122,7 +136,8 @@
</div>
</div>
</ng-container>
<div class="uk-section uk-padding-remove-bottom">
<div class="uk-section uk-padding-remove-bottom " [class.uk-hidden]="!( this.customFilter &&
this.customFilter.valueId == 'CA')">
<h3 class="uk-text-center uk-margin-medium-bottom">Our growing <span class="uk-text-bold">Community</span></h3>
<numbers #numbersComponent [defaultInit]="false" backgroundClass="numbers-background"></numbers>
</div>

View File

@ -140,9 +140,11 @@ export class HomeComponent {
if(this.showOrp){
this.resultTypes.values.push({name: "Other research products" , id:"other",selected:true, number:0});
}
this.numbersComponent.init(false, false, this.showPublications, this.showDatasets,
this.showSoftware, this.showOrp, this.showProjects, this.showDataProviders, this.customFilter?
StringUtils.URIEncode(this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId ))):'');
if(this.numbersComponent) {
this.numbersComponent.init(false, false, this.showPublications, this.showDatasets,
this.showSoftware, this.showOrp, this.showProjects, this.showDataProviders, this.customFilter ?
StringUtils.URIEncode(this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId))) : '');
}
this.getFunders();
}
},

@ -1 +1 @@
Subproject commit 66eed055970529c78d98ea3833070d5f45acd139
Subproject commit 24848d2bee6a99afe8db2b894fc654e68a1e0c6c

View File

@ -115,7 +115,7 @@ export let properties: EnvProperties = {
depositLearnHowPage: "/participate/deposit/learn-how",
depositSearchPage: "/participate/deposit/search",
altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
reCaptchaSiteKey: null,
footerGrantText : "This OpenAIRE gateway is part of a project that has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452"
};