MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Library | new-theme]: 1. showSubjects.component.ts: Ignore specialSubjects and do not add links. | 2. resultLanding.component.html & resultLanding.component.ts: Show button "Check compatible EOSC services" not only in development or beta environments.

This commit is contained in:
Konstantina Galouni 2022-05-16 18:42:23 +03:00
parent 3d945b1e05
commit 2fac23fd10
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
landingPages/landing-utils/showSubjects.component.ts
View File

@ -24,12 +24,13 @@ import {properties} from "../../../../environments/environment";
</span>
<span *ngFor="let subject of classifiedSubjects.get(key)" class="uk-width-auto uk-flex">
<span class="uk-border-rounded uk-label uk-label-small uk-label-primary uk-text-truncate">
<span *ngIf="specialSubjects.indexOf(subject) == -1 ">{{subject}}</span>
<a class="uk-link-reset" *ngIf="specialSubjects.indexOf(subject) != -1"
[routerLink]=" properties.searchLinkToAdvancedResults"
[queryParams]="getSubjectParameter(subject)">
{{subject}}
</a>
<span>{{subject}}</span>
<!-- <span *ngIf="specialSubjects.indexOf(subject) == -1 ">{{subject}}</span>-->
<!-- <a class="uk-link-reset" *ngIf="specialSubjects.indexOf(subject) != -1"-->
<!-- [routerLink]=" properties.searchLinkToAdvancedResults"-->
<!-- [queryParams]="getSubjectParameter(subject)">-->
<!-- {{subject}}-->
<!-- </a>-->
</span>
</span>
</div>

4
landingPages/result/resultLanding.component.html
View File

@ -370,7 +370,7 @@
<!-- EOSC Services-->
<!-- 1 link -->
<div *ngIf="resultLandingInfo.eoscSubjects?.length == 1 && (properties.adminToolsPortalType == 'explore' || properties.adminToolsPortalType == 'eosc')
&& (properties.environment == 'beta' || properties.environment == 'development') && (!viewAll || viewAll=='egiNotebook')">
&& (!viewAll || viewAll=='egiNotebook')">
<a class="uk-link-text uk-text-bold custom-external"
target="_blank" [href]="resultLandingInfo.eoscSubjects[0].link">
<img src="assets/common-assets/eosc-logo.png"
@ -380,7 +380,7 @@
</div>
<!-- more than 1 links -->
<div *ngIf="resultLandingInfo.eoscSubjects?.length > 1 && (properties.adminToolsPortalType == 'explore' || properties.adminToolsPortalType == 'eosc')
&& (properties.environment == 'beta' || properties.environment == 'development') && (!viewAll || viewAll=='egiNotebook')">
&& (!viewAll || viewAll=='egiNotebook')">
<a class="uk-link-text uk-text-bold">
<img src="assets/common-assets/eosc-logo.png"
loading="lazy" alt="eosc_logo" style="width:27px; height:27px">

3
landingPages/result/resultLanding.component.ts
View File

@ -549,8 +549,7 @@ export class ResultLandingComponent {
public get hasRightSidebarInfo(): boolean {
return (this.resultLandingInfo.eoscSubjects && this.resultLandingInfo.eoscSubjects.length
&& (properties.adminToolsPortalType == 'explore' || properties.adminToolsPortalType == 'eosc')
&& (properties.environment == 'beta' || properties.environment == 'development'))
&& (properties.adminToolsPortalType == 'explore' || properties.adminToolsPortalType == 'eosc'))
||
(this.resultLandingInfo.sdg && this.resultLandingInfo.sdg.length > 0)
||