From a95c1ecc948d501f2b987e6a3100008bc6711602 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Wed, 6 Nov 2019 16:30:15 +0200 Subject: [PATCH] Edit dialogs to have similar style --- .../confirmation-dialog.component.html | 8 +- .../contact-dialog.component.html | 29 ++++---- .../criteria/dataset-profile.component.ts | 1 + ...onfirmation-upload-profiles.component.html | 2 +- ...onfirmation-upload-profiles.component.html | 2 +- .../dataset-copy-dialogue.component.html | 2 +- ...et-external-references-editor.component.ts | 4 + ...ta-repository-dialog-editor.component.html | 12 ++- ...ta-repository-dialog-editor.component.scss | 3 + ...data-repository-dialog-editor.component.ts | 5 +- ...ernal-dataset-dialog-editor.component.html | 12 ++- ...ernal-dataset-dialog-editor.component.scss | 3 + ...xternal-dataset-dialog-editor.component.ts | 5 +- ...rnal-registry-dialog-editor.component.html | 12 ++- ...rnal-registry-dialog-editor.component.scss | 3 + ...ternal-registry-dialog-editor.component.ts | 5 +- ...ernal-service-dialog-editor.component.html | 12 ++- ...ernal-service-dialog-editor.component.scss | 3 + ...xternal-service-dialog-editor.component.ts | 4 + .../dataset-upload-dialogue.component.html | 2 +- .../listing/dataset-listing.component.scss | 49 +----------- .../add-researcher.component.html | 3 +- .../available-profiles.component.html | 2 +- .../invitation/dmp-invitation.component.html | 8 +- .../dmp-upload-dialogue.component.html | 2 +- .../ui/dmp/overview/dmp-overview.component.ts | 2 +- .../ui/grant/editor/grant-editor.component.ts | 1 - .../user-dialog/user-dialog.component.html | 12 +-- .../user-dialog/user-dialog.component.scss | 4 + .../quick-wizard-editor.component.ts | 2 - .../faq/faq-dialog.component.html | 74 ++++++++++--------- .../faq/faq-dialog.component.scss | 4 + .../glossary/glossary-dialog.component.html | 48 ++++++------ .../glossary/glossary-dialog.component.scss | 4 + dmp-frontend/src/assets/i18n/en.json | 3 +- 35 files changed, 185 insertions(+), 162 deletions(-) diff --git a/dmp-frontend/src/app/library/confirmation-dialog/confirmation-dialog.component.html b/dmp-frontend/src/app/library/confirmation-dialog/confirmation-dialog.component.html index e8f995e67..59b533a6d 100644 --- a/dmp-frontend/src/app/library/confirmation-dialog/confirmation-dialog.component.html +++ b/dmp-frontend/src/app/library/confirmation-dialog/confirmation-dialog.component.html @@ -9,13 +9,13 @@
-
{{ data.message }}
+
{{ data.message }}
close
-
{{ data.privacyPolicyNames }}
+
{{ data.privacyPolicyNames }}
{{'GENERAL.CONFIRMATION-DIALOG.ACTIONS.POLICY-AGREE' | translate}} @@ -25,7 +25,7 @@
-
-
+
+
diff --git a/dmp-frontend/src/app/library/contact-dialog/contact-dialog.component.html b/dmp-frontend/src/app/library/contact-dialog/contact-dialog.component.html index 5bd3b5757..3f7bedeb1 100644 --- a/dmp-frontend/src/app/library/contact-dialog/contact-dialog.component.html +++ b/dmp-frontend/src/app/library/contact-dialog/contact-dialog.component.html @@ -1,14 +1,13 @@ -
-
+
+
+
{{'CONTACT.SUPPORT.SUBTITLE' | translate}} +
+
+ close +
-
- close -
-
- -
- +
@@ -25,9 +24,9 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
-
-
-
-
+
+
+
+
+
+ diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts index ff1ffd11b..3b39d931b 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts @@ -49,6 +49,7 @@ export class DatasetProfileCriteriaComponent extends BaseCriteriaComponent imple openDialog(): void { const dialogRef = this.dialog.open(DialodConfirmationUploadDatasetProfiles, { + width: '500px', restoreFocus: false, data: { message: this.language.instant('DATASET-WIZARD.UPLOAD.UPLOAD-XML-FILE-TITLE'), diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html index e38401954..dec3649ac 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html @@ -15,7 +15,7 @@
- +
diff --git a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html index 0f3cf0408..83c70604d 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html +++ b/dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html @@ -15,7 +15,7 @@
- +
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.html index 5fb58d9ef..4ca8fb416 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.html @@ -12,7 +12,7 @@
- +
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts index 8287901ff..5faca89bc 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts @@ -142,6 +142,7 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl addDataRepository() { const dialogRef = this.dialog.open(DatasetExternalDataRepositoryDialogEditorComponent, { + width: '500px', restoreFocus: false, data: {} }); @@ -156,6 +157,7 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl addRegistry() { const dialogRef = this.dialog.open(DatasetExternalRegistryDialogEditorComponent, { + width: '500px', restoreFocus: false, data: {} }); @@ -170,6 +172,7 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl addExternalDataset() { const dialogRef = this.dialog.open(DatasetExternalDatasetDialogEditorComponent, { + width: '500px', restoreFocus: false, data: {} }); @@ -184,6 +187,7 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl addService() { const dialogRef = this.dialog.open(DatasetExternalServiceDialogEditorComponent, { + width: '500px', restoreFocus: false, data: {} }); diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.html index 7e23bfd1a..900f5f4aa 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.html @@ -1,5 +1,12 @@
-

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

+
+
+ {{'DATASET-REFERENCED-MODELS.DATA-REPOSITORY.TITLE' | translate}} +
+
+ close +
+
@@ -15,8 +22,7 @@
-
-
+
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.scss index e69de29bb..b1538a730 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.scss +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.scss @@ -0,0 +1,3 @@ +.close-btn { + cursor: pointer; +} diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.ts index dc1f802b1..7215a1d49 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.ts @@ -24,7 +24,6 @@ export class DatasetExternalDataRepositoryDialogEditorComponent extends BaseComp this.formGroup = datarepo.buildForm(); } - send(value: any) { this.externalDataRepositoryService.create(this.formGroup.value) .pipe(takeUntil(this._destroyed)) @@ -32,4 +31,8 @@ export class DatasetExternalDataRepositoryDialogEditorComponent extends BaseComp (item) => this.dialogRef.close(item) ); } + + close() { + this.dialogRef.close(false); + } } diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.html index ba644cbdc..6a0263865 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.html @@ -1,5 +1,12 @@
-

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

+
+
+ {{'DATASET-REFERENCED-MODELS.EXTERNAL-DATASET.TITLE' | translate}} +
+
+ close +
+
@@ -11,8 +18,7 @@
-
-
+
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.scss index e69de29bb..b1538a730 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.scss +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.scss @@ -0,0 +1,3 @@ +.close-btn { + cursor: pointer; +} diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.ts index 7d91c8498..88914f5f2 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.ts @@ -24,7 +24,6 @@ export class DatasetExternalDatasetDialogEditorComponent extends BaseComponent i this.formGroup = externalDatasetModel.buildForm(); } - send(value: any) { this.externalDatasetService.create(this.formGroup.value) .pipe(takeUntil(this._destroyed)) @@ -32,4 +31,8 @@ export class DatasetExternalDatasetDialogEditorComponent extends BaseComponent i (item) => this.dialogRef.close(item) ); } + + close() { + this.dialogRef.close(false); + } } diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.html index 14f7e4673..111e52fc6 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.html @@ -1,5 +1,12 @@
-

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

+
+
+ {{'DATASET-REFERENCED-MODELS.REGISTRY.TITLE' | translate}} +
+
+ close +
+
@@ -15,8 +22,7 @@
-
-
+
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.scss index e69de29bb..b1538a730 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.scss +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.scss @@ -0,0 +1,3 @@ +.close-btn { + cursor: pointer; +} diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.ts index 32341d400..96e538083 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.ts @@ -24,7 +24,6 @@ export class DatasetExternalRegistryDialogEditorComponent extends BaseComponent this.formGroup = registryModel.buildForm(); } - send(value: any) { this.externalRegistryService.create(this.formGroup.value) .pipe(takeUntil(this._destroyed)) @@ -32,4 +31,8 @@ export class DatasetExternalRegistryDialogEditorComponent extends BaseComponent (item) => this.dialogRef.close(item) ); } + + close() { + this.dialogRef.close(false); + } } diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.html index 092ecf4c9..994c214e7 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.html @@ -1,5 +1,12 @@
-

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

