From 68559314f30d124e47a39c9a1abcf9291a184863 Mon Sep 17 00:00:00 2001 From: "CITE\\dtziotzios" Date: Thu, 29 Nov 2018 16:19:08 +0200 Subject: [PATCH] fixed popup style --- ...ory-referenced-model-helper.component.html | 41 +++++++++--------- ...set-referenced-model-helper.component.html | 34 +++++++-------- ...try-referenced-model-helper.component.html | 41 +++++++++--------- ...ces-referenced-model-helper.component.html | 42 +++++++++---------- .../dataset-wizard.component.ts | 13 +----- .../app/dmps/editor/dmp-editor.component.ts | 6 +-- .../add-researchers.component.html | 35 ++++++++-------- .../available-profiles.component.html | 22 +++++----- 8 files changed, 109 insertions(+), 125 deletions(-) diff --git a/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/datarepository/datarepository-referenced-model-helper.component.html b/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/datarepository/datarepository-referenced-model-helper.component.html index a1c322489..a2163361a 100644 --- a/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/datarepository/datarepository-referenced-model-helper.component.html +++ b/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/datarepository/datarepository-referenced-model-helper.component.html @@ -1,23 +1,22 @@
-

{{'DATASET-REFERENCED-MODELS.DATA-REPOSITORY.TITLE' | translate}}

-
- - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - - - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - - - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
-
- - -
-
+

{{'DATASET-REFERENCED-MODELS.DATA-REPOSITORY.TITLE' | translate}}

+
+ + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + + + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + + + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+
+
+
+
diff --git a/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/externalDataset/externaldataset-referenced-model-helper.component.html b/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/externalDataset/externaldataset-referenced-model-helper.component.html index 390e5a783..c134a53e2 100644 --- a/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/externalDataset/externaldataset-referenced-model-helper.component.html +++ b/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/externalDataset/externaldataset-referenced-model-helper.component.html @@ -1,20 +1,18 @@
-

{{'DATASET-REFERENCED-MODELS.EXTERNAL-DATASET.TITLE' | translate}}

-
- - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - - - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - - -
-
-
- - -
-
+

{{'DATASET-REFERENCED-MODELS.EXTERNAL-DATASET.TITLE' | translate}}

+
+ + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + + + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+
+
+
+
diff --git a/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/registry/registry-referenced-model-helper.component.html b/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/registry/registry-referenced-model-helper.component.html index d5ffae7cc..f9a916427 100644 --- a/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/registry/registry-referenced-model-helper.component.html +++ b/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/registry/registry-referenced-model-helper.component.html @@ -1,23 +1,22 @@
-

{{'DATASET-REFERENCED-MODELS.REGISTRY.TITLE' | translate}}

-
- - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - - - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - - - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
-
- - -
-
+

{{'DATASET-REFERENCED-MODELS.REGISTRY.TITLE' | translate}}

+
+ + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + + + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + + + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+
+
+
+
diff --git a/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/services/services-referenced-model-helper.component.html b/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/services/services-referenced-model-helper.component.html index 4043fb8d7..f9aaa27c4 100644 --- a/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/services/services-referenced-model-helper.component.html +++ b/dmp-frontend/src/app/datasets/dataset-referenced-models-helper/services/services-referenced-model-helper.component.html @@ -1,24 +1,22 @@
-

{{'DATASET-REFERENCED-MODELS.SERVICES.TITLE' | translate}}

-
- - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - - - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - - - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - - -
-
-
- - -
-
+

{{'DATASET-REFERENCED-MODELS.SERVICES.TITLE' | translate}}

