From 988fdc3ebbab099588c7cd41ebd538b9a6cb0f95 Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Mon, 3 Jun 2019 15:54:09 +0300
Subject: [PATCH] Fixes: dataset editor submit buttons,  Adds: translate

---
 .../dataset-wizard.component.html             | 12 ++++++------
 .../dataset-wizard.component.scss             | 19 +++++++++++--------
 dmp-frontend/src/assets/i18n/en.json          |  5 ++++-
 3 files changed, 21 insertions(+), 15 deletions(-)

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 ecc42e566..8e18c5be0 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
@@ -43,7 +43,7 @@
 						<mat-tab>
 							<ng-template mat-tab-label class="tab-label">
 								<i class="material-icons-outlined mr-2">view_agenda</i>
-								DATASET DETAILS
+								{{'DATASET-PROFILE-EDITOR.STEPS.PAGES.DATASET-DETAILS' | translate}}
 							</ng-template>
 							<form *ngIf="formGroup" [formGroup]="formGroup" class="p-3">
 								<mat-form-field class="col-md-6">
@@ -68,7 +68,7 @@
 						<mat-tab>
 							<ng-template mat-tab-label>
 								<mat-icon class="mr-2">work_outline</mat-icon>
-								EXTERNAL REFERENCES
+								{{'DATASET-PROFILE-EDITOR.STEPS.PAGES.EXTERNAL-REFERENCES' | translate}}
 							</ng-template>
 							<form *ngIf="formGroup" [formGroup]="formGroup" class="p-3">
 								<app-dataset-external-references-editor-component [formGroup]="formGroup"
@@ -79,7 +79,7 @@
 							<ng-template mat-tab-label>
 								<div class="d-flex">
 									<mat-icon class="mr-2">library_books</mat-icon>
-									DESCRIPTION
+									{{'DATASET-PROFILE-EDITOR.STEPS.PAGES.DESCRIPTION' | translate}}
 								</div>
 							</ng-template>
 							<app-dataset-description-form
@@ -92,12 +92,12 @@
 					</mat-tab-group>
 
 					<div class="actions">
-						<button mat-raised-button (click)="cancel()" type="button" class="cancelButton">
+						<button mat-raised-button (click)="cancel()" type="button" class="cancelButton" color="primary">
 							{{'DMP-EDITOR.ACTIONS.CANCEL' | translate}}
 						</button>
-						<button *ngIf="datasetWizardModel.status == 0 || isNew" mat-raised-button class="saveButton" (click)="save();"
+						<button *ngIf="datasetWizardModel.status == 0 || isNew" mat-raised-button [disabled]="!formGroup.valid" class="saveButton" color="primary" (click)="save();"
 							type="button">{{ 'DATASET-WIZARD.ACTIONS.SAVE' | translate }}</button>
-						<button *ngIf="datasetWizardModel.status == 0 || isNew" mat-raised-button [disabled]="!formGroup.valid" class="saveAndFinalizeButton"
+						<button *ngIf="datasetWizardModel.status == 0 || isNew" mat-raised-button [disabled]="!formGroup.valid" class="saveAndFinalizeButton" color="primary"
 							(click)="saveFinalize();"
 							type="button">{{ 'DATASET-WIZARD.ACTIONS.SAVE-AND-FINALISE' | translate }}</button>
 						<div class="fill-space"></div>
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss
index a3b62250a..21ceb3781 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.scss
@@ -12,17 +12,20 @@
   .deleteButton {
     margin-top: 15px;
     margin-bottom: 15px;
-    margin-right: 15px;
+	margin-right: 15px;
+	text-transform: uppercase;
   }
   .cancelButton {
     margin-top: 15px;
     margin-bottom: 15px;
-    margin-right: 15px;
+	margin-right: 15px;
+	text-transform: uppercase;
   }
   .saveButton {
     margin-top: 15px;
     margin-bottom: 15px;
-    margin-right: 15px;
+	margin-right: 15px;
+	text-transform: uppercase;
   }
   .saveAndFinalizeButton {
     margin-top: 15px;
@@ -55,11 +58,11 @@
     justify-content: flex-end;
   }
 
-  .actions > button {
-    background-color: #0070c0 !important;
-    color: #ffffff;
-    text-transform: uppercase;
-  }
+  //   .actions > button {
+  //     background-color: #0070c0;
+  //     color: #ffffff;
+  //     text-transform: uppercase;
+  //   }
 
   .more-horiz {
     font-size: 28px;
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 6faf8b334..254dbaae0 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -105,7 +105,10 @@
 			"PAGES": {
 				"TITLE": "Page Description",
 				"PAGE-PREFIX": "Page",
-				"PAGE-INPUT-TITLE": "Page Title"
+				"PAGE-INPUT-TITLE": "Page Title",
+				"DATASET-DETAILS": "Dataset Details",
+				"EXTERNAL-REFERENCES": "External References",
+				"DESCRIPTION": "Description"
 			},
 			"FORM": {
 				"TITLE": "Form Description",