From 0a46aea1e7e20b9e23c49783a33c37af9f921624 Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Mon, 30 May 2022 17:56:47 +0300 Subject: [PATCH] fs-modal changes --- deposit/depositFirstPage.component.ts | 117 +++++++++--------- .../searchDataprovidersToDeposit.component.ts | 9 +- .../full-screen-modal.component.ts | 23 ++-- 3 files changed, 77 insertions(+), 72 deletions(-) diff --git a/deposit/depositFirstPage.component.ts b/deposit/depositFirstPage.component.ts index 24bfcadb..0fbc1b9a 100644 --- a/deposit/depositFirstPage.component.ts +++ b/deposit/depositFirstPage.component.ts @@ -30,7 +30,7 @@ import {FullScreenModalComponent} from '../utils/modal/full-screen-modal/full-sc Find the appropriate repository to deposit your research.
- Get Started + Get Started
@@ -99,62 +99,63 @@ import {FullScreenModalComponent} from '../utils/modal/full-screen-modal/full-sc - -
-
- Find the appropriate repository. -
-
-
-
-
- OpenAIRE logo -
- Search and browse for OpenAIRE compliant repositories registered in OpenDOAR and re3data. -
-
- - - -
-
-
-
-
- Zenodo logo -
- Deposit your research in
Zenodo repository -
-
- - - - - - +
+
+ +
+
+ Find the appropriate repository. +
+
+
+
+
+ OpenAIRE logo +
+ Search and browse for OpenAIRE compliant repositories registered in OpenDOAR and re3data.
+ + +
- -
+
+
+
+ Zenodo logo +
+ Deposit your research in
Zenodo repository +
+
+ + + + + + +
+
+
+
+ `, }) @@ -255,7 +256,11 @@ export class DepositFirstPageComponent { this._meta.updateTag({content:url},"property='og:url'"); } - // public openFsModal() { - // this.fsModal.open(); - // } + public openFsModal() { + this.fsModal.open(); + } + + public closeFsModal() { + this.fsModal.close(); + } } diff --git a/deposit/searchDataprovidersToDeposit.component.ts b/deposit/searchDataprovidersToDeposit.component.ts index 75fbea3d..e462bd87 100644 --- a/deposit/searchDataprovidersToDeposit.component.ts +++ b/deposit/searchDataprovidersToDeposit.component.ts @@ -30,7 +30,7 @@ import {properties} from "../../../environments/environment";
- + Zenodo Repository @@ -98,6 +98,13 @@ export class SearchDataprovidersToDepositComponent { this.parameters = Object.assign({}, params); this.keyword = params["fv0"]?params["fv0"]:''; }); + + if (!this.zenodoInformation) { + this.zenodoInformation = new ZenodoInformationClass(); + } + if (!this.zenodoInformation.shareInZenodoUrl) { + this.zenodoInformation.url = this.properties.zenodo; + } // this.searchPage.refineFields = this.refineFields; // this.searchPage.fieldIdsMap = this.fieldIdsMap; // this.searchPage.keywordFields = this.keywordFields; diff --git a/utils/modal/full-screen-modal/full-screen-modal.component.ts b/utils/modal/full-screen-modal/full-screen-modal.component.ts index 8be1b5ac..50bdd153 100644 --- a/utils/modal/full-screen-modal/full-screen-modal.component.ts +++ b/utils/modal/full-screen-modal/full-screen-modal.component.ts @@ -1,13 +1,14 @@ -import {Component, ElementRef, EventEmitter, Input, OnInit, Output} from "@angular/core"; +import {Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild} from "@angular/core"; import {fromEvent, Subscription} from 'rxjs'; import {delay} from "rxjs/operators"; +declare var UIkit; @Component({ selector: 'fs-modal', template: ` -