From d9c338a6e05b80d34e58ebabc7eefc5c3a72a5c8 Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Wed, 30 Oct 2019 10:54:41 +0200
Subject: [PATCH] Removes page of view plans for particular grant and removes
 unnecessary horizontal scrollbar on dataset description edit

---
 .../src/app/ui/auth/login/login.component.scss |  6 ------
 .../dataset-wizard.component.html              | 18 ++++++++++--------
 dmp-frontend/src/app/ui/dmp/dmp.routing.ts     | 15 ++++++++-------
 3 files changed, 18 insertions(+), 21 deletions(-)

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 2ca7b11fe..e01c3a8a5 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.component.scss
+++ b/dmp-frontend/src/app/ui/auth/login/login.component.scss
@@ -199,8 +199,6 @@ span.iconmedium {
   float: left;
   width: 100px;
   height: 56px;
-  //   margin-left: 1em;
-  //   margin-right: 1em;
 }
 
 span.orcidIconMedium {
@@ -209,8 +207,6 @@ span.orcidIconMedium {
   float: right;
   width: 56px;
   height: 56px;
-  //   margin-left: 1em;
-  //   margin-right: 1em;
 }
 
 span.openaireIcon {
@@ -219,8 +215,6 @@ span.openaireIcon {
   float: right;
   width: 80px;
   height: 56px;
-  //   margin-left: 1em;
-  //   margin-right: 1em;
 }
 
 .b2access-button {
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html
index 4e9dccee1..5317a8604 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html
@@ -91,14 +91,16 @@
 									{{'DATASET-PROFILE-EDITOR.STEPS.PAGES.DESCRIPTION' | translate}}
 								</div>
 							</ng-template>
-							<div class="row toc-pane-container" #boundary>
-								<div class="col-md-8 h-100 ">
-									<app-dataset-description-form class="w-100 h-100" *ngIf="formGroup && datasetWizardModel && datasetWizardModel.datasetProfileDefinition" [form]="this.formGroup.get('datasetProfileDefinition')" [visibilityRules]="datasetWizardModel.datasetProfileDefinition.rules" [datasetProfileId]="formGroup.get('profile').value" [linkToScroll]="linkToScroll">
-									</app-dataset-description-form>
-								</div>
-								<div #spacer></div>
-								<div class="col-md-4">
-									<table-of-contents class="toc-pane-container" [boundary]="boundary" [spacer]="spacer" stickyThing (stepFound)="onStepFound($event)"></table-of-contents>
+							<div class="col">
+								<div class="row toc-pane-container" #boundary>
+									<div class="col-md-8 h-100 ">
+										<app-dataset-description-form class="w-100 h-100" *ngIf="formGroup && datasetWizardModel && datasetWizardModel.datasetProfileDefinition" [form]="this.formGroup.get('datasetProfileDefinition')" [visibilityRules]="datasetWizardModel.datasetProfileDefinition.rules" [datasetProfileId]="formGroup.get('profile').value" [linkToScroll]="linkToScroll">
+										</app-dataset-description-form>
+									</div>
+									<div #spacer></div>
+									<div class="col-md-4">
+										<table-of-contents class="toc-pane-container" [boundary]="boundary" [spacer]="spacer" stickyThing (stepFound)="onStepFound($event)"></table-of-contents>
+									</div>
 								</div>
 							</div>
 						</mat-tab>
diff --git a/dmp-frontend/src/app/ui/dmp/dmp.routing.ts b/dmp-frontend/src/app/ui/dmp/dmp.routing.ts
index b6611ac61..dc84fb904 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp.routing.ts
+++ b/dmp-frontend/src/app/ui/dmp/dmp.routing.ts
@@ -22,13 +22,14 @@ const routes: Routes = [
 			breadcrumb: true
 		},
 	},
-	{
-		path: 'grant/:grantId',
-		component: DmpListingComponent,
-		data: {
-			breadcrumb: true
-		},
-	},
+	// Uncomment to get dmp plans for grant with grantId
+	// {
+	// 	path: 'grant/:grantId',
+	// 	component: DmpListingComponent,
+	// 	data: {
+	// 		breadcrumb: true
+	// 	},
+	// },
 	{
 		path: 'edit/:id',
 		component: DmpEditorComponent,