+
+ + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + + + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + + + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+
+
+
+
diff --git a/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.ts index e5b39519e..adbe0e6f5 100644 --- a/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.ts +++ b/dmp-frontend/src/app/datasets/dataset-wizard/dataset-wizard.component.ts @@ -1,5 +1,5 @@ import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core'; -import { FormArray, FormBuilder, FormGroup } from '@angular/forms'; +import { FormArray, FormGroup } from '@angular/forms'; import { MatDialog, MatSnackBar, MatStepper } from '@angular/material'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; @@ -29,7 +29,6 @@ import { ServiceModel } from '../../models/services/ServiceModel'; import { TagModel } from '../../models/tags/TagModel'; import { DataManagementPlanService } from '../../services/data-management-plan/data-management-plan.service'; import { DatasetWizardService } from '../../services/dataset-wizard/dataset-wizard.service'; -import { DatasetService } from '../../services/dataset/dataset.service'; import { ExternalSourcesConfigurationService } from '../../services/external-sources/external-sources-configuration.service'; import { ExternalSourcesService } from '../../services/external-sources/external-sources.service'; import { AutoCompleteConfiguration } from '../../shared/components/auto-complete/AutoCompleteConfiguration'; @@ -90,8 +89,6 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, Aft constructor( private datasetWizardService: DatasetWizardService, - private formBuilder: FormBuilder, - private datasetService: DatasetService, private route: ActivatedRoute, public snackBar: MatSnackBar, public router: Router, @@ -433,8 +430,6 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, Aft addDataRepository() { const dialogRef = this.dialog.open(DataRepositoryReferencedModelHelperComponent, { - height: '255px', - width: '700px', data: { } @@ -450,8 +445,6 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, Aft addRegistry() { const dialogRef = this.dialog.open(RegistryReferencedModelHelperComponent, { - height: '255px', - width: '700px', data: { } @@ -467,8 +460,6 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, Aft addExternalDataset() { const dialogRef = this.dialog.open(ExternalDatasetReferencedModelHelperComponent, { - height: '255px', - width: '700px', data: { } @@ -484,8 +475,6 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, Aft addService() { const dialogRef = this.dialog.open(ServicesReferencedModelHelperComponent, { - height: '255px', - width: '700px', data: { } diff --git a/dmp-frontend/src/app/dmps/editor/dmp-editor.component.ts b/dmp-frontend/src/app/dmps/editor/dmp-editor.component.ts index f1a559a61..cc8bca3af 100644 --- a/dmp-frontend/src/app/dmps/editor/dmp-editor.component.ts +++ b/dmp-frontend/src/app/dmps/editor/dmp-editor.component.ts @@ -264,8 +264,6 @@ export class DataManagementPlanEditorComponent extends BaseComponent implements addResearcher(rowId: any, rowName: any) { const dialogRef = this.dialog.open(AddResearchersComponent, { - height: '255px', - width: '700px', data: { dmpId: rowId, dmpName: rowName @@ -276,8 +274,8 @@ export class DataManagementPlanEditorComponent extends BaseComponent implements availableProfiles() { const dialogRef = this.dialog.open(AvailableProfilesComponent, { - height: '355px', - width: '700px', + // height: '355px', + // width: '700px', data: { profiles: this.formGroup.get('profiles') } diff --git a/dmp-frontend/src/app/shared/components/add-researchers/add-researchers.component.html b/dmp-frontend/src/app/shared/components/add-researchers/add-researchers.component.html index 3e0b5ea56..e7490f31e 100644 --- a/dmp-frontend/src/app/shared/components/add-researchers/add-researchers.component.html +++ b/dmp-frontend/src/app/shared/components/add-researchers/add-researchers.component.html @@ -1,19 +1,20 @@
-

{{'ADDRESEARCHERS-EDITOR.TITLE' | translate}}

-
- - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - - - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
-
- - -
-
+

{{'ADDRESEARCHERS-EDITOR.TITLE' | translate}}

+
+ + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + + + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
+
+
+
+
+
+
+
diff --git a/dmp-frontend/src/app/shared/components/available-profiles/available-profiles.component.html b/dmp-frontend/src/app/shared/components/available-profiles/available-profiles.component.html index a1ce7b4e4..6fbe63d45 100644 --- a/dmp-frontend/src/app/shared/components/available-profiles/available-profiles.component.html +++ b/dmp-frontend/src/app/shared/components/available-profiles/available-profiles.component.html @@ -1,10 +1,12 @@ - - - {{profile.label}} - - - -

- Dataset Profiles selected: {{datasetsprofiles.selectedOptions.selected.length}} -

- \ No newline at end of file +

Available Dataset profiles

+
+ + + {{profile.label}} + + +

+ Dataset Profiles selected: {{datasetsprofiles.selectedOptions.selected.length}} +

+ +