From 6b46121f349b2f0ef5ff5db2bbdd9f9fca5ba5d9 Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Tue, 11 Jun 2019 12:39:04 +0300
Subject: [PATCH] Renames fields and adds hints - (Ticket #92) (Ticket #93)
 (Ticket #94) (Ticket #97)

---
 .../general-tab/general-tab.component.html    |  1 +
 .../general-tab/general-tab.component.scss    |  5 +++
 dmp-frontend/src/assets/i18n/en.json          | 36 +++++++++----------
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.html b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.html
index c131bf1f7..37a508a27 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.html
+++ b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.html
@@ -51,6 +51,7 @@
 						{{formGroup.get('organisations').getError('backendError').message}}</mat-error>
 					<mat-error *ngIf="formGroup.get('organisations').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' |
 												translate}}</mat-error>
+					<mat-hint>Add here the names of the organisations contributing to the creation and revision of the DMPs</mat-hint>
 				</mat-form-field>
 			</div>
 			<div class="row">
diff --git a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.scss b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.scss
index 096106532..c88c02f6f 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/editor/general-tab/general-tab.component.scss
@@ -33,3 +33,8 @@
 .version-menu mat-icon {
   color: #4687f0;
 }
+
+::ng-deep .mat-form-field-appearance-legacy .mat-form-field-wrapper {
+    padding-bottom: 1.25em;
+    padding-top: 1em;
+}
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index cb4c31bcb..47d0a8f95 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -50,7 +50,7 @@
 		}
 	},
 	"HOME": {
-		"DMPS": "Dmps",
+		"DMPS": "DMPs",
 		"DATASETS": "Datasets"
 	},
 	"NAV-BAR": {
@@ -58,7 +58,7 @@
 		"TITLE": "OpenDMP",
 		"PROJECTS": "Projects",
 		"PROJECT": "Project",
-		"DMP": "Dmp",
+		"DMP": "DMP",
 		"DMPS": "DMPs",
 		"MY-DMPS": "MY DMPs",
 		"MY-PUBLIC-DMPS": "My Public DMPs",
@@ -353,7 +353,7 @@
 			"PUBLISHED": "Published",
 			"LAST-EDITED": "Last Edited",
 			"ACTIONS": "Actions",
-			"DMP": "Dmp",
+			"DMP": "DMP",
 			"PROFILE": "Template",
 			"DATAREPOSITORIES": "Data Repositories",
 			"REGISTRIES": "Registries",
@@ -386,7 +386,7 @@
 			"DESCRIPTION": "Description",
 			"CREATED": "Created",
 			"ACTIONS": "Actions",
-			"DMP": "Dmp",
+			"DMP": "DMP",
 			"PROFILE": "Template",
 			"DATAREPOSITORIES": "Data Repositories",
 			"REGISTRIES": "Registries",
@@ -465,18 +465,18 @@
 			"EDIT": "Edit"
 		},
 		"FIELDS": {
-			"NAME": "Dmp Name",
+			"NAME": "Title",
 			"PROJECT": "Related Project",
-			"DESCRIPTION": "Dmp Description",
-			"ORGANISATIONS": "Related Organisations",
+			"DESCRIPTION": "Description",
+			"ORGANISATIONS": "Organisations",
 			"RESEARCHERS": "Researchers",
 			"TEMPLATES": "Templates",
-			"TEMPLATE": "Dmp Template",
+			"TEMPLATE": "DMP Template",
 			"DATASET-TEMPLATES": "Related Dataset Templates",
 			"PROFILE": "DMP Template",
 			"GRANT": "Grant",
 			"FUNDER": "Funder",
-			"STATUS": "Dmp Status"
+			"STATUS": "DMP Status"
 		},
 		"ACTIONS": {
 			"GO-TO-PROJECT": "Go To DMP Project",
@@ -499,7 +499,7 @@
 		"UPLOAD": {
 			"UPLOAD-XML": "Import",
 			"UPLOAD-XML-FILE-TITLE": "Import Data Managment Plan Template",
-			"UPLOAD-XML-NAME": "Name Of Dmp Template",
+			"UPLOAD-XML-NAME": "Name Of DMP Template",
 			"UPLOAD-XML-IMPORT": "File",
 			"UPLOAD-XML-FILE-CANCEL": "Cancel"
 		}
@@ -645,7 +645,7 @@
 		"DATASET-STATUS": {
 			"DRAFT": "Draft",
 			"FINALISED": "Finalized",
-			"ANY": "Any dmp status",
+			"ANY": "Any DMP status",
 			"DRAFT-DESC": "Draft Registrations"
 		},
 		"DATASET-ROLE": {
@@ -715,7 +715,7 @@
 		"SELECT-COLLABORATORS": "Select Collaborators"
 	},
 	"DMP-RELATED-ORGANIZATION": {
-		"RELATED-ORGANIZATION": "Related Organization",
+		"RELATED-ORGANIZATION": "Organization",
 		"SELECT-ORGANIZATIONS": "Select Organizations"
 	},
 	"DATASET-PROFILE": {
@@ -752,7 +752,7 @@
 		"MAIN-CONTENT": "Our goal is to make your research data FAIR, that is findable, accessible,interoperable and re-usable. These principles precede implementation choices and do not necessarily suggest any specific technology, standard, or implementationsolution.",
 		"CONTRIBUTORS": "Contributors",
 		"WELCOME": "Welcome to OpenDMP",
-		"WELCOME-MESSAGE": "Start using this tool to create your own Data Management Plans"
+		"WELCOME-MESSAGE": "Create, Link, Share Data Management Plans"
 	},
 	"DASHBOARD": {
 		"MY-PROJECTS": "My Projects",
@@ -839,7 +839,7 @@
 		}
 	},
 	"DRAFTS": {
-		"FOR-DMP": "For Dmp:",
+		"FOR-DMP": "For DMP:",
 		"FOR-PROJECT": "For Project:"
 	},
 	"QUICKWIZARD": {
@@ -867,11 +867,11 @@
 						}
 					},
 					"SECOND-STEP": {
-						"TITLE": "DMP Description",
+						"TITLE": "Description",
 						"NEW-TITLE": "",
-						"DMP-NAME": "Dmp For Project : ",
+						"DMP-NAME": "DMP For Project : ",
 						"FIELDS": {
-							"NAME": "Title of the Dmp",
+							"NAME": "Title of the DMP",
 							"DESCRIPTION": "Provide an optional description for the DMP context and purpose",
 							"PROFILE": "Dataset Description Template"
 						}
@@ -881,7 +881,7 @@
 						"NEW-TITLE": "",
 						"DATASET-LABEL": "Dataset Title",
 						"DATASET-NAME": "Dataset : ",
-						"DATASET-NAME-FOR": " For Dmp : ",
+						"DATASET-NAME-FOR": " For DMP : ",
 						"LIST-BUTTON-TOOLTIP": "Dataset List",
 						"ADD-BUTTON-TOOLTIP": "Add Dataset"
 					}