+
+
+ {{'DATASET-REFERENCED-MODELS.SERVICES.TITLE' | translate}} +
+
+ close +
+
@@ -15,8 +22,7 @@
-
-
+
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.scss index e69de29bb..b1538a730 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.scss +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.scss @@ -0,0 +1,3 @@ +.close-btn { + cursor: pointer; +} diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.ts index 7f9d22ace..f97c8b685 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.ts @@ -31,4 +31,8 @@ export class DatasetExternalServiceDialogEditorComponent extends BaseComponent i (item) => this.dialogRef.close(item) ); } + + close() { + this.dialogRef.close(false); + } } diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.html b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.html index 79681602e..f631c3a39 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.html +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.html @@ -32,7 +32,7 @@
- +
diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss index cbaa18717..194373976 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss +++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss @@ -62,53 +62,12 @@ } ::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { - color: #00b29f; - background-color: #00b29f; - // color: #777777; - // background-color: #777777; + // color: #00b29f; + // background-color: #00b29f; + color: #777777; + background-color: #777777; } .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { background-color: #2e74b649; } - -// .mat-table { -// margin: 24px; -// } - -// .mat-fab-bottom-right { -// float: right; -// z-index: 5; -// } - -// .full-width { -// width: 100%; -// } - -// .mat-card { -// margin: 16px 0; -// } - -// .mat-row { -// cursor: pointer; -// } - -// mat-row:hover { -// background-color: lightgray; -// } - -// mat-row:nth-child(even){ -// background-color:red; -// } - -// mat-row:nth-child(odd) { -// background-color: #eef0fb; -// } - -// h3 { -// margin-top: 0px; -// } - -// ::ng-deep .mat-paginator { -// margin-top: auto; -// } diff --git a/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.html b/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.html index e1b6b70a8..34133f7ad 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.html @@ -11,8 +11,7 @@
-
-
+
diff --git a/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.html b/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.html index edd470258..9c670a435 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.html @@ -8,5 +8,5 @@

{{ 'DMP-EDITOR.DATASET-TEMPLATE-LIST.TEXT' | translate }} {{datasetsprofiles.selectedOptions.selected.length}}

- +
diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.html b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.html index 3fb185b9d..7b57c6b4a 100644 --- a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.html +++ b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.html @@ -32,10 +32,8 @@ --> - -
- +
+
- \ No newline at end of file + diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.html b/dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.html index 4eeee2838..81779fadc 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.html +++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.html @@ -15,7 +15,7 @@
- +
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 6b7e90baf..39b5bc55f 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 @@ -289,7 +289,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { publish(dmpId: String) { const dialogRef = this.dialog.open(ConfirmationDialogComponent, { - maxWidth: '300px', + maxWidth: '500px', restoreFocus: false, data: { message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.PUBLISH-ITEM'), diff --git a/dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts b/dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts index baaafb63d..6011e48a9 100644 --- a/dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts +++ b/dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts @@ -16,7 +16,6 @@ import { GrantListingModel } from '../../../core/model/grant/grant-listing'; import { GrantFileUploadService } from '../../../core/services/grant/grant-file-upload.service'; import { GrantService } from '../../../core/services/grant/grant.service'; import { ConfirmationDialogComponent } from '../../../library/confirmation-dialog/confirmation-dialog.component'; -import { SnackBarNotificationComponent } from '../../../library/notification/snack-bar/snack-bar-notification.component'; import { BreadcrumbItem } from '../../misc/breadcrumb/definition/breadcrumb-item'; import { IBreadCrumbComponent } from '../../misc/breadcrumb/definition/IBreadCrumbComponent'; import { GrantEditorModel } from './grant-editor.model'; diff --git a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html index c6b2a11c3..f922a2279 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html +++ b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html @@ -11,12 +11,12 @@
- - {{'USER-DIALOG.USER-PROFILE' | translate}} person - +
+ person{{'USER-DIALOG.USER-PROFILE' | translate}} +
- - {{ 'USER-DIALOG.LOG-OUT' | translate }} exit_to_app - +
+ exit_to_app{{ 'USER-DIALOG.LOG-OUT' | translate }} +
diff --git a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss index 448c2eec5..dc9cbf6a1 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss +++ b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss @@ -5,3 +5,7 @@ $mat-card-header-size: 40px !default; border-radius: 50%; flex-shrink: 0; } + +.profile, .logout { + margin-left: 3em; +} diff --git a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts index 6c7a758ff..abd8bb705 100644 --- a/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts +++ b/dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts @@ -9,7 +9,6 @@ import { ActivatedRoute, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { takeUntil } from 'rxjs/operators'; import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; -import { BaseComponent } from "../../../core/common/base/base.component"; import { DatasetStatus } from '../../../core/common/enum/dataset-status'; import { DmpStatus } from '../../../core/common/enum/dmp-status'; import { DatasetService } from '../../../core/services/dataset/dataset.service'; @@ -25,7 +24,6 @@ import { QuickWizardEditorWizardModel } from './quick-wizard-editor.model'; import { FunderFormModel } from '../../dmp/editor/grant-tab/funder-form-model'; import { ProjectFormModel } from '../../dmp/editor/grant-tab/project-form-model'; import { CheckDeactivateBaseComponent } from '../../../library/deactivate/deactivate.component'; -import { PopupNotificationDialogComponent } from '../../../library/notification/popup/popup-notification.component'; @Component({ selector: 'app-quick-wizard-editor-component', diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.html b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.html index c4f4f2a6a..1bc17388d 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.html +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.html @@ -1,39 +1,41 @@ -
-
- {{'FAQ.TITLE' | translate}} +
+
+
+ {{'FAQ.TITLE' | translate}} +
+
+ close +
-
- close +
+

What is ARGOS?

+

ARGOS is an open and collaborative platform for creating Data Management Plans according to funders or institutions’ open science policy requirements. ARGOS technology provides solutions and workflows that connect the DMP to the actual data where they are stored and link to other useful information such as publications and funding information, thus enabling the association between research outputs and processes and leading to the creation of coherent/ complete research entities. ARGOS is comprised of two major features: the ARGOS template and the Dataset Description.

+ +
+

Who is it for?

+

ARGOS is inclusive to all researchers and research coordinators who may use the tool to create machine actionable DMPs. Funding and Research Performing Organizations as well as research communities may use the tool and create Dataset Description templates according to their preferences or requirements. ARGOS may be used for purposes other than research projects, such as on the occasion of trainings that familiarise scientists with the data management planning process.

+ +
+

How can I use it?

+

ARGOS is comprised of two main functionalities: DMP templates and Dataset Descriptions. Additional entities are Projects that link to funders and grants information.
ARGOS can be used for: +

A. viewing/ consulting publicly released DMPs and Dataset Descriptions or Projects corresponding to DMPs

+ The tool offers options for publishing DMPs in two modes, private or public. To view public DMPs and Dataset Descriptions, there is no need for login to the platform. + +

B. writing and publishing a DMP

+ The tool helps researchers comply with mandates that may be attached to their grant proposal/ project funding. They can therefore choose from the most suitable to their needs template from the Dataset Descriptions collection and proceed with answering the corresponding questions. Once finalized, researchers can assign a DOI to their DMP, publish and eventually cite it. + +

C. practicing in writing DMPs and Dataset Descriptions

+ Given that Data Management Planning reflects the data management lifecycle and in accordance/ response to the increasing demand of the global scientific/ research community for training in Research Data Management (RDM), ARGOS may be used for educational purposes. Examples may refer to embedding DMP and DMP tools in specific curricula or even utilization of the tool for researchers and students familiarization with the concept and process, as part of library instructions’ sessions. +

+ +
+

What is the difference between the “Wizard” and the “Expert” modes/ features?

+

There are two ways of creating a DMP: the “Wizard” and the “Expert”. The DMP Wizard combines the most necessary fields of the DMP template and the Data Description template. It is an easy way of starting a DMP and completing a Dataset Description. The downside when using the Wizard is that it only supports one Dataset Description. To add more datasets documentation, someone must open the DMP from DMP Expert. +
DMP expert contains extra fields for describing the project, grant, funding, contributors and associations between DMP authors, etc. DMP Expert is advised for use when further modification and personalization is to take place. +

+ +
+
+
-
-

What is ARGOS?

-

ARGOS is an open and collaborative platform for creating Data Management Plans according to funders or institutions’ open science policy requirements. ARGOS technology provides solutions and workflows that connect the DMP to the actual data where they are stored and link to other useful information such as publications and funding information, thus enabling the association between research outputs and processes and leading to the creation of coherent/ complete research entities. ARGOS is comprised of two major features: the ARGOS template and the Dataset Description.

- -
-

Who is it for?

-

ARGOS is inclusive to all researchers and research coordinators who may use the tool to create machine actionable DMPs. Funding and Research Performing Organizations as well as research communities may use the tool and create Dataset Description templates according to their preferences or requirements. ARGOS may be used for purposes other than research projects, such as on the occasion of trainings that familiarise scientists with the data management planning process.

- -
-

How can I use it?

-

ARGOS is comprised of two main functionalities: DMP templates and Dataset Descriptions. Additional entities are Projects that link to funders and grants information.
ARGOS can be used for: -

A. viewing/ consulting publicly released DMPs and Dataset Descriptions or Projects corresponding to DMPs

- The tool offers options for publishing DMPs in two modes, private or public. To view public DMPs and Dataset Descriptions, there is no need for login to the platform. - -

B. writing and publishing a DMP

- The tool helps researchers comply with mandates that may be attached to their grant proposal/ project funding. They can therefore choose from the most suitable to their needs template from the Dataset Descriptions collection and proceed with answering the corresponding questions. Once finalized, researchers can assign a DOI to their DMP, publish and eventually cite it. - -

C. practicing in writing DMPs and Dataset Descriptions

- Given that Data Management Planning reflects the data management lifecycle and in accordance/ response to the increasing demand of the global scientific/ research community for training in Research Data Management (RDM), ARGOS may be used for educational purposes. Examples may refer to embedding DMP and DMP tools in specific curricula or even utilization of the tool for researchers and students familiarization with the concept and process, as part of library instructions’ sessions. -

- -
-

What is the difference between the “Wizard” and the “Expert” modes/ features?

-

There are two ways of creating a DMP: the “Wizard” and the “Expert”. The DMP Wizard combines the most necessary fields of the DMP template and the Data Description template. It is an easy way of starting a DMP and completing a Dataset Description. The downside when using the Wizard is that it only supports one Dataset Description. To add more datasets documentation, someone must open the DMP from DMP Expert. -
DMP expert contains extra fields for describing the project, grant, funding, contributors and associations between DMP authors, etc. DMP Expert is advised for use when further modification and personalization is to take place. -

- -
-
-
-
diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.scss b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.scss index e2869c014..cf0d57845 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.scss +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.scss @@ -11,3 +11,7 @@ .close-btn { cursor: pointer; } + +.faq { + margin-bottom: 1.125rem; +} diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.html b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.html index 4b6ef450c..b5998cdc8 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.html +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.html @@ -1,26 +1,28 @@ -
-
- {{'GLOSSARY.TITLE' | translate}} +
+
+
+ {{'GLOSSARY.TITLE' | translate}} +
+
+ close +
-
- close -
-
-
-

DMP

-

A DMP - short for Data Management Plan - is a document describing the processes that the data have undergone and the tools used for their handling and storage during a research lifecycle. Most importantly, DMPs secure provenance and enable re-use of data by appointing data managers and by including information on how data can be re-used by others in the future. Therefore, a DMP is a living document which is modified according to the data developments of a project before it’s completed and handed over at the end of the project. - Public funders increasingly contain DMPs in their grant proposals or policy funding requirements. A good paradigm is the European Commission demands for the production and delivery of DMPs for projects funded under the Horizon 2020 Funding Programme. On that note, and to encourage good data management practices uptake, many European institutions include DMPs in post-graduate researchers policies and offer relevant support to staff and students. -

- -

DMP template

-

DMP template contains general but vital information about the name and the duration of the project that the DMP corresponds to, the contributing organisations and individuals as well as the datasets that are under the Dataset Description section. It also offers the possibility of describing datasets other than primary data generated, under “External References” section. A DMP template can have many Dataset Descriptions. -

- -

Dataset Description

-

Dataset Description documents the management processes of datasets following funder’s or institution’s requirements. A dataset description is essentially a questionnaire template with underlying added value services for interoperability and machine readability of information which is developed based on the given requirements. Management requirements differ from funder to funder and from institution to institution, hence the growing collection of Dataset Descriptions to select from. - Moreover, a Dataset Description links to the documentation of one dataset, hence a DMP template may contain more than one dataset descriptions on the occasion when multiple datasets were used during the project. When documentation of some of the project’s datasets falls under additional requirements (e.g. projects receiving multiple grants from different sources), there is the possibility of describing datasets with more than one Dataset Description template. +

+

DMP

+

A DMP - short for Data Management Plan - is a document describing the processes that the data have undergone and the tools used for their handling and storage during a research lifecycle. Most importantly, DMPs secure provenance and enable re-use of data by appointing data managers and by including information on how data can be re-used by others in the future. Therefore, a DMP is a living document which is modified according to the data developments of a project before it’s completed and handed over at the end of the project. + Public funders increasingly contain DMPs in their grant proposals or policy funding requirements. A good paradigm is the European Commission demands for the production and delivery of DMPs for projects funded under the Horizon 2020 Funding Programme. On that note, and to encourage good data management practices uptake, many European institutions include DMPs in post-graduate researchers policies and offer relevant support to staff and students.

-
-
-
+ +

DMP template

+

DMP template contains general but vital information about the name and the duration of the project that the DMP corresponds to, the contributing organisations and individuals as well as the datasets that are under the Dataset Description section. It also offers the possibility of describing datasets other than primary data generated, under “External References” section. A DMP template can have many Dataset Descriptions. +

+ +

Dataset Description

+

Dataset Description documents the management processes of datasets following funder’s or institution’s requirements. A dataset description is essentially a questionnaire template with underlying added value services for interoperability and machine readability of information which is developed based on the given requirements. Management requirements differ from funder to funder and from institution to institution, hence the growing collection of Dataset Descriptions to select from. + Moreover, a Dataset Description links to the documentation of one dataset, hence a DMP template may contain more than one dataset descriptions on the occasion when multiple datasets were used during the project. When documentation of some of the project’s datasets falls under additional requirements (e.g. projects receiving multiple grants from different sources), there is the possibility of describing datasets with more than one Dataset Description template. +

+
+
+
+
diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.scss b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.scss index e2869c014..541a908f9 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.scss +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.scss @@ -11,3 +11,7 @@ .close-btn { cursor: pointer; } + +.glossary { + margin-bottom: 1.125rem; +} diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index 95a24eefa..d9fb49c56 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -658,7 +658,8 @@ }, "DATASET-TEMPLATE-LIST": { "TITLE": "Available Dataset Templates", - "TEXT": "Dataset Profiles selected: " + "TEXT": "Dataset Profiles selected: ", + "OK": "OK" } }, "DMP-PROFILE-LISTING": {