From dd8816757469a221fd7edf0fdcba02e546d09c76 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Thu, 8 Apr 2021 12:55:53 +0300
Subject: [PATCH] Improve names and styling for dataset template users

---
 .../dataset-profile-editor.component.html     | 14 ++++---
 .../dataset-profile-editor.component.scss     | 37 +++++++++++++++++++
 dmp-frontend/src/assets/i18n/de.json          |  2 +
 dmp-frontend/src/assets/i18n/en.json          |  2 +
 dmp-frontend/src/assets/i18n/es.json          |  2 +
 dmp-frontend/src/assets/i18n/gr.json          |  2 +
 dmp-frontend/src/assets/i18n/pt.json          |  2 +
 dmp-frontend/src/assets/i18n/sk.json          |  2 +
 dmp-frontend/src/assets/i18n/sr.json          |  2 +
 dmp-frontend/src/assets/i18n/tr.json          |  2 +
 10 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html
index 25ba626dd..64ec936d0 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.html
@@ -168,23 +168,25 @@
 						<!-- <div class="heading">1.3 {{'DMP-EDITOR.FIELDS.LANGUAGE' | translate}}</div> -->
 						<div class="heading">1.4 {{'DATASET-PROFILE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS'| translate}}</div>
 							<div class="full-width basic-info-input">
-								<table class="col-12">
-									<tr class="row">
+								<table class="col-12 user-table">
+									<tr class="row user-table-header">
 										<th class="col-4">{{'USERS.LISTING.NAME' | translate}}</th>
 										<th class="col-4">{{'USERS.LISTING.EMAIL' | translate}}</th>
 										<th class="col-4"></th>
 									</tr>
-									<tr *ngFor="let user of userChipList" class="row">
+									<tr *ngFor="let user of userChipList" class="row user-table-row">
 										<td class="col-4">{{user.name}}</td>
 										<td class="col-4">{{user.email}}</td>
 										<td class="col-4">
-											<button mat-raised-button class="delete-btn" (click)="removeUser(user)">delete</button>
+											<button mat-raised-button class="delete-btn" (click)="removeUser(user)">{{'DATASET-PROFILE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-REMOVE-USER'| translate}}</button>
 										</td>
 									</tr>
 								</table>
 									</div>
-									<input matInput #email class = "col-8" placeholder="{{'DATASET-PROFILE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS'| translate}}">
-									<button mat-raised-button color="primary" (click)="checkAndAdd(email.value)">Add and Validate</button>
+									<div class = "row">
+										<input matInput #email class = "col-8 email-input" placeholder="{{'DATASET-PROFILE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-USERS'| translate}}">
+										<button mat-raised-button color="primary" (click)="checkAndAdd(email.value)">{{'DATASET-PROFILE-EDITOR.STEPS.GENERAL-INFO.DATASET-TEMPLATE-VALIDATE-AND-ADD-USER'| translate}}</button>
+									</div>
 					</div>
 
 					<!-- <div class="col-12">
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss
index f9ae9fe68..83ac05eaf 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss
@@ -233,3 +233,40 @@ $blue-color-light: #5cf7f2;
 	background-color: rgba(255, 0, 0, 0.76);
 	color: white;
 }
+
+.email-input {
+	border-color: black;
+	border-style: solid;
+	border-width: thin;
+	border-radius: 4px;
+	margin-right: 5px;
+	background-color: white;
+	padding-top: 10px;
+	padding-bottom: 10px;
+}
+
+
+.user-table {
+	border: thin solid rgb(179, 173, 173);
+	background-color: white;
+	border-radius: 4px;
+}
+
+.user-table-header {
+	text-align: center;
+	display: revert;
+}
+
+.user-table-header th {
+	padding-top: 10px;
+	padding-bottom: 10px;
+	border: thin solid darkgray;
+}
+
+.user-table-row {
+	display: revert;
+}
+
+.user-table-row:nth-child(even) {
+	background-color: silver;
+}
diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json
index ba699ed3c..bc5dbe1cb 100644
--- a/dmp-frontend/src/assets/i18n/de.json
+++ b/dmp-frontend/src/assets/i18n/de.json
@@ -290,6 +290,8 @@
 				"DATASET-TEMPLATE-LANGUAGE": "Dataset template language",
 				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Select a language",
 				"DATASET-TEMPLATE-USERS": "Users",
