From 201825171084f382a75632b4c437c74cdbe3d527 Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Wed, 22 Jul 2020 17:38:28 +0300
Subject: [PATCH 1/3] Adds language

---
 dmp-frontend/src/assets/i18n/en.json | 1 +
 dmp-frontend/src/assets/i18n/es.json | 1 +
 dmp-frontend/src/assets/i18n/gr.json | 1 +
 3 files changed, 3 insertions(+)

diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 1388392b4..821b2e60e 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -819,6 +819,7 @@
 			"FUNDING-INFO": "Funding info",
 			"DATASET-SELECTION": "Dataset selection",
 			"DATASET-INFO": "Dataset info",
+			"DATASET": "Dataset",
 			"PREVIOUS": "Previous",
 			"NEXT": "Next"
 		},
diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json
index 94837b2f7..20f69943e 100644
--- a/dmp-frontend/src/assets/i18n/es.json
+++ b/dmp-frontend/src/assets/i18n/es.json
@@ -813,6 +813,7 @@
 			"FUNDING-INFO": "Funding info",
 			"DATASET-SELECTION": "Dataset selection",
 			"DATASET-INFO": "Dataset info",
+			"DATASET": "Dataset",
 			"PREVIOUS": "Previous",
 			"NEXT": "Next"
 		},
diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json
index a14ef323f..06cee83b8 100644
--- a/dmp-frontend/src/assets/i18n/gr.json
+++ b/dmp-frontend/src/assets/i18n/gr.json
@@ -814,6 +814,7 @@
 			"FUNDING-INFO": "Funding info",
 			"DATASET-SELECTION": "Dataset selection",
 			"DATASET-INFO": "Dataset info",
+			"DATASET": "Dataset",
 			"PREVIOUS": "Previous",
 			"NEXT": "Next"
 		},

From 7f0aeb8c07e3040b1b048552f5e55c7b416a7cc5 Mon Sep 17 00:00:00 2001
From: gpapavgeri <gpapavgeri@cite.gr>
Date: Mon, 27 Jul 2020 13:43:47 +0300
Subject: [PATCH 2/3] login page - laptop image fixed

---
 dmp-frontend/src/app/ui/auth/login/login.component.html | 2 +-
 dmp-frontend/src/app/ui/auth/login/login.component.scss | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dmp-frontend/src/app/ui/auth/login/login.component.html b/dmp-frontend/src/app/ui/auth/login/login.component.html
index 2db4a1167..62fbd3676 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.component.html
+++ b/dmp-frontend/src/app/ui/auth/login/login.component.html
@@ -67,8 +67,8 @@
 				</div>
 			</div>
 		</div>
-		<div class="card-footer laptop-img"></div>
 	</div>
+	<div class="card-footer laptop-img"></div>
 </div>
 
 
