From 97a3338ddaf18c5f2db1d2c4ee028a9d1cef7d85 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Thu, 1 Oct 2020 16:35:20 +0300 Subject: [PATCH 1/3] Fixes enumerating of editor fields, changes title of fields 1.1 --- .../dataset-editor.component.html | 2 +- ...-external-references-editor.component.html | 2 +- .../dataset-info/dataset-info.component.html | 2 +- .../ui/dmp/editor/dmp-editor.component.html | 4 +- .../license-info/license-info.component.html | 2 +- .../editor/main-info/main-info.component.html | 38 +++++++++---------- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html index b8bfceed5..fcbe904f1 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html @@ -52,7 +52,7 @@ -
1.5 {{'DATASET-EDITOR.FIELDS.PROFILE' | translate}}*
+
1.4 {{'DATASET-EDITOR.FIELDS.PROFILE' | translate}}*
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.html index 7232f104c..4882e2944 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.html @@ -3,7 +3,7 @@
-

1.4 {{'DATASET-EDITOR.FIELDS.TAGS' | translate}}

+

1.3 {{'DATASET-EDITOR.FIELDS.TAGS' | translate}}

diff --git a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html index b902d4f51..d2a37ecf0 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html @@ -6,7 +6,7 @@
-
3 {{'DMP-EDITOR.STEPPER.DATASET-INFO' | translate}}*
+
4.1 {{'DMP-EDITOR.STEPPER.DATASET-INFO' | translate}}*
{{'DMP-EDITOR.DATASET-INFO.HINT' | translate}}
info {{'DMP-EDITOR.MAIN-INFO.TYPING' | translate}}
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html index cff0b741e..1e3108530 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html @@ -33,9 +33,9 @@
{{'DMP-EDITOR.STEPPER.USER-GUIDE' | translate}}
    -
  1. {{'DMP-EDITOR.STEPPER.MAIN-INFO' | translate}} (8)
    2. +
  2. {{'DMP-EDITOR.STEPPER.MAIN-INFO' | translate}} (7)
  3. {{'DMP-EDITOR.STEPPER.FUNDING-INFO' | translate}} (3)
    4. -
  4. {{'DMP-EDITOR.STEPPER.LICENSE-INFO' | translate}} (1)
    5. +
  5. {{'DMP-EDITOR.STEPPER.LICENSE-INFO' | translate}}
  6. {{'DMP-EDITOR.STEPPER.DATASET-INFO' | translate}}
    7. diff --git a/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.html b/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.html index 1e28f56e4..f09ecebc6 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.html @@ -6,7 +6,7 @@
    -
    4.1 {{'DMP-EDITOR.FIELDS.LICENSE' | translate}}
    +
    3.1 {{'DMP-EDITOR.FIELDS.LICENSE' | translate}}
    {{'DMP-EDITOR.LICENSE-INFO.HINT' | translate}}
    diff --git a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html index ec4094549..aa20383a8 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html @@ -124,28 +124,10 @@
    - -
    -
    -
    1.7 {{'DMP-EDITOR.FIELDS.PUBLICATION' | translate}}
    - -
    - - - - - - {{formGroup.get('extraProperties').get('publicDate').getError('backendError').message}} - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} - -
    -
    -
    -
    1.8 {{'DMP-EDITOR.FIELDS.CONTACT' | translate}}
    +
    1.7 {{'DMP-EDITOR.FIELDS.CONTACT' | translate}}
    @@ -162,5 +144,23 @@
    + +
    +
    +
    1.8 {{'DMP-EDITOR.FIELDS.PUBLICATION' | translate}}
    + +
    + + + + + + {{formGroup.get('extraProperties').get('publicDate').getError('backendError').message}} + + {{'GENERAL.VALIDATION.REQUIRED' | translate}} + +
    +
    +
From 9fe99d8f982d8ce395f22b22f668df2f8d0811c8 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Thu, 1 Oct 2020 16:35:45 +0300 Subject: [PATCH 2/3] with previous commit --- dmp-frontend/src/assets/i18n/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index 326f4c606..5577fec7c 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -790,7 +790,7 @@ "SUBTITLE": "DOI" }, "FIELDS": { - "NAME": "Title", + "NAME": "Title of DMP", "RELATED-GRANT": "Related Grant", "DESCRIPTION": "Description", "DESCRIPTION-HINT": "Briefly describe the context and purpose of the DMP", @@ -992,7 +992,7 @@ }, "FIELDS": { "NAME": "Name of the Dataset", - "TITLE": "Title", + "TITLE": "Title of Dataset", "DESCRIPTION": "Description", "PROFILE": "Template", "URI": "Uri", From 5af4fb4816ec2508dda86bc8abe13a67ed92e094 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Thu, 1 Oct 2020 17:29:02 +0300 Subject: [PATCH 3/3] Differs title of editing or adding dataset --- .../ui/dataset/dataset-wizard/dataset-wizard.component.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html index ffbcc85c4..b880f7ae2 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html @@ -8,7 +8,8 @@
-
{{'DMP-EDITOR.TITLE.ADD-DATASET' | translate}}
+
{{'DMP-EDITOR.TITLE.ADD-DATASET' | translate}}
+
{{'DMP-EDITOR.TITLE.EDIT-DATASET' | translate}}
{{ formGroup.get('label').value }} ({{'DMP-EDITOR.CHANGES' | translate}})
{{'DATASET-LISTING.TOOLTIP.TO-DMP' | translate}}