From 120983b93705b2366930401fabd124787a200ea1 Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 8 Mar 2022 15:31:13 +0200 Subject: [PATCH] home: add eosc logo in search bar, add eosc intro text remove navbar disable recaptcha for eosc --- src/app/app.component.ts | 63 +++++++++++++++++++++++++++- src/app/home/home.component.html | 29 +++++++++---- src/app/home/home.component.ts | 8 ++-- src/app/openaireLibrary | 2 +- src/environments/environment.eosc.ts | 2 +- 5 files changed, 90 insertions(+), 14 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 9fc7671..3c059b0 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -18,7 +18,7 @@ import {Router} from "@angular/router"; selector: 'app-root', template: `
- @@ -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 { diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index dd9ce2a..a1cfffe 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -1,9 +1,10 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+

Welcome to EOSC research discovery portal!

+
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.
+
+
+ + +
@@ -95,9 +109,9 @@
- -
+ +

Our Canadian Funders

@@ -122,7 +136,8 @@
-
+

Our growing Community

diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index e4c74b4..30e5c4f 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -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(); } }, diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 66eed05..24848d2 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 66eed055970529c78d98ea3833070d5f45acd139 +Subproject commit 24848d2bee6a99afe8db2b894fc654e68a1e0c6c diff --git a/src/environments/environment.eosc.ts b/src/environments/environment.eosc.ts index 28655ec..0d7f8c8 100644 --- a/src/environments/environment.eosc.ts +++ b/src/environments/environment.eosc.ts @@ -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" };