Merge remote-tracking branch 'origin/ui-redesign' into ui-redesign

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>
 
 

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 {

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;
 	}
 

dmp-frontend/src/assets/i18n/en.json

@@ -822,6 +822,7 @@
 			"FUNDING-INFO": "Funding info",
 			"DATASET-SELECTION": "Dataset selection",
 			"DATASET-INFO": "Dataset info",
+			"DATASET": "Dataset",
 			"PREVIOUS": "Previous",
 			"NEXT": "Next"
 		},
@@ -927,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",
@@ -943,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"
 		},
@@ -953,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.",
@@ -1025,7 +1034,8 @@
 			"SOURCES": "Sources",
 			"SOURCE:": "Source: ",
 			"NO-SOURCE": "Not bind with source",
-			"OUTPUT": "Output"
+			"OUTPUT": "Output",
+			"SELECT": "Select"
 		},
 		"DMP": {
 			"FINALISED": "Finalized",

dmp-frontend/src/assets/i18n/es.json

@@ -814,6 +814,7 @@
 			"FUNDING-INFO": "Funding info",
 			"DATASET-SELECTION": "Dataset selection",
 			"DATASET-INFO": "Dataset info",
+			"DATASET": "Dataset",
 			"PREVIOUS": "Previous",
 			"NEXT": "Next"
 		},
@@ -919,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",
@@ -935,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"
 		},
@@ -944,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?"

dmp-frontend/src/assets/i18n/gr.json

@@ -815,6 +815,7 @@
 			"FUNDING-INFO": "Funding info",
 			"DATASET-SELECTION": "Dataset selection",
 			"DATASET-INFO": "Dataset info",
+			"DATASET": "Dataset",
 			"PREVIOUS": "Previous",
 			"NEXT": "Next"
 		},
@@ -920,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",
@@ -936,6 +939,7 @@
 			"EXTERNAL-DATASET-TYPE": "Τύπος Εξωτερικού Συνόλου Δεδομένων",
 			"EXTERNAL-DATASET-INFO": "Πληροφορίες για το Εξωτερικό Σύνολο Δεδομένων",
 			"DATAREPOSITORIES-INFO": "Πληροφορίες για τα Αποθετήρια Δεδομένων",
+			"EXTERNAL-LINK": "External link",
 			"TAGS": "Ετικέτες",
 			"CREATE": "Δημιουργία νέου"
 		},
@@ -945,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 το Συνόλου Δεδομένων που επιλέξατε χρειάζεται επικαιροποίηση. Θα θέλατε να το ενημερώσετε στην πιο πρόσφατη έκδοσή του;"