Merge branch 'Development'

(cherry picked from commit c9b4b35e39)

README.md

@@ -1,3 +1,9 @@
+
+**Important note: The deployment, troubleshooting, maintenance and operation of on-premises / self-served OpenDMP instances for development, testing or production use, shall be the sole responsibility of the adopter. No support is guaranteed by OpenDMP implentation team for issues that may be encountered during deployment, extension or operation of such installations.**
+
+**Documentation is provided on a best-effort basis for the code and processes around the development, deployment and operation of OpenDMP. If you find any misalignment of the actual processes with the related documentation, please let us know so that the misalignment is addressed for the benefit of future adopters.**
+
+
 # Using Docker Compose with Argos
 
 ARGOS is an open extensible service that simplifies the management, validation, monitoring and maintenance and of Data Management Plans. It allows actors (researchers, managers, supervisors etc) to create actionable DMPs that may be freely exchanged among infrastructures for carrying out specific aspects of the Data management process in accordance with the intentions and commitment of Data owners.

dmp-backend/web/pom.xml

@@ -226,6 +226,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>1.5.9.RELEASE</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java

@@ -202,14 +202,14 @@ public class DashBoardManager {
                 .selectAsync(item -> recentActivityDataBuilder.label(item.getLabel()).timestamp(item.getModified()).id(item.getId().toString()).build())
                 .whenComplete((datasetActivities, throwable) -> activity.setRecentDatasetActivities(datasetActivities));
 
-        CompletableFuture<List<RecentActivityData>> grants = grantRepository.getAuthenticated(grantRepository.getWithCriteria(grantCriteria), user)
+        /*CompletableFuture<List<RecentActivityData>> grants = grantRepository.getAuthenticated(grantRepository.getWithCriteria(grantCriteria), user)
                 .withHint("grantRecentActivity")
                 .orderBy((builder, root) -> builder.desc(root.get("modified")))
                 .take(numberofactivities)
                 .selectAsync(item -> recentActivityDataBuilder.label(item.getLabel()).timestamp(item.getModified()).id(item.getId().toString()).build())
-                .whenComplete((grantActivities, throwable) -> activity.setRecentGrantActivities(grantActivities));
+                .whenComplete((grantActivities, throwable) -> activity.setRecentGrantActivities(grantActivities));*/
 
-        CompletableFuture.allOf(grants, dmps, datasets).join();
+        CompletableFuture.allOf(/*grants, */dmps, datasets).join();
         return activity;
     }
 

dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java

