From caa6be46d8387cb95965b3465e43def048ec8ebf Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Tue, 7 May 2019 11:04:47 +0300
Subject: [PATCH] Styles: paginator position Dmp listing, Translates: Dmp
 listing

---
 .../criteria/dmp-criteria.component.html      | 10 ++---
 .../criteria/dmp-criteria.component.scss      | 40 +++++++++----------
 .../criteria/dmp-criteria.component.ts        |  9 +----
 .../ui/dmp/listing/dmp-listing.component.scss |  9 +++++
 dmp-frontend/src/assets/i18n/en.json          | 13 ++++--
 5 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html
index c3e143fa6..6a9405b37 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html
+++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.html
@@ -4,7 +4,7 @@
 		<div class="row" style="justify-content: center;">
 			<!-- Search Filter-->
 			<mat-form-field class="col-11 search">
-				<input matInput placeholder="{{'CRITERIA.PROJECTS.LIKE'| translate}}" name="projectCriteriaLike"
+				<input matInput placeholder="{{ 'CRITERIA.PROJECTS.LIKE'| translate }}" name="projectCriteriaLike"
 					[formControl]="formGroup.get('like')" (ngModelChange)="controlModified()">
 				<mat-error *ngIf="formGroup.get('like').hasError('backendError')">
 					{{formGroup.get('like').getError('backendError').message}}</mat-error>
@@ -28,7 +28,7 @@
 				<h6 class="category-title">{{ 'DMP-RELATED-PROJECT.RELATED-PROJECT' | translate}}</h6>
 				<mat-form-field>
 					<app-multiple-auto-complete [formControl]="formGroup.get('projects')"
-						placeholder="{{'CRITERIA.DMP.SELECT-PROJECTS' | translate}}"
+						placeholder="{{ 'CRITERIA.DMP.SELECT-PROJECTS' | translate }}"
 						[configuration]="projectAutoCompleteConfiguration">
 					</app-multiple-auto-complete>
 					<mat-icon matSuffix class="style-icon">arrow_drop_down</mat-icon>
@@ -40,7 +40,7 @@
 			<div *ngIf="showProject" class="col-10 filter-category">
 				<h6 class="category-title">{{ 'DMP-RELATED-COLLABORATOR.RELATED-COLLABORATOR' | translate}}</h6>
 				<mat-form-field>
-					<input matInput placeholder="Select collaborators">
+					<input matInput placeholder="{{ 'DMP-RELATED-COLLABORATOR.SELECT-COLLABORATORS' | translate }}">
 					<!-- <app-multiple-auto-complete [formControl]="formGroup.get('projects')"
 						placeholder="{{'CRITERIA.DMP.SELECT-PROJECTS' | translate}}"
 						[configuration]="projectAutoCompleteConfiguration">
@@ -63,9 +63,9 @@
 
 			<!-- Related Organization Filter -->
 			<div *ngIf="showProject" class="col-10 filter-category">
-				<h6 class="category-title">RELATED ORGANIZATION</h6>
+				<h6 class="category-title">{{ 'DMP-RELATED-ORGANIZATION.RELATED-ORGANIZATION' | translate }}</h6>
 				<mat-form-field>
-					<input matInput placeholder="Select Organizations">
+					<input matInput placeholder="{{ 'DMP-RELATED-ORGANIZATION.SELECT-ORGANIZATIONS' | translate }}">
 					<!-- <app-multiple-auto-complete [formControl]="formGroup.get('projects')"
 						placeholder="Select Organizations"
 						[configuration]="projectAutoCompleteConfiguration">
diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss
index 9700520c6..93e394732 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss
@@ -17,6 +17,26 @@
   }
 }
 
+.search ::ng-deep.mat-form-field-infix {
+  margin-left: 1em;
+}
+
+.filter-category {
+  background-color: #f6f6f6;
+  margin: 5px 0px;
+}
+
+.category-title {
+  color: #2e75b6;
+  margin-top: 8px;
+  margin-bottom: 12px;
+}
+
+.import {
+  margin: 10px;
+  padding: 0px;
+}
+
 .filters {
   border: 1px solid #e4e4e4;
   border-radius: 5px;
@@ -94,23 +114,3 @@
 .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element {
   background-color: #2e74b649;
 }
-
-.search ::ng-deep.mat-form-field-infix {
-  margin-left: 1em;
-}
-
-.filter-category {
-  background-color: #f6f6f6;
-  margin: 5px 0px;
-}
-
-.category-title {
-  color: #2e75b6;
-  margin-top: 8px;
-  margin-bottom: 12px;
-}
-
-.import {
-  margin: 10px;
-  padding: 0px;
-}
diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts
index 6bcf764dc..997374bee 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.ts
@@ -46,16 +46,9 @@ export class DmpCriteriaComponent extends BaseCriteriaComponent implements OnIni
 		public projectService: ProjectService,
 		private dmpService: DmpService,
 		public formBuilder: FormBuilder,
-		private dialog: MatDialog,
-		fb: FormBuilder
+		private dialog: MatDialog
 	) {
 		super(new ValidationErrorModel());
-		this.options = fb.group({
-			getDrafts: false,
-			getFinalized: false,
-			getDmpStatuses: false,
-			floatLabel: 'auto',
-		});
 	}
 
 	ngOnInit() {
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss
index 8b474c131..2b06d6aac 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss
@@ -2,6 +2,15 @@
   .mat-card {
     margin: 1em 0;
   }
+
+  .col-9 {
+	display: flex;
+	flex-direction: column;
+  }
+}
+
+::ng-deep .mat-paginator {
+  margin-top: auto;
 }
 
 ::ng-deep .mat-paginator-container {
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index b422e3584..57d46aab9 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -321,7 +321,8 @@
 		"ACTIONS": {
 			"EDIT": "Edit",
 			"MAKE-IT-PUBLIC": "Make it public",
-			"VIEW": "View"
+			"VIEW": "View",
+			"NEW": "New Dataset Description"
 		}
 	},
 	"DATASET-PUBLIC-LISTING": {
@@ -497,7 +498,8 @@
 		"USERS": {
 			"LABEL": "Search",
 			"ROLE": "Role"
-		}
+		},
+		"SELECT": "Select an option"
 	},
 	"DATASET-EDITOR": {
 		"TITLE": {
@@ -641,7 +643,12 @@
 		"RELATED-PROJECT": "Related Project"
 	},
 	"DMP-RELATED-COLLABORATOR": {
-		"RELATED-COLLABORATOR": "Related Collaborator"
+		"RELATED-COLLABORATOR": "Related Collaborator",
+		"SELECT-COLLABORATORS": "Select Collaborators"
+	},
+	"DMP-RELATED-ORGANIZATION": {
+		"RELATED-ORGANIZATION": "Related Organization",
+		"SELECT-ORGANIZATIONS": "Select Organizations"
 	},
 	"DATASET-PROFILE": {
 		"PREVIEW": "Preview",