+				"DATASET-TEMPLATE-REMOVE-USER": "Remove User",
+				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add User",
 				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Dataset template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 8020feeef..ac65d1534 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -290,6 +290,8 @@
 				"DATASET-TEMPLATE-LANGUAGE": "Dataset template language",
 				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Select a language",
 				"DATASET-TEMPLATE-USERS": "Users",
+				"DATASET-TEMPLATE-REMOVE-USER": "Remove User",
+				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add User",
 				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Dataset template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",
diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json
index 4a8966d09..fb9c54f62 100644
--- a/dmp-frontend/src/assets/i18n/es.json
+++ b/dmp-frontend/src/assets/i18n/es.json
@@ -290,6 +290,8 @@
 				"DATASET-TEMPLATE-LANGUAGE": "Dataset template language",
 				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Select a language",
 				"DATASET-TEMPLATE-USERS": "Users",
+				"DATASET-TEMPLATE-REMOVE-USER": "Remove User",
+				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add User",
 				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Dataset template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",
diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json
index 0c33ef518..17da7b2f4 100644
--- a/dmp-frontend/src/assets/i18n/gr.json
+++ b/dmp-frontend/src/assets/i18n/gr.json
@@ -290,6 +290,8 @@
 				"DATASET-TEMPLATE-LANGUAGE": "Dataset template language",
 				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Select a language",
 				"DATASET-TEMPLATE-USERS": "Users",
+				"DATASET-TEMPLATE-REMOVE-USER": "Remove User",
+				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add User",
 				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Dataset template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",
diff --git a/dmp-frontend/src/assets/i18n/pt.json b/dmp-frontend/src/assets/i18n/pt.json
index efe9761be..94b791ec5 100644
--- a/dmp-frontend/src/assets/i18n/pt.json
+++ b/dmp-frontend/src/assets/i18n/pt.json
@@ -290,6 +290,8 @@
 				"DATASET-TEMPLATE-LANGUAGE": "Dataset template language",
 				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Select a language",
 				"DATASET-TEMPLATE-USERS": "Users",
+				"DATASET-TEMPLATE-REMOVE-USER": "Remove User",
+				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add User",
 				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Dataset template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",
diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json
index a0f2c72dd..9c841d8a4 100644
--- a/dmp-frontend/src/assets/i18n/sk.json
+++ b/dmp-frontend/src/assets/i18n/sk.json
@@ -290,6 +290,8 @@
 				"DATASET-TEMPLATE-LANGUAGE": "Dataset template language",
 				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Select a language",
 				"DATASET-TEMPLATE-USERS": "Users",
+				"DATASET-TEMPLATE-REMOVE-USER": "Remove User",
+				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add User",
 				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Dataset template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",
diff --git a/dmp-frontend/src/assets/i18n/sr.json b/dmp-frontend/src/assets/i18n/sr.json
index 977954dd4..0cacddf16 100644
--- a/dmp-frontend/src/assets/i18n/sr.json
+++ b/dmp-frontend/src/assets/i18n/sr.json
@@ -290,6 +290,8 @@
 				"DATASET-TEMPLATE-LANGUAGE": "Dataset template language",
 				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Select a language",
 				"DATASET-TEMPLATE-USERS": "Users",
+				"DATASET-TEMPLATE-REMOVE-USER": "Remove User",
+				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add User",
 				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Dataset template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",
diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json
index b92fe7525..cb10b83fb 100644
--- a/dmp-frontend/src/assets/i18n/tr.json
+++ b/dmp-frontend/src/assets/i18n/tr.json
@@ -290,6 +290,8 @@
 				"DATASET-TEMPLATE-LANGUAGE": "Dataset template language",
 				"DATASET-TEMPLATE-SELECT-LANGUAGE": "Select a language",
 				"DATASET-TEMPLATE-USERS": "Users",
+				"DATASET-TEMPLATE-REMOVE-USER": "Remove User",
+				"DATASET-TEMPLATE-VALIDATE-AND-ADD-USER": "Validate and Add User",
 				"DATASET-TEMPLATE-DESCRIPTION-PLACEHOLDER": "Dataset template description",
 				"UNTITLED": "Untitled",
 				"QUESTION": "Question",