Merge branch 'develop' of code-repo.d4science.org:MaDgIK/openaire-library into develop

This commit is contained in:
Konstantinos Triantafyllou 2024-02-21 14:32:21 +02:00
commit fbf7e9f527
5 changed files with 9 additions and 8 deletions

View File

@ -22,7 +22,7 @@ import {RouterHelper} from "../../utils/routerHelper.class";
</ng-container> </ng-container>
<ng-container *ngIf="!inModal"> <ng-container *ngIf="!inModal">
<div *ngIf="properties.environment != 'production' && availableOn[0].fulltext" class="uk-flex uk-flex-middle" <div *ngIf="availableOn[0].fulltext" class="uk-flex uk-flex-middle"
[ngClass]="isMobile ? 'uk-width-1-1' : 'uk-text-bolder'"> [ngClass]="isMobile ? 'uk-width-1-1' : 'uk-text-bolder'">
<a [href]="availableOn[0].fulltext" target="_blank" <a [href]="availableOn[0].fulltext" target="_blank"
class="uk-flex uk-flex-middle uk-button-link" class="uk-flex uk-flex-middle uk-button-link"
@ -108,7 +108,7 @@ import {RouterHelper} from "../../utils/routerHelper.class";
</a> </a>
<ng-template #elseBlock> {{instance.license}}</ng-template> <ng-template #elseBlock> {{instance.license}}</ng-template>
</div> </div>
<div *ngIf="properties.environment != 'production' && instance.fulltext" class="uk-text-meta uk-text-truncate" uk-tooltip [title]="instance.fulltext"> <div *ngIf="instance.fulltext" class="uk-text-meta uk-text-truncate" uk-tooltip [title]="instance.fulltext">
Full-Text: Full-Text:
<a *ngIf="isUrl(instance.fulltext); else elseBlock" <a *ngIf="isUrl(instance.fulltext); else elseBlock"
[href]="instance.fulltext" target="_blank" class="custom-external uk-link-text"> [href]="instance.fulltext" target="_blank" class="custom-external uk-link-text">

View File

@ -1,5 +1,5 @@
<ng-template #grant> <ng-template #grant>
<div class="uk-margin-small-top"> <div>
<img style="max-width: 42px;" [src]="assetsPath + 'common/commission.jpg'" alt="flag black white low" width="50px" loading="lazy"> <img style="max-width: 42px;" [src]="assetsPath + 'common/commission.jpg'" alt="flag black white low" width="50px" loading="lazy">
</div> </div>
<div class="uk-margin-left"> <div class="uk-margin-left">
@ -64,7 +64,7 @@
height="50px" class="el-image" alt="OpenAIRE" loading="lazy"> height="50px" class="el-image" alt="OpenAIRE" loading="lazy">
</div> </div>
<div *ngIf="showCommision" class="uk-width-expand"> <div *ngIf="showCommision" class="uk-width-expand">
<div class="uk-flex uk-flex-top uk-flex-center"> <div class="uk-flex uk-flex-middle uk-flex-center uk-margin-small-top">
<ng-container *ngTemplateOutlet="grant"></ng-container> <ng-container *ngTemplateOutlet="grant"></ng-container>
</div> </div>
</div> </div>
@ -208,7 +208,7 @@
height="50px" class="el-image" alt="OpenAIRE" loading="lazy"> height="50px" class="el-image" alt="OpenAIRE" loading="lazy">
</div> </div>
<div *ngIf="showCommision" class="uk-width-expand"> <div *ngIf="showCommision" class="uk-width-expand">
<div class="uk-flex uk-flex-top uk-flex-center"> <div class="uk-flex uk-flex-middle uk-flex-center uk-margin-small-top">
<ng-container *ngTemplateOutlet="grant"></ng-container> <ng-container *ngTemplateOutlet="grant"></ng-container>
</div> </div>
</div> </div>

View File

@ -1,12 +1,12 @@
<div class="quick-contact"> <div class="quick-contact">
<button class="uk-button uk-box-shadow-default uk-box-shadow-default-hover uk-button-secondary uk-flex uk-flex-middle"> <button class="uk-button uk-box-shadow-default uk-box-shadow-default-hover uk-button-secondary uk-flex uk-flex-middle" (click)="quickContactClicked=true">
<icon *ngIf="!showDrop" name="mail" [flex]="true"></icon> <icon *ngIf="!showDrop" name="mail" [flex]="true"></icon>
<icon *ngIf="showDrop" name="close" [flex]="true"></icon> <icon *ngIf="showDrop" name="close" [flex]="true"></icon>
<span class="uk-margin-small-left">{{contact}}</span> <span class="uk-margin-small-left">{{contact}}</span>
</button> </button>
<div #drop id="quick-contact" class="uk-drop" <div #drop id="quick-contact" class="uk-drop"
uk-drop="mode: click; pos: top-right; animation: uk-animation-fade; offset: 20"> uk-drop="mode: click; pos: top-right; animation: uk-animation-fade; offset: 20">
<div class="uk-card uk-card-default uk-box-shadow-default uk-flex uk-flex-column uk-height-1-1"> <div *ngIf="quickContactClicked" class="uk-card uk-card-default uk-box-shadow-default uk-flex uk-flex-column uk-height-1-1">
<div class="uk-card-header uk-padding-small uk-text-center" [class.uk-light]="backgroundHeader.dark" [ngClass]="backgroundHeader.class"> <div class="uk-card-header uk-padding-small uk-text-center" [class.uk-light]="backgroundHeader.dark" [ngClass]="backgroundHeader.class">
<div class="uk-text-small"> <div class="uk-text-small">
Send a message Send a message

View File

@ -11,6 +11,7 @@ declare var UIkit;
styleUrls: ['quick-contact.component.less'] styleUrls: ['quick-contact.component.less']
}) })
export class QuickContactComponent implements OnInit, OnDestroy { export class QuickContactComponent implements OnInit, OnDestroy {
public quickContactClicked: boolean = false;
public showDrop: boolean = false; public showDrop: boolean = false;
@Input() @Input()
public contactForm: FormGroup; public contactForm: FormGroup;

View File

@ -77,7 +77,7 @@ export let common: EnvProperties = {
b2noteAPIURL: 'https://b2note.eudat.eu/', b2noteAPIURL: 'https://b2note.eudat.eu/',
myOrcidLinksPage: "/my-orcid-links", myOrcidLinksPage: "/my-orcid-links",
footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452", footerGrantText: "OpenAIRE has received funding from <a href='https://www.openaire.eu/projects' target='_blank'>a series of EU funded projects</a>.",
//connect //connect
enermapsURL: "https://lab.idiap.ch/enermaps", enermapsURL: "https://lab.idiap.ch/enermaps",