diff --git a/dmp-frontend/src/app/ui/auth/login/login.component.scss b/dmp-frontend/src/app/ui/auth/login/login.component.scss
index 4a3f44871..410d639e0 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.component.scss
+++ b/dmp-frontend/src/app/ui/auth/login/login.component.scss
@@ -322,8 +322,9 @@ span.zenodoIcon {
   width: 116px;
   height: 200px;
   position: relative;
-  top: 58px;
+  top: -140px;
   left: 243px;
+  border-top: none;
 }
 
 .login-bg {

From 81a7ff09550c6e67e8f3d28cf974f4a2436b39f7 Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Mon, 27 Jul 2020 13:52:59 +0300
Subject: [PATCH 3/3] Fixes option view all dmp versions on listings

---
 .../recent-edited-activity.component.html         |  2 +-
 .../recent-edited-dmp-activity.component.html     |  2 +-
 .../app/ui/dmp/listing/dmp-listing.component.ts   |  5 ++++-
 dmp-frontend/src/assets/i18n/en.json              | 15 ++++++++++++---
 dmp-frontend/src/assets/i18n/es.json              | 13 ++++++++++++-
 dmp-frontend/src/assets/i18n/gr.json              | 13 ++++++++++++-
 6 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
index 59e1b2f75..703ad4a03 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
@@ -79,7 +79,7 @@
 					<button *ngIf="isUserOwner(activity)" mat-menu-item (click)="newVersion(activity.id, activity.title)">
 						<mat-icon>queue</mat-icon>{{'DMP-LISTING.ACTIONS.NEW-VERSION' | translate}}
 					</button>
-					<button mat-menu-item (click)="viewVersions(getGroupId(activity), activity.title)">
+					<button mat-menu-item (click)="viewVersions(getGroupId(activity), activity.title, activity)">
 						<mat-icon>library_books</mat-icon>{{'DMP-LISTING.ACTIONS.VIEW-VERSION' | translate}}
 					</button>
 					<button mat-menu-item *ngIf="isUserOwner(activity)" (click)="deleteClicked(activity)" class="menu-item">
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.html
index 3a258487e..0462147bf 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.html
@@ -78,7 +78,7 @@
 				<button *ngIf="isUserOwner(activity)" mat-menu-item (click)="newVersion(activity.id, activity.label)">
 					<mat-icon>queue</mat-icon>{{'DMP-LISTING.ACTIONS.NEW-VERSION' | translate}}
 				</button>
-				<button mat-menu-item (click)="viewVersions(activity.groupId, activity.label)">
+				<button mat-menu-item (click)="viewVersions(activity.groupId, activity.label, activity)">
 					<mat-icon>library_books</mat-icon>{{'DMP-LISTING.ACTIONS.VIEW-VERSION' | translate}}
 				</button>
 				<button mat-menu-item *ngIf="isUserOwner(activity)" (click)="deleteClicked()" class="menu-item">
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
index e3461242d..aa1f7ba02 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
@@ -109,7 +109,6 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
 				} else if (params['groupId']) {
 					this.itemId = params['groupId'];
 					this.showGrant = true;
-					const breadCrumbs = [];
 					this.allVersions = true;
 
 					this.language.get('NAV-BAR.MY-DMPS').pipe(takeUntil(this._destroyed)).subscribe(x => {
@@ -125,6 +124,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
 
 					// this.criteria.setCriteria(this.getDefaultCriteria());
 					this.criteria = this.getDefaultCriteria();
+					this.criteria.groupIds ? this.criteria.groupIds.push(this.itemId) : this.criteria.groupIds = [this.itemId];
 					this.refresh();
 					// this.criteria.setRefreshCallback((resetPages) => this.refresh(resetPages));
 				} else {
@@ -270,6 +270,9 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
 			defaultCriteria.isPublic = true;
 			defaultCriteria.onlyPublic = true;
 		}
+		if (this.allVersions) {
+			defaultCriteria.allVersions = true;
+		}
 		return defaultCriteria;
 	}
 
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 167b59166..2d35d662b 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -928,10 +928,12 @@
 	"DATASET-EDITOR": {
 		"TITLE": {
 			"NEW": "New Data Management Plan",
-			"EDIT": "Edit"
+			"EDIT": "Edit",
+			"INTRO": "A Data Management Plan (DMP) consist of your Data Management Plans closer to where they are generated, analysed and stored. argos is an open, extensible, collaborative tool supporting Open and FAIR Data Management Plans."
 		},
 		"FIELDS": {
 			"NAME": "Name of the Dataset Description",
+			"TITLE": "Title",
 			"DESCRIPTION": "Description",
 			"PROFILE": "Template",
 			"URI": "Uri",
@@ -944,6 +946,7 @@
 			"EXTERNAL-DATASET-TYPE": "External Dataset Type",
 			"EXTERNAL-DATASET-INFO": "External Dataset Info",
 			"DATAREPOSITORIES-INFO": "Data Repositories Info",
+			"EXTERNAL-LINK": "External link",
 			"TAGS": "Tags",
 			"CREATE": "Create New"
 		},
@@ -954,7 +957,12 @@
 			"UPDATE": "Update"
 		},
 		"PLACEHOLDER": {
-			"DESCRIPTION": "Fill with description"
+			"DESCRIPTION": "Fill with description",
+			"EXTERNAL-LINK": "Provide an external URL link"
+		},
+		"HINT": {
+			"TITLE": "A brief description of what the ",
+			"TITLE-REST": " is about it’s scope and objectives."
 		},
 		"VERSION-DIALOG": {
 			"ABOUT": "Versioning is automated.",
@@ -1026,7 +1034,8 @@
 			"SOURCES": "Sources",
 			"SOURCE:": "Source: ",
 			"NO-SOURCE": "Not bind with source",
-			"OUTPUT": "Output"
+			"OUTPUT": "Output",
+			"SELECT": "Select"
 		},
 		"DMP": {
 			"FINALISED": "Finalized",
diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json
index 8f91a8c1e..2a6b59999 100644
--- a/dmp-frontend/src/assets/i18n/es.json
+++ b/dmp-frontend/src/assets/i18n/es.json
@@ -920,10 +920,12 @@
 	"DATASET-EDITOR": {
 		"TITLE": {
 			"NEW": "Nuevo Plan de Gestión de Datos",
-			"EDIT": "Editar"
+			"EDIT": "Editar",
+			"INTRO": "A Data Management Plan (DMP) consist of your Data Management Plans closer to where they are generated, analysed and stored. argos is an open, extensible, collaborative tool supporting Open and FAIR Data Management Plans."
 		},
 		"FIELDS": {
 			"NAME": "Nombre de la descripción del Dataset",
+			"TITLE": "Title",
 			"DESCRIPTION": "Descripción",
 			"PROFILE": "Plantilla",
 			"URI": "Uri",
@@ -936,6 +938,7 @@
 			"EXTERNAL-DATASET-TYPE": "Tipo de Dataset externos",
 			"EXTERNAL-DATASET-INFO": "Información Dataset externos",
 			"DATAREPOSITORIES-INFO": "Información Repositorios de Datos",
+			"EXTERNAL-LINK": "External link",
 			"TAGS": "Etiquetas",
 			"CREATE": "Crear nuevo"
 		},
@@ -945,6 +948,14 @@
 			"DELETE": "Borrar",
 			"UPDATE": "Update"
 		},
+		"PLACEHOLDER": {
+			"DESCRIPTION": "Fill with description",
+			"EXTERNAL-LINK": "Provide an external URL link"
+		},
+		"HINT": {
+			"TITLE": "A brief description of what the",
+			"TITLE-REST": "is about it’s scope and objectives."
+		},
 		"VERSION-DIALOG": {
 			"ABOUT": "Versionado es automático.",
 			"QUESTION": "Parece que su plantilla de descripción del Dataset está desactualizada. ¿Queire actualizarla a la última versión?"
diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json
index 69da3a9e3..c7a52d986 100644
--- a/dmp-frontend/src/assets/i18n/gr.json
+++ b/dmp-frontend/src/assets/i18n/gr.json
@@ -921,10 +921,12 @@
 	"DATASET-EDITOR": {
 		"TITLE": {
 			"NEW": "Νέο Σχέδιο Διαχείρισης Δεδομένων",
-			"EDIT": "Επεξεργασία"
+			"EDIT": "Επεξεργασία",
+			"INTRO": "A Data Management Plan (DMP) consist of your Data Management Plans closer to where they are generated, analysed and stored. argos is an open, extensible, collaborative tool supporting Open and FAIR Data Management Plans."
 		},
 		"FIELDS": {
 			"NAME": "Τίτλος Περιγραφής Συνόλου Δεδομένων",
+			"TITLE": "Title",
 			"DESCRIPTION": "Περιγραφή",
 			"PROFILE": "Template",
 			"URI": "Uri",
@@ -937,6 +939,7 @@
 			"EXTERNAL-DATASET-TYPE": "Τύπος Εξωτερικού Συνόλου Δεδομένων",
 			"EXTERNAL-DATASET-INFO": "Πληροφορίες για το Εξωτερικό Σύνολο Δεδομένων",
 			"DATAREPOSITORIES-INFO": "Πληροφορίες για τα Αποθετήρια Δεδομένων",
+			"EXTERNAL-LINK": "External link",
 			"TAGS": "Ετικέτες",
 			"CREATE": "Δημιουργία νέου"
 		},
@@ -946,6 +949,14 @@
 			"DELETE": "Διαγραφή",
 			"UPDATE": "Update"
 		},
+		"PLACEHOLDER": {
+			"DESCRIPTION": "Fill with description",
+			"EXTERNAL-LINK": "Provide an external URL link"
+		},
+		"HINT": {
+			"TITLE": "A brief description of what the",
+			"TITLE-REST": "is about it’s scope and objectives."
+		},
 		"VERSION-DIALOG": {
 			"ABOUT": "Η δημιουργία νέας έκδοσης συμβαίνει αυτόματα",
 			"QUESTION": "Το Template το Συνόλου Δεδομένων που επιλέξατε χρειάζεται επικαιροποίηση. Θα θέλατε να το ενημερώσετε στην πιο πρόσφατη έκδοσή του;"