@@ -1477,7 +1477,7 @@ public class DataManagementPlanManager {
                             Map extraProperties = objectMapper.readValue(dmpEntity.getExtraProperties(), HashMap.class);
                             if (extraProperties.containsKey("license")) {
                                 Map<String, String> license = ((Map<String, String>) extraProperties.get("license"));
-                                if (!StringUtils.isEmpty(license.get("pid"))) {
+                                if (license != null && !StringUtils.isEmpty(license.get("pid"))) {
                                     XWPFRun runLicense = systemFieldParagraph.createRun();
                                     runLicense.setText(license.get("pid").toString());
                                     runLicense.setColor("116a78");

dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java

@@ -140,6 +140,7 @@ public class GrantManager {
 
             grants.add(grant);
         }
+        grants = grants.stream().filter(grant -> grant.getLabel() != null).collect(Collectors.toList());
         grants.sort(Comparator.comparing(Grant::getLabel));
         grants = grants.stream().filter(listHelper.distinctByKey(Grant::getLabel)).collect(Collectors.toList());
         return grants;

dmp-frontend/src/app/app.component.html

@@ -5,33 +5,7 @@
 			<app-sidebar></app-sidebar>
 		</mat-sidenav>
 		<mat-sidenav-content class="sidenav-content">
-			<div id="main-page" >
-				<div class="main-content h-100  pb-0" *ngIf="newReleaseNotificationVisible">
-					<div class="container-fluid">
-						<div class="d-flex flex-direction-row">
-							<div class="card notification-header">
-								<div class="col">
-									<div class="row">
-										<div class="col-auto info">
-											<div class="notification-title">{{'NEW-RELEASE-NOTIFICATION.TITLE' | translate}}</div>
-											<div class="notification-subtitle" *ngIf="!this.configurationService.newReleaseNotificationLink">{{'NEW-RELEASE-NOTIFICATION.SUBTITLE' | translate}}</div>
-											<div class="notification-subtitle" *ngIf="this.configurationService.newReleaseNotificationLink">{{'NEW-RELEASE-NOTIFICATION.SUBTITLE-WITH-PRE-LINK' | translate }} <a class="notification-link" href="{{this.configurationService.newReleaseNotificationLink}}" target="_blank">{{'NEW-RELEASE-NOTIFICATION.SUBTITLE-LINK-TEXT' | translate }}</a> {{'NEW-RELEASE-NOTIFICATION.SUBTITLE-WITH-AFTER-LINK' | translate }}</div>
-										</div>
-										<div class="ml-auto d-flex flex-row">
-											<div class="col-auto d-flex align-items-center">
-												<div>
-													<button mat-raised-button class="notification-save-btn" (click)="dismissNewReleaseNotification()">
-														{{'NEW-RELEASE-NOTIFICATION.ACTIONS.DISMISS' | translate}}
-													</button>
-												</div>
-											</div>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
+			<div id="main-page">
 				<router-outlet (activate)='onActivate($event)' (deactivate)='onDeactivate($event)'></router-outlet>
 			</div>
 		</mat-sidenav-content>

dmp-frontend/src/app/app.component.ts

@@ -40,7 +40,6 @@ export class AppComponent implements OnInit, AfterViewInit {
 	helpContentEnabled: boolean;
 	private statusChangeSubscription: Subscription;
 	onlySplash = true;
-	newReleaseNotificationVisible = false;
 
 	@ViewChild('sidenav') sidenav: MatSidenav;
 
@@ -97,7 +96,6 @@ export class AppComponent implements OnInit, AfterViewInit {
 				}
 			});
 		});
-		this.newReleaseNotificationVisible = this.isNewReleaseNotificationVisible();
 	}
 
 	onActivate(event: any) {
@@ -236,27 +234,5 @@ export class AppComponent implements OnInit, AfterViewInit {
 	toggleNavbar(event) {
 		document.getElementById('hamburger').classList.toggle("change");
 	}
-
-	dismissNewReleaseNotification() {
-		this.cookieService.set('new-release-dismiss-' + this.configurationService.newReleaseNotificationVersionCode, 'true', 5000, null, null, false, 'Lax');
-		this.newReleaseNotificationVisible = false;
-	}
-
-	isNewReleaseNotificationVisible() {
-		if (this.configurationService.newReleaseNotificationVersionCode == null) {
-			return false;
-		}
-		if (this.configurationService.newReleaseNotificationExpires == null && this.configurationService.newReleaseNotificationLink == null) {
-			return false;
-		}
-		if (this.configurationService.newReleaseNotificationExpires != null && moment(this.configurationService.newReleaseNotificationExpires).tz('UTC') < moment.utc()) {
-			return false;
-		}
-		if (this.cookieService.get('new-release-dismiss-' + this.configurationService.newReleaseNotificationVersionCode) === 'true') {
-			return false;
-		}
-
-		return true;
-	}
 }
 

dmp-frontend/src/app/library/rich-text-editor/rich-text-editor.component.ts

@@ -47,7 +47,8 @@ export class RichTextEditorComponent {
 			{	name: 'H3 header', class: '', tag: 'h3'	},
 			{	name: 'H4 header', class: '', tag: 'h4'	},
 			{	name: 'H5 header', class: '', tag: 'h5'},
-			{	name: 'H6 header', class: '', tag: 'h6'}
+			{	name: 'H6 header', class: '', tag: 'h6'},
+			{	name: 'Highlight', class: 'highlight', tag: ''}
 		],
 		toolbarHiddenButtons: [
 			[
@@ -56,7 +57,7 @@ export class RichTextEditorComponent {
 			],
 			[
 				'fontSize',
-				// 'backgroundColor',
+				'backgroundColor',
 				// 'customClasses',
 				'insertImage',
 				'insertVideo',

dmp-frontend/src/app/ui/dashboard/dashboard.component.html

@@ -1,8 +1,28 @@
 <div class="main-content dashboard-main-container h-100" [class.non-auth-main-container]="!this.isAuthenticated()">
 	<div *ngIf="this.isAuthenticated()" class="container-fluid">
 		<div *ngIf="this.dashboardStatisticsData">
-				<div class="main-content">
-					<div class="col">
+			<div class="main-content">
+				<div class="col">
+					<div class="row">
+						<div *ngIf="newReleaseNotificationVisible" class="new-releases-card col-auto mt-0 mr-4" [style.display]="isVisible ? 'block' : 'none'">
+							<a class="col-auto d-flex" (click)="dismissNewReleaseNotification()"><span class="ml-auto mt-3 material-icons clear-icon">clear</span></a>
+							<div class="row new-releases-hint-container m-0">
+								<p class="new-releases-chip mb-0 col-auto">{{'NEW-RELEASE-NOTIFICATION.HINT' | translate}}</p>
+							</div>
+							<p class="new-releases-title mb-0 pt-4">{{'NEW-RELEASE-NOTIFICATION.TITLE' | translate}}</p>
+							<p class="new-releases-content mb-0">{{'NEW-RELEASE-NOTIFICATION.BODY' | translate}}</p>
+
+							<div class="row d-flex align-items-center mt-4" *ngIf="this.configurationService.newReleaseNotificationLink">
+								<div class="col-auto d-flex">
+									<a class="notification-link" href="{{this.configurationService.newReleaseNotificationLink}}" target="_blank">
+										<button mat-raised-button type="button" class="col-auto align-self-center new-releases-btn">{{'NEW-RELEASE-NOTIFICATION.ACTIONS.LEARN-MORE' | translate}}</button>
+									</a>
+								</div>
+								<span class="new-releases-logo">
+									<img src="../../../assets/images/new-releases-logo.png">
+								</span>
+							</div>
+						</div>
 						<div class="card col-auto mt-0" [style.display]="isVisible ? 'block' : 'none'">
 							<a *ngIf="this.hasDmps()" class="col-auto d-flex" (click)="closeCard()"><span class="ml-auto mt-3 material-icons clear-icon">clear</span></a>
 
@@ -29,158 +49,156 @@
 								</span>
 							</div>
 						</div>
-
-						<div *ngIf="this.hasDmps()" class="col">
-							<div class="latest-activity-title">{{'DASHBOARD.LATEST-ACTIVITY' | translate}}</div>
-							<mat-tab-group mat-align-tabs="start" class="remove-border-bottom"
-										   [selectedIndex]="indexFromCurrentType" (selectedTabChange)="currentType = $event.tab.ariaLabel">
-<!--								<mat-tab aria-label="recent" label="{{'DASHBOARD.ALL' | translate}} ({{totalRecents}})">-->
-								<mat-tab aria-label="recent" label="{{'DASHBOARD.ALL' | translate}}">
-									<app-recent-edited-activity (totalCountRecentEdited)="onCountAllRecent($event)" [isActive]="currentType == 'recent'"></app-recent-edited-activity>
-									<div *ngIf="totalRecents === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
-								</mat-tab>
-<!--								<mat-tab aria-label="draft" label="{{'DASHBOARD.DRAFTS' | translate}} ({{totalDraftDatasets}})">-->
-								<mat-tab aria-label="drafts" label="{{'DASHBOARD.DRAFTS' | translate}}">
-									<app-drafts (totalCountDraftDatasets)="onCountDraftDatasets($event)" [isActive]="currentType == 'drafts'"></app-drafts>
-									<div *ngIf="totalDraftDatasets === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
-								</mat-tab>>
-<!--								<mat-tab aria-label="dmps" label="{{'DASHBOARD.DMPS' | translate}}  ({{totalDmps}})">-->
-								<mat-tab aria-label="dmps" label="{{'DASHBOARD.DMPS' | translate}}">
-									<app-recent-edited-dmp-activity (totalCountDmps)="onCountDmps($event)" [isActive]="currentType == 'dmps'"></app-recent-edited-dmp-activity>
-									<div *ngIf="totalDmps === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
-								</mat-tab>
-<!--								<mat-tab aria-label="datasets" label="{{'DASHBOARD.DESCRIPTIONS' | translate}} ({{totalDatasets}})">-->
-								<mat-tab aria-label="datasets" label="{{'DASHBOARD.DESCRIPTIONS' | translate}}">
-									<app-recent-edited-dataset-activity (totalCountDatasets)="onCountDatasets($event)" [isActive]="currentType == 'datasets'"></app-recent-edited-dataset-activity>
-									<div *ngIf="totalDatasets === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
-									<div *ngIf="totalDatasets === 0" class="col-auto d-flex justify-content-center">
-										<button mat-raised-button class="add-dataset" (click)="addNewDataset()">
-											<mat-icon>add</mat-icon> {{'DASHBOARD.ACTIONS.ADD-DESCRIPTION' | translate}}
-										</button>
-									</div>
-								</mat-tab>
-							</mat-tab-group>
-						</div>
 					</div>
 
-					<!-- Right Sidebar -->
-					<div *ngIf="!this.hasDmps()" class="col-auto ml-auto stats">
-						<div class="personal-usage">{{'DASHBOARD.PERSONAL-USAGE' | translate}}</div>
-						<div class="counter-zero">0</div>
-						<a [routerLink]="['/plans']" class="link">{{'DASHBOARD.DMPS' | translate}}</a>
-						<div class="counter-zero">0</div>
-						<a [routerLink]="['/datasets']" class="link">{{'DASHBOARD.DESCRIPTIONS' | translate}}</a>
-						<div class="counter-zero">0</div>
-						<a class="link-disabled">{{'DASHBOARD.GRANTS' | translate}}</a>
-						<div class="counter-zero">0</div>
-						<a class="link-disabled">{{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}</a>
-					</div>
-
-					<div *ngIf="this.hasDmps()" class="col-auto stats">
-						<div class="personal-usage">{{'DASHBOARD.PERSONAL-USAGE' | translate}}</div>
-						<div [ngClass]="{'counter': dashboardStatisticsData?.totalDataManagementPlanCount != 0, 'counter-zero': dashboardStatisticsData?.totalDataManagementPlanCount == 0}">
-							{{dashboardStatisticsData?.totalDataManagementPlanCount}}</div>
-						<a [routerLink]="['/plans']" class="link">{{'DASHBOARD.DMPS' | translate}}</a>
-						<div [ngClass]="{'counter': dashboardStatisticsData?.totalDataSetCount != 0, 'counter-zero': dashboardStatisticsData?.totalDataSetCount == 0}">
-							{{dashboardStatisticsData?.totalDataSetCount}}</div>
-						<a [routerLink]="['/datasets']" class="link">{{'DASHBOARD.DESCRIPTIONS' | translate}}</a>
-						<div [ngClass]="{'counter': dashboardStatisticsData?.totalGrantCount != 0, 'counter-zero': dashboardStatisticsData?.totalGrantCount == 0}">
-							{{dashboardStatisticsData?.totalGrantCount}}</div>
-						<a href="#" class="link-disabled">{{'DASHBOARD.GRANTS' | translate}}</a>
-						<div [ngClass]="{'counter': dashboardStatisticsData?.totalOrganisationCount != 0, 'counter-zero': dashboardStatisticsData?.totalOrganisationCount == 0}">
-							{{dashboardStatisticsData?.totalOrganisationCount}}</div>
-						<a href="#" class="link-disabled">{{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}</a>
+					<div *ngIf="this.hasDmps()" class="col">
+						<div class="latest-activity-title">{{'DASHBOARD.LATEST-ACTIVITY' | translate}}</div>
+						<mat-tab-group mat-align-tabs="start" class="remove-border-bottom" [selectedIndex]="indexFromCurrentType" (selectedTabChange)="currentType = $event.tab.ariaLabel">
+							<!--								<mat-tab aria-label="recent" label="{{'DASHBOARD.ALL' | translate}} ({{totalRecents}})">-->
+							<mat-tab aria-label="recent" label="{{'DASHBOARD.ALL' | translate}}">
+								<app-recent-edited-activity (totalCountRecentEdited)="onCountAllRecent($event)" [isActive]="currentType == 'recent'"></app-recent-edited-activity>
+								<div *ngIf="totalRecents === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
+							</mat-tab>
+							<!--								<mat-tab aria-label="draft" label="{{'DASHBOARD.DRAFTS' | translate}} ({{totalDraftDatasets}})">-->
+							<mat-tab aria-label="drafts" label="{{'DASHBOARD.DRAFTS' | translate}}">
+								<app-drafts (totalCountDraftDatasets)="onCountDraftDatasets($event)" [isActive]="currentType == 'drafts'"></app-drafts>
+								<div *ngIf="totalDraftDatasets === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
+							</mat-tab>>
+							<!--								<mat-tab aria-label="dmps" label="{{'DASHBOARD.DMPS' | translate}}  ({{totalDmps}})">-->
+							<mat-tab aria-label="dmps" label="{{'DASHBOARD.DMPS' | translate}}">
+								<app-recent-edited-dmp-activity (totalCountDmps)="onCountDmps($event)" [isActive]="currentType == 'dmps'"></app-recent-edited-dmp-activity>
+								<div *ngIf="totalDmps === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
+							</mat-tab>
+							<!--								<mat-tab aria-label="datasets" label="{{'DASHBOARD.DESCRIPTIONS' | translate}} ({{totalDatasets}})">-->
+							<mat-tab aria-label="datasets" label="{{'DASHBOARD.DESCRIPTIONS' | translate}}">
+								<app-recent-edited-dataset-activity (totalCountDatasets)="onCountDatasets($event)" [isActive]="currentType == 'datasets'"></app-recent-edited-dataset-activity>
+								<div *ngIf="totalDatasets === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
+								<div *ngIf="totalDatasets === 0" class="col-auto d-flex justify-content-center">
+									<button mat-raised-button class="add-dataset" (click)="addNewDataset()">
+										<mat-icon>add</mat-icon> {{'DASHBOARD.ACTIONS.ADD-DESCRIPTION' | translate}}
+									</button>
+								</div>
+							</mat-tab>
+						</mat-tab-group>
 					</div>
 				</div>
 
-			</div>
-
-			<div>
-				<div class="main-content">
+				<!-- Right Sidebar -->
+				<div *ngIf="!this.hasDmps()" class="col-auto ml-auto stats">
+					<div class="personal-usage">{{'DASHBOARD.PERSONAL-USAGE' | translate}}</div>
+					<div class="counter-zero">0</div>
+					<a [routerLink]="['/plans']" class="link">{{'DASHBOARD.DMPS' | translate}}</a>
+					<div class="counter-zero">0</div>
+					<a [routerLink]="['/datasets']" class="link">{{'DASHBOARD.DESCRIPTIONS' | translate}}</a>
+					<div class="counter-zero">0</div>
+					<a class="link-disabled">{{'DASHBOARD.GRANTS' | translate}}</a>
+					<div class="counter-zero">0</div>
+					<a class="link-disabled">{{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}</a>
+				</div>
 
+				<div *ngIf="this.hasDmps()" class="col-auto stats">
+					<div class="personal-usage">{{'DASHBOARD.PERSONAL-USAGE' | translate}}</div>
+					<div [ngClass]="{'counter': dashboardStatisticsData?.totalDataManagementPlanCount != 0, 'counter-zero': dashboardStatisticsData?.totalDataManagementPlanCount == 0}">
+						{{dashboardStatisticsData?.totalDataManagementPlanCount}}</div>
+					<a [routerLink]="['/plans']" class="link">{{'DASHBOARD.DMPS' | translate}}</a>
+					<div [ngClass]="{'counter': dashboardStatisticsData?.totalDataSetCount != 0, 'counter-zero': dashboardStatisticsData?.totalDataSetCount == 0}">
+						{{dashboardStatisticsData?.totalDataSetCount}}</div>
+					<a [routerLink]="['/datasets']" class="link">{{'DASHBOARD.DESCRIPTIONS' | translate}}</a>
+					<div [ngClass]="{'counter': dashboardStatisticsData?.totalGrantCount != 0, 'counter-zero': dashboardStatisticsData?.totalGrantCount == 0}">
+						{{dashboardStatisticsData?.totalGrantCount}}</div>
+					<a href="#" class="link-disabled">{{'DASHBOARD.GRANTS' | translate}}</a>
+					<div [ngClass]="{'counter': dashboardStatisticsData?.totalOrganisationCount != 0, 'counter-zero': dashboardStatisticsData?.totalOrganisationCount == 0}">
+						{{dashboardStatisticsData?.totalOrganisationCount}}</div>
+					<a href="#" class="link-disabled">{{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}</a>
 				</div>
 			</div>
+
 		</div>
 
-		<!-- Home screen on log out -->
-		<div class="col p-0" *ngIf="!this.isAuthenticated()">
-			<div class="col-auto">
-				<!-- <div class="row">
+		<div>
+			<div class="main-content">
+
+			</div>
+		</div>
+	</div>
+
+	<!-- Home screen on log out -->
+	<div class="col p-0" *ngIf="!this.isAuthenticated()">
+		<div class="col-auto">
+			<!-- <div class="row">
 				<div class="col header-text-container">
 					<h3>{{ 'ABOUT.WELCOME' | translate }}</h3>
 					<h4>{{ 'ABOUT.WELCOME-MESSAGE' | translate }}</h4>
 				</div>
 			</div> -->
-				<div class="main-content">
-					<div class="col">
-						<div class="row">
-							<div class="col d-flex flex-column">
-								<div class="card non-auth-card" [style.display]="isVisible ? 'block' : 'none'">
-									<a class="col-auto d-flex" (click)="closeCard()"><span class="ml-auto mt-3 material-icons clear-icon">clear</span></a>
-									<div class="d-flex flex-column align-items-center non-auth-title-container">
-										<h4 class="pt-4">{{'DASHBOARD.TITLE' | translate}}</h4>
-										<p class="col-auto app-info">{{'DASHBOARD.INFO-TEXT' | translate}}</p>
-									</div>
-									<div class="d-flex">
-										<!-- <button type="button" class="col-auto align-self-center normal-btn" (click)="openNewDmpDialog()">{{'DASHBOARD.START-YOUR-FIRST-DMP' | translate}}</button> -->
-										<img class="col-auto ml-auto laptop-img" src="../../../assets/images/dashboard-popup.png">
-										<!-- <img class="col-auto ml-auto laptop-img"> -->
-									</div>
+			<div class="main-content">
+				<div class="col">
+					<div class="row">
+						<div class="col d-flex flex-column">
+							<div class="card non-auth-card" [style.display]="isVisible ? 'block' : 'none'">
+								<a class="col-auto d-flex" (click)="closeCard()"><span class="ml-auto mt-3 material-icons clear-icon">clear</span></a>
+								<div class="d-flex flex-column align-items-center non-auth-title-container">
+									<h4 class="pt-4">{{'DASHBOARD.TITLE' | translate}}</h4>
+									<p class="col-auto app-info">{{'DASHBOARD.INFO-TEXT' | translate}}</p>
 								</div>
-								<div *ngIf="hasDmps()" class="col activity">
-									<div class="latest-activity-title">{{'DASHBOARD.LATEST-ACTIVITY' | translate}}</div>
-									<mat-tab-group mat-align-tabs="start" class="remove-border-bottom" (
-												   [selectedIndex]="indexFromCurrentType"  selectedTabChange)="currentType = $event.tab.ariaLabel">
-<!--										<mat-tab aria-label="recent" label="{{'DASHBOARD.ALL' | translate}} ({{totalRecents}})">-->
-										<mat-tab aria-label="recent" label="{{'DASHBOARD.ALL' | translate}}">
-											<app-recent-edited-activity (totalCountRecentEdited)="onCountAllRecent($event)" [isActive]="currentType == 'recent'"></app-recent-edited-activity>
-											<div *ngIf="totalRecents === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
-										</mat-tab>
-<!--										<mat-tab aria-label="dmps" label="{{'DASHBOARD.PUBLIC-DMPS' | translate}}  ({{totalDmps}})">-->
-										<mat-tab aria-label="dmps" label="{{'DASHBOARD.PUBLIC-DMPS' | translate}}">
-											<app-recent-edited-dmp-activity (totalCountDmps)="onCountDmps($event)" [isActive]="currentType == 'dmps'"></app-recent-edited-dmp-activity>
-											<div *ngIf="totalDmps === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
-										</mat-tab>
-<!--										<mat-tab aria-label="datasets" label="{{'DASHBOARD.PUBLIC-DATASETS' | translate}} ({{totalDatasets}})">-->
-										<mat-tab aria-label="datasets" label="{{'DASHBOARD.PUBLIC-DATASETS' | translate}}">
-											<app-recent-edited-dataset-activity (totalCountDatasets)="onCountDatasets($event)" [isActive]="currentType == 'datasets'"></app-recent-edited-dataset-activity>
-											<div *ngIf="totalDatasets === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
-											<!-- <div *ngIf="totalDatasets === 0" class="col-auto d-flex justify-content-center">
+								<div class="d-flex">
+									<!-- <button type="button" class="col-auto align-self-center normal-btn" (click)="openNewDmpDialog()">{{'DASHBOARD.START-YOUR-FIRST-DMP' | translate}}</button> -->
+									<img class="col-auto ml-auto laptop-img" src="../../../assets/images/dashboard-popup.png">
+									<!-- <img class="col-auto ml-auto laptop-img"> -->
+								</div>
+							</div>
+							<div *ngIf="hasDmps()" class="col activity">
+								<div class="latest-activity-title">{{'DASHBOARD.LATEST-ACTIVITY' | translate}}</div>
+								<mat-tab-group mat-align-tabs="start" class="remove-border-bottom" ( [selectedIndex]="indexFromCurrentType" selectedTabChange)="currentType = $event.tab.ariaLabel">
+									<!--										<mat-tab aria-label="recent" label="{{'DASHBOARD.ALL' | translate}} ({{totalRecents}})">-->
+									<mat-tab aria-label="recent" label="{{'DASHBOARD.ALL' | translate}}">
+										<app-recent-edited-activity (totalCountRecentEdited)="onCountAllRecent($event)" [isActive]="currentType == 'recent'"></app-recent-edited-activity>
+										<div *ngIf="totalRecents === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
+									</mat-tab>
+									<!--										<mat-tab aria-label="dmps" label="{{'DASHBOARD.PUBLIC-DMPS' | translate}}  ({{totalDmps}})">-->
+									<mat-tab aria-label="dmps" label="{{'DASHBOARD.PUBLIC-DMPS' | translate}}">
+										<app-recent-edited-dmp-activity (totalCountDmps)="onCountDmps($event)" [isActive]="currentType == 'dmps'"></app-recent-edited-dmp-activity>
+										<div *ngIf="totalDmps === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
+									</mat-tab>
+									<!--										<mat-tab aria-label="datasets" label="{{'DASHBOARD.PUBLIC-DATASETS' | translate}} ({{totalDatasets}})">-->
+									<mat-tab aria-label="datasets" label="{{'DASHBOARD.PUBLIC-DATASETS' | translate}}">
+										<app-recent-edited-dataset-activity (totalCountDatasets)="onCountDatasets($event)" [isActive]="currentType == 'datasets'"></app-recent-edited-dataset-activity>
+										<div *ngIf="totalDatasets === 0" class="empty-list">{{'DASHBOARD.EMPTY-LIST' | translate}}</div>
+										<!-- <div *ngIf="totalDatasets === 0" class="col-auto d-flex justify-content-center">
 												<button mat-raised-button class="add-dataset" [routerLink]="['/datasets/new']">
 													<mat-icon>add</mat-icon> {{'DASHBOARD.ACTIONS.ADD-DESCRIPTION' | translate}}
 												</button>
 											</div> -->
-										</mat-tab>
-									</mat-tab-group>
-								</div>
+									</mat-tab>
+								</mat-tab-group>
 							</div>
-							<div class="col-auto">
-								<div *ngIf="!hasDmps()" class="ml-auto pl-4 personal-usage-block">
-									<div class="personal-usage">{{'DASHBOARD.PUBLIC-USAGE' | translate}}</div>
-									<div class="counter-zero">0</div>
-									<a>{{'DASHBOARD.PUBLIC-DMPS' | translate}}</a>
-									<div class="counter-zero">0</div>
-									<a>{{'DASHBOARD.PUBLIC-DATASETS' | translate}}</a>
-									<div class="counter-zero">0</div>
-									<a class="link-disabled">{{'DASHBOARD.GRANTS' | translate}}</a>
-									<div class="counter-zero">0</div>
-									<a class="link-disabled">{{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}</a>
-								</div>
-								<div *ngIf="hasDmps()" class="ml-auto stats">
-									<div class="personal-usage">{{'DASHBOARD.PUBLIC-USAGE' | translate}}</div>
-									<div [ngClass]="{'counter': dashboardStatisticsData?.totalDataManagementPlanCount != 0, 'counter-zero': dashboardStatisticsData?.totalDataManagementPlanCount == 0}">
-										{{dashboardStatisticsData?.totalDataManagementPlanCount}}</div>
-									<a [routerLink]="['/plans']" class="link">{{'DASHBOARD.PUBLIC-DMPS' | translate}}</a>
-									<div [ngClass]="{'counter': dashboardStatisticsData?.totalDataSetCount != 0, 'counter-zero': dashboardStatisticsData?.totalDataSetCount == 0}">
-										{{dashboardStatisticsData?.totalDataSetCount}}</div>
-									<a [routerLink]="['/datasets']" class="link">{{'DASHBOARD.PUBLIC-DATASETS' | translate}}</a>
-									<div [ngClass]="{'counter': dashboardStatisticsData?.totalGrantCount != 0, 'counter-zero': dashboardStatisticsData?.totalGrantCount == 0}">
-										{{dashboardStatisticsData?.totalGrantCount}}</div>
-									<a href="#" class="link-disabled">{{'DASHBOARD.GRANTS' | translate}}</a>
-									<div [ngClass]="{'counter': dashboardStatisticsData?.totalOrganisationCount != 0, 'counter-zero': dashboardStatisticsData?.totalOrganisationCount == 0}">
-										{{dashboardStatisticsData?.totalOrganisationCount}}</div>
-									<a href="#" class="link-disabled">{{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}</a>
-								</div>
+						</div>
+						<div class="col-auto">
+							<div *ngIf="!hasDmps()" class="ml-auto pl-4 personal-usage-block">
+								<div class="personal-usage">{{'DASHBOARD.PUBLIC-USAGE' | translate}}</div>
+								<div class="counter-zero">0</div>
+								<a>{{'DASHBOARD.PUBLIC-DMPS' | translate}}</a>
+								<div class="counter-zero">0</div>
+								<a>{{'DASHBOARD.PUBLIC-DATASETS' | translate}}</a>
+								<div class="counter-zero">0</div>
+								<a class="link-disabled">{{'DASHBOARD.GRANTS' | translate}}</a>
+								<div class="counter-zero">0</div>
+								<a class="link-disabled">{{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}</a>
+							</div>
+							<div *ngIf="hasDmps()" class="ml-auto stats">
+								<div class="personal-usage">{{'DASHBOARD.PUBLIC-USAGE' | translate}}</div>
+								<div [ngClass]="{'counter': dashboardStatisticsData?.totalDataManagementPlanCount != 0, 'counter-zero': dashboardStatisticsData?.totalDataManagementPlanCount == 0}">
+									{{dashboardStatisticsData?.totalDataManagementPlanCount}}</div>
+								<a [routerLink]="['/plans']" class="link">{{'DASHBOARD.PUBLIC-DMPS' | translate}}</a>
+								<div [ngClass]="{'counter': dashboardStatisticsData?.totalDataSetCount != 0, 'counter-zero': dashboardStatisticsData?.totalDataSetCount == 0}">
+									{{dashboardStatisticsData?.totalDataSetCount}}</div>
+								<a [routerLink]="['/datasets']" class="link">{{'DASHBOARD.PUBLIC-DATASETS' | translate}}</a>
+								<div [ngClass]="{'counter': dashboardStatisticsData?.totalGrantCount != 0, 'counter-zero': dashboardStatisticsData?.totalGrantCount == 0}">
+									{{dashboardStatisticsData?.totalGrantCount}}</div>
+								<a href="#" class="link-disabled">{{'DASHBOARD.GRANTS' | translate}}</a>
+								<div [ngClass]="{'counter': dashboardStatisticsData?.totalOrganisationCount != 0, 'counter-zero': dashboardStatisticsData?.totalOrganisationCount == 0}">
+									{{dashboardStatisticsData?.totalOrganisationCount}}</div>
+								<a href="#" class="link-disabled">{{'DASHBOARD.RELATED-ORGANISATIONS' | translate}}</a>
 							</div>
 						</div>
 					</div>
@@ -188,10 +206,11 @@
 			</div>
 		</div>
 	</div>
+</div>
 
 
 
-	<!-- <div class="header-image">
+<!-- <div class="header-image">
 	<div class="header-text-container">
 		<h3>{{ 'ABOUT.WELCOME' | translate }}</h3>
 		<h4>{{ 'ABOUT.WELCOME-MESSAGE' | translate }}</h4>
@@ -291,4 +310,4 @@
 			</div>
 		</div>
 	</div>
-</div> -->
+</div> -->

dmp-frontend/src/app/ui/dashboard/dashboard.component.scss

@@ -396,7 +396,7 @@ input[type="text"] {
 
 .add-dataset-btn {
 	height: 40px;
-    margin-left: 40px;
+	margin-left: 40px;
 }
 
 :host ::ng-deep .mat-tab-group.mat-primary .mat-ink-bar,
@@ -425,6 +425,87 @@ input[type="text"] {
 	padding: 0.3rem 0rem 0.6rem 0rem !important;
 }
 
+.new-releases-hint-container {
+	padding-left: 40px;
+	/* padding-top: 40px; */
+	padding-right: 55px;
+}
+
+.new-releases-card {
+	box-shadow: 0px 3px 6px #00000029;
+	max-width: 712px;
+	min-width: 17.5rem;
+	margin-top: 0rem;
+	margin-bottom: 3.75rem;
+
+	background: transparent linear-gradient(127deg, #EDAEB3 0%, #E1368A 100%) 0% 0% no-repeat padding-box;
+	border-radius: 6px;
+	opacity: 1;
+	padding-bottom: 2em;
+}
+
+.new-releases-btn {
+	height: 40px;
+	margin-left: 40px;
+
+	background: var(--primary-color) 0% 0% no-repeat padding-box;
+	border-radius: 30px;
+	opacity: 1;
+	color: #FFFFFF;
+	padding-right: 2em;
+    padding-left: 2em;
+}
+
+.new-releases-chip {
+	// margin-bottom: 1em;
+	// margin-left: 2.5em;
+	// margin-right: 2.5em;
+	color: #fff;
+	/* text-transform: uppercase; */
+	text-align: center;
+	font-weight: 500;
+	/* max-width: 160px; */
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	background: #EAEAEA 0% 0% no-repeat padding-box;
+	border-radius: 30px;
+	opacity: 0.7;
+	/* font: normal normal bold 12px/21px Aileron; */
+	letter-spacing: 0.12px;
+	color: #6E6E6E;
+}
+
+.new-releases-title {
+	text-align: left;
+	font: Bold 30px/34px Roboto;
+	letter-spacing: 0px;
+	color: #212121;
+	padding-left: 40px;
+	/* padding-top: 40px; */
+	padding-right: 55px;
+	opacity: 1;
+}
+
+.new-releases-content {
+	text-align: left;
+	font-weight: 300;
+	font-size: 1rem;
+	letter-spacing: 0px;
+	color: #212121;
+	padding-left: 40px;
+	font: normal normal normal 16px/24px Roboto;
+	padding-top: 36px;
+	padding-right: 55px;
+	opacity: 1;
+}
+
+.new-releases-logo {
+	position: absolute;
+    right: 0;
+    bottom: 0;
+}
+
 /* ::ng-deep .mat-tab-group {
 	height: 100%;
   }

dmp-frontend/src/app/ui/dashboard/dashboard.component.ts

@@ -35,6 +35,9 @@ import { UiNotificationService, SnackBarNotificationLevel } from '@app/core/serv
 import { GuidedTourService } from '@app/library/guided-tour/guided-tour.service';
 import { GuidedTour, Orientation } from '@app/library/guided-tour/guided-tour.constants';
 import { MatomoService } from '@app/core/services/matomo/matomo-service';
+import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
+import * as moment from 'moment';
+import { CookieService } from 'ngx-cookie-service';
 
 
 @Component({
@@ -73,6 +76,7 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC
 	importFileText: string;
 	startWizardText: string;
 	currentType: string = "recent";
+	newReleaseNotificationVisible = false;
 
 	constructor(
 		private router: Router,
@@ -89,7 +93,9 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC
 		private language: TranslateService,
 		private uiNotificationService: UiNotificationService,
 		private guidedTourService: GuidedTourService,
-		private matomoService: MatomoService
+		private matomoService: MatomoService,		
+		private cookieService: CookieService,
+		public configurationService: ConfigurationService
 	) {
 		super();
 		// this.dashboardStatisticsData.totalDataManagementPlanCount = 0;
@@ -154,6 +160,8 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC
 		this.filteredOptions = this.searchControl.valueChanges.pipe(mergeMap(x => {
 			return this.searchBarService.search(x);
 		}));
+
+		this.newReleaseNotificationVisible = this.isNewReleaseNotificationVisible();
 	}
 
 	public get indexFromCurrentType() {
@@ -400,4 +408,26 @@ export class DashboardComponent extends BaseComponent implements OnInit, IBreadC
 	// viewAllPublicDatasetsClicked() {
 	// 	this.router.navigate(['explore']);
 	// }
+
+	dismissNewReleaseNotification() {
+		this.cookieService.set('new-release-dismiss-' + this.configurationService.newReleaseNotificationVersionCode, 'true', 5000, null, null, false, 'Lax');
+		this.newReleaseNotificationVisible = false;
+	}
+
+	isNewReleaseNotificationVisible() {
+		if (this.configurationService.newReleaseNotificationVersionCode == null) {
+			return false;
+		}
+		if (this.configurationService.newReleaseNotificationExpires == null && this.configurationService.newReleaseNotificationLink == null) {
+			return false;
+		}
+		if (this.configurationService.newReleaseNotificationExpires != null && moment(this.configurationService.newReleaseNotificationExpires).tz('UTC') < moment.utc()) {
+			return false;
+		}
+		if (this.cookieService.get('new-release-dismiss-' + this.configurationService.newReleaseNotificationVersionCode) === 'true') {
+			return false;
+		}
+
+		return true;
+	}
 }

dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts

@@ -296,7 +296,6 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
 								const request: DataTableRequest<DatasetProfileCriteria> = new DataTableRequest<DatasetProfileCriteria>(null, null, null);
 								request.criteria = new DatasetProfileCriteria();
 								request.criteria.ids = [];
-								result.definition.sections[this.dmpSectionIndex].descriptionTemplates.forEach(template => request.criteria.ids.push(template.descriptionTemplateId));
 								this.availableDescriptionTemplates.forEach(template => request.criteria.ids.push(template.id));
 								this.datasetService.getDatasetProfilesWithPrefilling(request)
 									.pipe(takeUntil(this._destroyed))

dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.html

@@ -51,9 +51,9 @@
 											</div>
 										</li>
 									</ol>
-									<ul *ngIf="hasProfile(i)" class="add-dataset-option">
+									<ul *ngIf="dmp?.id && hasProfile(i)" class="add-dataset-option">
 										<li>
-											<a class="add-dataset-action" (click)="addDataset(i)">
+											<a class="add-dataset-action" [routerLink]="['/datasets/new/' + dmp.id + '/' + i]">
 												<mat-icon>add</mat-icon>{{'DMP-LISTING.ACTIONS.ADD-DESCRIPTION-FOR-SECTION' | translate}}
 											</a>
 										</li>

dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.ts

@@ -486,7 +486,7 @@ export class DmpEditorBlueprintComponent extends CheckDeactivateBaseComponent im
 	}
 
 	hasProfile(sectionIndex: number): boolean {
-		return this.formGroup.get('profiles') && this.formGroup.get('profiles').value && this.formGroup.get('profiles').value.some(x => x.data.dmpSectionIndex.includes(sectionIndex));
+		return this.formGroup.get('profiles') && this.formGroup.get('profiles').value && this.formGroup.get('profiles').value.some(x => x.data?.dmpSectionIndex?.includes(sectionIndex));
 	}
 
 	addDataset(dmpSectionIndex: number) {

dmp-frontend/src/assets/config/config.json

@@ -107,8 +107,8 @@
 	"orcidPath": "https://orcid.org/",
 	"maxFileSizeInMB": 10,
 	"newReleaseNotification": {
-		"link": "https://google.com",
+		"link": "https://www.openaire.eu/gazing-the-future-output-management-plans",
 		"versionCode": "0",
-		"expires": "2024-01-28T00:00"
+		"expires": "2024-02-15T00:00"
 	}
 }

dmp-frontend/src/assets/custom.js

@@ -0,0 +1,43 @@
+
+var sign_out_google = (function() {
+    var auth2 = gapi.auth2.getAuthInstance();
+    auth2.signOut().then(function () {
+        console.log('User signed out from google.');
+    }); 
+});
+
+
+var simple_notifier = (function(type, title, message) {
+    
+    setTimeout(function() {
+        $(".alert").remove();
+    }, 11000);
+
+    return notify(type, title, message, null, null, null, null, null, null, null, null, null, null);    
+});
+
+
+
+function notify(type, title, message, delay, icon, url, target, allow_dismiss, offset_x, offset_y, animate_enter, animate_exit, newest_on_top){
+
+    var options = {};
+    if(icon!=null) options.icon = icon;
+    if(title!=null) options.title = title;
+    if(message!=null) options.message = message;
+    if(url!=null) options.url = url;
+    if(target!=null) options.target = target;
+
+    var settings = {};
+    if(type!=null) settings.type = type;
+    if(allow_dismiss!=null) settings.allow_dismiss = allow_dismiss;
+    settings.delay = 5;
+    if(delay!=null) settings.delay = delay;
+
+    return $.notify(options,settings, delay);
+
+}
+
+
+
+
+

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

@@ -105,7 +105,7 @@
 		},
 		"DMP-TO-DATASET-DIALOG": {
 			"FROM-DMP": "You have successfully created your",
-			"DMP": "DMP",
+			"DMP": "Plan",
 			"TO-DATASET": "You will be transferred to the",
 			"DATASET": "Dataset",
 			"EDITOR": "editor",
@@ -132,8 +132,8 @@
 			"OPENSOURCE-LICENCES": "Opensource Licenses",
 			"TERMS": "Terms Of Service",
 			"COOKIES-POLICY": "Cookies Policy",
-			"PLANS": "My DMPs",
-			"EXPLORE-PLANS": "Published DMPs",
+			"PLANS": "My Plans",
+			"EXPLORE-PLANS": "Published Plans",
 			"QUICK-WIZARD": "New DMP (Wizard)",
 			"PLANS-NEW": "New DMP (Expert)",
 			"DMP-NEW": "New DMP",
@@ -224,9 +224,9 @@
 		"TITLE": "{{ APP_NAME_CAPS }}",
 		"GRANTS": "Grants",
 		"GRANT": "Grant",
-		"DMP": "DMP",
-		"DMPS": "DMPs",
-		"MY-DMPS": "MY DMPs",
+		"DMP": "Plan",
+		"DMPS": "Plans",
+		"MY-DMPS": "MY Plans",
 		"DATASETS": "Datasets",
 		"DESCRIPTION": "Description",
 		"PUBLIC-DATASETS": "Explore {{ APP_NAME_CAPS }}",
@@ -244,13 +244,13 @@
 		"TEMPLATE": "TEMPLATE",
 		"DMP-BLUEPRINTS-CAPS": "DMP BLUEPRINTS",
 		"USERS-BREADCRUMB": "USERS",
-		"START-NEW-DMP": "Start new DMP",
+		"START-NEW-DMP": "Start new Plan",
 		"START-NEW-DMP-TXT": "Start fresh or continue work in {{ APP_NAME }}! Create a new DMP or upload an existing DMP to {{ APP_NAME }}",
 		"START-WIZARD": "Start wizard",
 		"IMPORT-FROM-FILE": "Import from file",
 		"SEARCH": {
 			"DATASET": "Dataset",
-			"DMP": "DMP",
+			"DMP": "Plan",
 			"GRANT": "Grant",
 			"PUBLISHED": "Published"
 		}
@@ -260,7 +260,7 @@
 		"ABOUT": "About",
 		"DASHBOARD": "Home",
 		"DMP": "DATA MANAGEMENT PLANS",
-		"MY-DMPS": "My DMPs",
+		"MY-DMPS": "My Plans",
 		"DATASETS": "DATASETS",
 		"GRANTS": "GRANTS",
 		"NEW DATASET": "New Dataset",
@@ -274,7 +274,7 @@
 		"HISTORY-VISITED": "LAST VISITED",
 		"HISTORY-EDITED": "LAST EDITED",
 		"PUBLIC": "PUBLISHED",
-		"PUBLIC-DMPS": "Public DMPs",
+		"PUBLIC-DMPS": "Public Plans",
 		"PUBLIC-DESC": "Public Descriptions",
 		"ACCOUNT": "ACCOUNT",
 		"ADMIN": "ADMIN",
@@ -623,7 +623,7 @@
 		}
 	},
 	"DMP-LISTING": {
-		"DMP": "DMP",
+		"DMP": "Plan",
 		"GRANT": "Grant",
 		"TITLE": "Data Management Plans",
 		"OWNER": "Owner",
@@ -635,7 +635,7 @@
 		"VERSION": "Version",
 		"CONTAINED-DESCRIPTIONS": "Contained Descriptions",
 		"TEXT-INFO": "Information in a DMP show how descriptions have been collected and/or generated, how they have been processed and analyzed, i.e. using which tools, standards, methodologies etc, but also where and how descriptions are backed up, published and preserved, including any costs associated with personnel dedicated for data curation/ stewardship activities or costs for acquiring or building data management services.",
-		"TEXT-INFO-QUESTION": "Not sure how a DMP looks in practice? Browse Public DMPs and",
+		"TEXT-INFO-QUESTION": "Not sure how a Plan looks in practice? Browse Public Plans and",
 		"LINK-ZENODO": "LIBER community in Zenodo",
 		"GET-IDEA": "to get an idea!",
 		"SORT-BY": "Sort by",
@@ -887,7 +887,7 @@
 			"FINALIZED": "Finalized",
 			"LAST-EDITED": "Last Edited",
 			"ACTIONS": "Actions",
-			"DMP": "DMP",
+			"DMP": "Plan",
 			"PROFILE": "Template",
 			"DATAREPOSITORIES": "Data Repositories",
 			"REGISTRIES": "Registries",
@@ -914,7 +914,7 @@
 				"DRAFT": "Private access - Editable Dataset",
 				"FINALIZED": "Private access - Closed Dataset"
 			},
-			"DMP": "DMP",
+			"DMP": "Plan",
 			"GRANT": "Grant",
 			"TEMPLATES-INVOLVED": "Description Template",
 			"VERSION": "DMP Version",
@@ -928,7 +928,7 @@
 		"TITLE": "Published Datasets",
 		"TOOLTIP": {
 			"FINALIZED": "Private access - Closed Dataset",
-			"DMP": "DMP",
+			"DMP": "Plan",
 			"GRANT": "Grant",
 			"TEMPLATES-INVOLVED": "Description Template"
 		},
@@ -950,7 +950,7 @@
 			"DESCRIPTION": "Description",
 			"CREATED": "Created",
 			"ACTIONS": "Actions",
-			"DMP": "DMP",
+			"DMP": "Plan",
 			"PROFILE": "Template",
 			"DATAREPOSITORIES": "Data Repositories",
 			"REGISTRIES": "Registries",
@@ -1071,7 +1071,7 @@
 		"TITLE": {
 			"NEW": "New Data Management Plan",
 			"EDIT": "Edit",
-			"EDIT-DMP": "Editing DMP",
+			"EDIT-DMP": "Editing Plan",
 			"ADD-DATASET": "Adding description",
 			"EDIT-DESCRIPTION": "Editing Description",
 			"CLONE-DMP": "Clone",
@@ -1164,7 +1164,7 @@
 			"NEXT": "Next"
 		},
 		"MAIN-INFO": {
-			"INTRO": "A DMP in {{ APP_NAME }} consists of key information about research, such as purpose, objectives and researchers involved, but also about documentation of research datasets that highlight the steps followed and the means used across data management activities.",
+			"INTRO": "A Plan in {{ APP_NAME }} consists of key information about research, such as purpose, objectives and researchers involved, but also about documentation of research datasets that highlight the steps followed and the means used across data management activities.",
 			"HINT": "A brief description of what the DMP is about, it’s scope and objectives.",
 			"TYPING": "Type more letters of the name so its more possible to find the correct one.",
 			"UNIQUE-IDENTIFIER": "Unique Identifier",
@@ -1184,7 +1184,7 @@
 			"IDENTIFIER-PROJECT-EXISTS": "A project with the given identifier exists."
 		},
 		"DATASET-INFO": {
-			"INTRO": "A DMP in {{ APP_NAME }} consists of key information about research, such as purpose, objectives and researchers involved, but also about documentation of research datasets that highlight the steps followed and the means used across data management activities.",
+			"INTRO": "A Plan in {{ APP_NAME }} consists of key information about research, such as purpose, objectives and researchers involved, but also about documentation of research datasets that highlight the steps followed and the means used across data management activities.",
 			"SECOND-INTRO": "Descriptions are documented following pre-defined templates which set the content of dataset descriptions. In {{ APP_NAME }}, a DMP can contain as many dataset descriptions as the datasets it documents.",
 			"FIND": "Couldn't find a suitable one?",
 			"HINT": "Select a template to describe your descriptions. You may select more than one template."
@@ -1322,7 +1322,7 @@
 			"DESCRIPTION": "Description",
 			"PROFILE": "Template",
 			"URI": "Uri",
-			"DMP": "DMP",
+			"DMP": "Plan",
 			"SELECT-DMP": "Select DMP",
 			"DATAREPOSITORIES": "Data Repositories",
 			"REGISTRIES": "Registries",
@@ -1386,7 +1386,7 @@
 			"SAVE": "Save"
 		},
 		"FIRST-STEP": {
-			"TITLE": "DMP",
+			"TITLE": "Plan",
 			"PLACEHOLDER": "Pick an existing DMP"
 		},
 		"PREFILL-STEP": {
@@ -1522,7 +1522,7 @@
 		},
 		"DATASET-PROFILE-INTERNAL-DMP-ENTITIES-TYPE": {
 			"RESEARCHERS": "Researchers",
-			"DMPS": "DMPs",
+			"DMPS": "Plans",
 			"DATASETS": "Datasets",
 			"EXTERNAL-SOURCE-HINT": "List of values provided by external source(s)"
 		},
@@ -1573,7 +1573,7 @@
 	},
 	"DMP-WIZARD": {
 		"FIRST-STEP": {
-			"DMP": "DMP Editor",
+			"DMP": "Plan Editor",
 			"DATASETS": "Datasets"
 		},
 		"ACTIONS": {
@@ -1693,9 +1693,9 @@
 	"DASHBOARD": {
 		"MY-GRANTS": "My Grants",
 		"GRANTS": "Grants",
-		"MY-DMPS": "My DMPs",
+		"MY-DMPS": "My Plans",
 		"TITLE": "What is {{ APP_NAME_CAPS }}?",
-		"DMP-QUESTION": "What is a DMP in {{ APP_NAME_CAPS }}?",
+		"DMP-QUESTION": "What is a Plan in {{ APP_NAME_CAPS }}?",
 		"INFO-TEXT": "{{ APP_NAME_CAPS }} is an open extensible service that simplifies the management, validation, monitoring and maintenance and of Data Management Plans. It allows actors (researchers, managers, supervisors etc) to create actionable DMPs that may be freely exchanged among infrastructures for carrying out specific aspects of the Data management process in accordance with the intentions and commitment of Data owners.",
 		"INFO-DMP-TEXT": "A Data Management Plan (DMP) is a living document describing the datasets that are generated and/ or re-used during and after a research lifetime. DMPs aim to provide researchers with essential information to re-produce, re-distribute and re-purpose research results thus assuring for their validity and exploitation.",
 		"NEW-QUESTION": "New with DMPs? Visit",
@@ -1703,7 +1703,7 @@
 		"OPEN-AIR-GUIDE": "OpenAIRE’s Guide for Researchers",
 		"LEARN-MORE": "to learn more about how to create one!",
 		"ORGANIZATIONS": "Related Organizations",
-		"DMPS": "DMPs",
+		"DMPS": "Plans",
 		"MY-DATASETS": "My Datasets",
 		"DATASETS": "Datasets",
 		"SEARCH": "SEARCH...",
@@ -1712,14 +1712,14 @@
 		"PUBLIC-USAGE": "Public Usage",
 		"DESCRIPTIONS": "Descriptions",
 		"DATASET-DESCRIPTIONS-DASHBOARD-TEXT": "Descriptions",
-		"PUBLIC-DMPS": "Public DMPs",
+		"PUBLIC-DMPS": "Public Plans",
 		"PUBLIC-DATASETS": "Public Datasets",
 		"RELATED-ORGANISATIONS": "Related Organizations",
 		"DRAFTS": "Drafts",
 		"ALL": "All",
 		"EMPTY-LIST": "Nothing here yet.",
 		"LATEST-ACTIVITY": "Latest Activity",
-		"DMP-ABOUT-BEG": "A DMP in {{ APP_NAME }} consists of key information about research, such as purpose, objectives and researchers involved, but also about documentation of research entities, namely",
+		"DMP-ABOUT-BEG": "A Plan in {{ APP_NAME }} consists of key information about research, such as purpose, objectives and researchers involved, but also about documentation of research entities, namely",
 		"DMP-ABOUT-END": ", that highlight the steps followed and the means used across data management activities.",
 		"SELECT-DMP": "Select a DMP for your Dataset",
 		"ACTIONS": {
@@ -1728,7 +1728,7 @@
 		},
 		"TOUR-GUIDE": {
 			"DMP": "This is your dashboard. You can view and edit all DMPs that you have either contributed to or created yourself.",
-			"START-NEW": "Create your DMP with Start new DMP.",
+			"START-NEW": "Create your Plan with Start new Plan.",
 			"IMPORT-DMP": "You can import a DMP",
 			"START-WIZARD": "or create new in {{ APP_NAME }}.",
 			"DATASET": "This is your dashboard. You can view and edit all Datasets that you have either contributed to or created yourself.",
@@ -1738,7 +1738,7 @@
 		},
 		"ADD-NEW-DATASET": {
 			"OPTIONS-NOT-ENOUGH": "Are those options not enough?",
-			"START-NEW-DMP": "Start new DMP"
+			"START-NEW-DMP": "Start new Plan"
 		}
 	},
 	"USER-DIALOG": {
@@ -1869,7 +1869,7 @@
 		}
 	},
 	"DMP-FINALISE-DIALOG": {
-		"DMP": "DMP",
+		"DMP": "Plan",
 		"DATASETS": "Datasets",
 		"EMPTY": "No Datasets for this DMP so far",
 		"SUBMIT": "Submit",
@@ -1986,12 +1986,10 @@
 	},
 	"NEW-RELEASE-NOTIFICATION": {
 		"TITLE": "New ARGOS Release!",
-		"SUBTITLE": "Lorem ipsum Lorem ipsum Lorem ipsum Lorem ipsum Lorem ipsum Lorem ipsum Lorem ipsum Lorem ipsum Lorem ipsum Lorem ipsum.",
-		"SUBTITLE-WITH-PRE-LINK": "Check all the new features ",
-		"SUBTITLE-WITH-AFTER-LINK": ".",
-		"SUBTITLE-LINK-TEXT": "here",
+		"HINT": "Discover the all-new Argos version",
+		"BODY": "Discover the latest enhancements and improvements with our brand-new Argos release! Use the Default Blueprint to create plans that include funders information. Contact us to create Blueprints for institutional plans that connect to local services or for training activities. Adopt the output management plan as an overarching plan that combines different templates, e.g. data and software. Don’t miss out – explore now!",
 		"ACTIONS": {
-			"DISMISS": "Dismiss"
+			"LEARN-MORE": "Learn more"
 		}
 	}
 }

dmp-frontend/src/assets/scss/core/_type.scss

@@ -90,3 +90,13 @@ h2.title{
 .text-gray{
     color: $gray-color !important;
 }
+
+blockquote {
+	margin-left: 1rem;
+	border-left: .2em solid #dfe2e5;
+	padding-left: .5rem;
+}
+
+.highlight {
+	background-color: lightgoldenrodyellow;
+}

dmp-frontend/src/index.html

@@ -1,4 +1,3 @@
-<!doctype html>
 <html>
 
 <head>