From 2cbaa05f950bf9d759b0d9a13b2351ee541a02c1 Mon Sep 17 00:00:00 2001
From: dtziotzios <dtziotzios@cite.gr>
Date: Thu, 14 Mar 2019 12:58:24 +0200
Subject: [PATCH] Restyles and repositions "Add one more Fieldset" button.

---
 .../form-section/form-section.component.html       | 14 ++++++++------
 .../form-section/form-section.component.scss       |  4 ++++
 dmp-frontend/src/assets/i18n/en.json               |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html
index d978a7f7f..021b90bfc 100644
--- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html
+++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html
@@ -14,14 +14,10 @@
 				<!-- *ngIf="this.visibilityRulesService.checkElementVisibility(compositeFieldFormGroup.get('id').value)" -->
 				<div class="row" *ngIf="this.visibilityRulesService.checkElementVisibility(compositeFieldFormGroup.get('id').value) && this.visibilityRulesService.scanIfChildsOfCompositeFieldHasVisibleItems(compositeFieldFormGroup)">
 
-					<div *ngIf="(compositeFieldFormGroup.get('multiplicity').value.max - 1) > (compositeFieldFormGroup.get('multiplicityItems').length)"
-					 class="col-12">
-						<button mat-button color="primary" (click)="addMultipleField(i)" [disabled]="compositeFieldFormGroup.disabled">
-							{{'DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.MULTIPLICITY-ADD-ONE-FIELD' | translate}}
-						</button>
-					</div>
+
 					<app-form-composite-field class="align-self-center col-12" [form]="compositeFieldFormGroup" [datasetProfileId]="datasetProfileId"
 					 [isChild]="false"></app-form-composite-field>
+
 					<div *ngIf="compositeFieldFormGroup" class="col-12">
 						<div class="row">
 							<div class="col-12" *ngFor="let multipleCompositeFieldFormGroup of compositeFieldFormGroup.get('multiplicityItems')['controls']; let j = index">
@@ -35,6 +31,12 @@
 									</div>
 								</div>
 							</div>
+							<div *ngIf="(compositeFieldFormGroup.get('multiplicity').value.max - 1) > (compositeFieldFormGroup.get('multiplicityItems').length)"
+							 class="col-12 && addOneFieldButton">
+								<button mat-icon-button color="primary" (click)="addMultipleField(i)" [disabled]="compositeFieldFormGroup.disabled" matTooltip="{{'DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.MULTIPLICITY-ADD-ONE-FIELD' | translate}}">
+									<mat-icon>add_circle</mat-icon>
+								</button>
+							</div>
 							<mat-form-field *ngIf="compositeFieldFormGroup.get('hasCommentField').value" class="col-12" [formGroup]="compositeFieldFormGroup">
 								<input matInput formControlName="commentFieldValue" placeholder="comment">
 							</mat-form-field>
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.scss b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.scss
index b0da624db..f8a8dab85 100644
--- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.scss
+++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.scss
@@ -2,6 +2,9 @@
 	.expansion-panel {
 		margin-bottom: 1em;
 	}
+	.addOneFieldButton {
+		margin-top: -15px;
+	}
 }
 .styleBorder{
 	border: 0.2em solid lightgray;
@@ -12,3 +15,4 @@
 	padding-bottom: 18px;
 	color: black;
 }
+
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 5e8f603aa..f9f47474b 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -98,7 +98,7 @@
 						"ADDITIONAL-INFORMATION":"Additional Information",
 						"MULTIPLICITY-MIN": "Multiplicity Min",
 						"MULTIPLICITY-MAX": "Multiplicity Max",
-						"MULTIPLICITY-ADD-ONE-FIELD": "Add one more fieldset +",
+						"MULTIPLICITY-ADD-ONE-FIELD": "Add one more fieldset",
 						"ORDER": "Order"
 					},
 					"ACTIONS": {