From d878562d3dc1e5ce3f368fb7077d2362acdb6ba5 Mon Sep 17 00:00:00 2001 From: Kristan Ntavidi Date: Thu, 24 Jun 2021 16:00:21 +0300 Subject: [PATCH] Ui fixes on landpage (static pages) --- .../dmp/editor/dataset-info/dataset-info.component.ts | 3 --- .../src/app/ui/dmp/editor/dmp-editor.component.ts | 2 -- .../src/app/ui/dmp/overview/dmp-overview.component.ts | 2 +- dmp-frontend/src/assets/splash/css/section.css | 3 ++- dmp-frontend/src/assets/splash/index.html | 10 +++++----- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.ts index 651d65560..c55006816 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.ts @@ -7,7 +7,6 @@ import { MultipleAutoCompleteConfiguration } from '@app/library/auto-complete/mu import { map, takeUntil } from 'rxjs/operators'; import { Observable } from 'rxjs'; import { ExternalSourcesService } from '@app/core/services/external-sources/external-sources.service'; -import { isNullOrUndefined } from 'util'; import { MatDialog } from '@angular/material'; import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile'; import { DatasetProfileCriteria } from '@app/core/query/dataset-profile/dataset-profile-criteria'; @@ -21,8 +20,6 @@ import { Router, Params, ActivatedRoute } from '@angular/router'; import { RequestItem } from '@app/core/query/request-item'; import { DatasetWizardService } from '@app/core/services/dataset-wizard/dataset-wizard.service'; import { DatasetDescriptionFormEditorModel } from '@app/ui/misc/dataset-description-form/dataset-description-form.model'; -import { DatasetWizardEditorModel } from '@app/ui/dataset/dataset-wizard/dataset-wizard-editor.model'; -import { DmpListingModel } from '@app/core/model/dmp/dmp-listing'; import { UiNotificationService, SnackBarNotificationLevel } from '@app/core/services/notification/ui-notification-service'; import { DatasetPreviewDialogComponent } from '../../dataset-preview/dataset-preview-dialog.component'; diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts index d36071b0d..c0b6676c7 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts @@ -26,7 +26,6 @@ import { GrantTabModel } from '@app/ui/dmp/editor/grant-tab/grant-tab-model'; import { ProjectFormModel } from '@app/ui/dmp/editor/grant-tab/project-form-model'; import { BreadcrumbItem } from '@app/ui/misc/breadcrumb/definition/breadcrumb-item'; import { IBreadCrumbComponent } from '@app/ui/misc/breadcrumb/definition/IBreadCrumbComponent'; -import { BaseComponent } from '@common/base/base.component'; import { FormService } from '@common/forms/form-service'; import { FormValidationErrorsDialogComponent } from '@common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component'; import { ValidationErrorModel } from '@common/forms/validation/error-model/validation-error-model'; @@ -47,7 +46,6 @@ import { DatasetService } from '@app/core/services/dataset/dataset.service'; import { DmpToDatasetDialogComponent } from '../dmp-to-dataset/dmp-to-dataset-dialog.component'; import { GrantEditorModel } from '@app/ui/grant/editor/grant-editor.model'; import { MatomoService } from '@app/core/services/matomo/matomo-service'; -import { HttpClient } from '@angular/common/http'; import { PopupNotificationDialogComponent } from '@app/library/notification/popup/popup-notification.component'; import { CheckDeactivateBaseComponent } from '@app/library/deactivate/deactivate.component'; diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts index 28fc75677..e0b8b7950 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts @@ -160,7 +160,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { setIsUserOwner() { if (this.dmp) { const principal: Principal = this.authentication.current(); - if (principal) this.isUserOwner = principal.id === this.dmp.users.find(x => x.role === Role.Owner).id; + if (principal) this.isUserOwner = !!this.dmp.users.find(x => (x.role === Role.Owner) && (principal.id === x.id)); } } diff --git a/dmp-frontend/src/assets/splash/css/section.css b/dmp-frontend/src/assets/splash/css/section.css index aa7fe5179..0bec5d83f 100644 --- a/dmp-frontend/src/assets/splash/css/section.css +++ b/dmp-frontend/src/assets/splash/css/section.css @@ -257,7 +257,7 @@ section.media-kit-logo { .eosc{ margin-top: 8.5em; - margin-bottom: 5em; + /* margin-bottom: 5em; */ } .eosc-row{ justify-content: space-around; @@ -271,6 +271,7 @@ section.media-kit-logo { display: flex; align-items: center; justify-content: center; + margin-bottom: 4em; } .eosc_logo{ height: 117px; diff --git a/dmp-frontend/src/assets/splash/index.html b/dmp-frontend/src/assets/splash/index.html index ffc5e2d6e..b776ccdb4 100644 --- a/dmp-frontend/src/assets/splash/index.html +++ b/dmp-frontend/src/assets/splash/index.html @@ -101,21 +101,21 @@
-
+
- +
-
+

Connect with OpenAIRE & EOSC

Link your plan directly to underlying OpenAIRE and EOSC services, - soures and semantics and trace the quality of your research. Use Argos + sources and semantics and trace the quality of your research. Use Argos templates that incorporate the fullest collections of repositories, datasets, metadata standards and other resources to choose from when completing your DMP's.

- +