From 57b98cd9b5833a12ed010f2c52a77bceed857c29 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Wed, 23 Mar 2022 15:26:35 +0200
Subject: [PATCH] Remove page-content from pages of monitor dashboard except
 monitor.component.ts

---
 src/app/app.component.html                                  | 2 +-
 src/app/develop/develop.component.ts                        | 4 +---
 src/app/methodology/methodology.component.ts                | 4 +---
 src/app/search/landingPages/dataset/dataset.component.ts    | 4 +---
 .../landingPages/organization/organization.component.ts     | 3 +--
 src/app/search/landingPages/orp/orp.component.ts            | 2 --
 src/app/search/landingPages/project/project.component.ts    | 3 +--
 .../landingPages/publication/publication.component.ts       | 2 --
 src/app/search/landingPages/result/result.component.ts      | 3 +--
 src/app/search/landingPages/software/software.component.ts  | 4 +---
 .../searchPages/advanced/searchDataproviders.component.ts   | 2 --
 .../searchPages/advanced/searchOrganizations.component.ts   | 2 --
 .../search/searchPages/advanced/searchProjects.component.ts | 2 --
 .../searchPages/advanced/searchResearchResults.component.ts | 2 --
 .../searchPages/simple/searchDataproviders.component.ts     | 2 --
 .../searchPages/simple/searchOrganizations.component.ts     | 2 --
 .../search/searchPages/simple/searchProjects.component.ts   | 2 --
 .../searchPages/simple/searchResearchResults.component.ts   | 2 --
 src/assets/dashboard-theme                                  | 2 +-
 src/assets/monitor-dashboard-custom.css                     | 6 +-----
 20 files changed, 10 insertions(+), 45 deletions(-)

diff --git a/src/app/app.component.html b/src/app/app.component.html
index 7093336..84e17a8 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -6,7 +6,7 @@
        [class.sidebar_mini]="!open && hasSidebar" [class.stakeholderPage]="isFrontPage">
     <navbar *ngIf="properties && hasHeader" [properties]="properties" portal="monitor_dashboard" [header]="menuHeader"
               [userMenuItems]=userMenuItems [menuItems]="menuItems" [user]="user" [offCanvasFlip]="true"></navbar>
-    <div class="uk-background-default">
+    <div>
       <dashboard-sidebar *ngIf="stakeholder && isFrontPage && hasSidebar" [items]="sideBarItems" [activeItem]="activeTopic?activeTopic.alias:null"></dashboard-sidebar>
       <dashboard-sidebar *ngIf="hasAdminMenu" [items]="adminMenuItems" [specialMenuItem]="specialSideBarMenuItem"></dashboard-sidebar>
       <main>
diff --git a/src/app/develop/develop.component.ts b/src/app/develop/develop.component.ts
index 80e63c7..5d4b169 100644
--- a/src/app/develop/develop.component.ts
+++ b/src/app/develop/develop.component.ts
@@ -11,8 +11,7 @@ import {StakeholderUtils} from "../utils/indicator-utils";
 @Component({
   selector: 'develop',
   template: `
-		<div page-content>
-      <div inner>
+      <div class="uk-section">
 				<div class="uk-container uk-container-large">
 						<h1>Help developers <br> with OpenAIRE APIs<span class="uk-text-primary">.</span></h1>
 				</div>
@@ -112,7 +111,6 @@ import {StakeholderUtils} from "../utils/indicator-utils";
 					</div>
 				</div>
 			</div>
-		</div>
   `,
   styleUrls: ['develop.component.css']
 })
diff --git a/src/app/methodology/methodology.component.ts b/src/app/methodology/methodology.component.ts
index ed2ad61..ea3721d 100644
--- a/src/app/methodology/methodology.component.ts
+++ b/src/app/methodology/methodology.component.ts
@@ -10,8 +10,7 @@ import {ActivatedRoute, Router} from "@angular/router";
 @Component({
   selector: 'methodology',
   template: `
-		<div page-content>
-			<div inner>
+			<div class="uk-section">
 				<div class="uk-container uk-container-large">
           <h1>Terminology and <br> construction<span class="uk-text-primary">.</span></h1>
 				</div>
@@ -221,7 +220,6 @@ import {ActivatedRoute, Router} from "@angular/router";
           </div>
         </div>
 			</div>
-		</div>
   `,
   styleUrls: ['methodology.component.css']
 })
diff --git a/src/app/search/landingPages/dataset/dataset.component.ts b/src/app/search/landingPages/dataset/dataset.component.ts
index 0f05de3..bf8c684 100644
--- a/src/app/search/landingPages/dataset/dataset.component.ts
+++ b/src/app/search/landingPages/dataset/dataset.component.ts
@@ -7,9 +7,7 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
 @Component({
   selector: 'monitor-dataset',
   template: `
-    <div id="page_content">
-      <result-landing *ngIf="initialized" type="dataset" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></result-landing>
-    </div>
+    <result-landing *ngIf="initialized" type="dataset" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></result-landing>
   `,
 })
 export class MonitorDatasetComponent {
diff --git a/src/app/search/landingPages/organization/organization.component.ts b/src/app/search/landingPages/organization/organization.component.ts
index 0188a07..73047e1 100644
--- a/src/app/search/landingPages/organization/organization.component.ts
+++ b/src/app/search/landingPages/organization/organization.component.ts
@@ -7,9 +7,8 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
 @Component({
   selector: 'monitor-organization',
   template: `
-    <div id="page_content">
       <organization *ngIf="initialized" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></organization>
-    </div>`,
+  `,
 })
 export class MonitorOrganizationComponent {
   initialized: boolean = false;
diff --git a/src/app/search/landingPages/orp/orp.component.ts b/src/app/search/landingPages/orp/orp.component.ts
index 67461b2..9f5e7e5 100644
--- a/src/app/search/landingPages/orp/orp.component.ts
+++ b/src/app/search/landingPages/orp/orp.component.ts
@@ -7,9 +7,7 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
 @Component({
   selector: 'monitor-orp',
   template: `
-    <div id="page_content">
       <result-landing *ngIf="initialized" type="orp" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></result-landing>
-    </div>
   `,
 })
 
diff --git a/src/app/search/landingPages/project/project.component.ts b/src/app/search/landingPages/project/project.component.ts
index b340d27..72cd144 100644
--- a/src/app/search/landingPages/project/project.component.ts
+++ b/src/app/search/landingPages/project/project.component.ts
@@ -7,9 +7,8 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
 @Component({
   selector: 'monitor-project',
   template: `
-    <div id="page_content">
       <project *ngIf="initialized" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></project>
-    </div>`,
+  `,
 })
 export class MonitorProjectComponent {
   initialized: boolean = false;
diff --git a/src/app/search/landingPages/publication/publication.component.ts b/src/app/search/landingPages/publication/publication.component.ts
index e4358f9..5859718 100644
--- a/src/app/search/landingPages/publication/publication.component.ts
+++ b/src/app/search/landingPages/publication/publication.component.ts
@@ -7,9 +7,7 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
 @Component({
   selector: 'monitor-publication',
   template: `
-    <div id="page_content">
       <result-landing *ngIf="initialized" type="publication" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></result-landing>
-    </div>
   `,
 })
 export class MonitorPublicationComponent {
diff --git a/src/app/search/landingPages/result/result.component.ts b/src/app/search/landingPages/result/result.component.ts
index a2aabdf..9794e49 100644
--- a/src/app/search/landingPages/result/result.component.ts
+++ b/src/app/search/landingPages/result/result.component.ts
@@ -7,9 +7,8 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
 @Component({
   selector: 'monitor-result',
   template: `
-    <div id="page_content">
       <result-landing *ngIf="initialized" type="result" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></result-landing>
-    </div>`,
+  `,
 })
 export class MonitorResultComponent {
   initialized: boolean = false;
diff --git a/src/app/search/landingPages/software/software.component.ts b/src/app/search/landingPages/software/software.component.ts
index 328bc04..3d5b210 100644
--- a/src/app/search/landingPages/software/software.component.ts
+++ b/src/app/search/landingPages/software/software.component.ts
@@ -7,9 +7,7 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
 @Component({
   selector: 'monitor-software',
   template: `
-    <div id="page_content">
-      <result-landing *ngIf="initialized" type="software" [piwikSiteId]="piwikSiteId"></result-landing>
-    </div>
+    <result-landing *ngIf="initialized" type="software" [piwikSiteId]="piwikSiteId"></result-landing>
   `,
 })
 export class MonitorSoftwareComponent {
diff --git a/src/app/search/searchPages/advanced/searchDataproviders.component.ts b/src/app/search/searchPages/advanced/searchDataproviders.component.ts
index 6852179..45fd48c 100644
--- a/src/app/search/searchPages/advanced/searchDataproviders.component.ts
+++ b/src/app/search/searchPages/advanced/searchDataproviders.component.ts
@@ -8,12 +8,10 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
 @Component({
   selector: 'monitor-advanced-search-dataproviders',
   template: `
-    <div id="page_content">
       <search-dataproviders *ngIf="initialized" [simpleView]="false"
                             [customFilter]=customFilter [hasPrefix]="false"
                             [includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink"  [piwikSiteId]="piwikSiteId">
       </search-dataproviders>
-    </div>
   `
 })
 export class MonitorAdvancedSearchDataprovidersComponent {
diff --git a/src/app/search/searchPages/advanced/searchOrganizations.component.ts b/src/app/search/searchPages/advanced/searchOrganizations.component.ts
index 024af2b..9a1cfc9 100644
--- a/src/app/search/searchPages/advanced/searchOrganizations.component.ts
+++ b/src/app/search/searchPages/advanced/searchOrganizations.component.ts
@@ -8,11 +8,9 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
 @Component({
   selector: 'monitor-advanced-search-organizations',
   template: `
-    <div id="page_content">
       <search-organizations *ngIf="initialized" [simpleView]="false" [showSwitchSearchLink]="false" [customFilter]="customFilter"
       [piwikSiteId]="piwikSiteId">
       </search-organizations>
-    </div>
   `
 })
 export class MonitorAdvancedSearchOrganizationsComponent {
diff --git a/src/app/search/searchPages/advanced/searchProjects.component.ts b/src/app/search/searchPages/advanced/searchProjects.component.ts
index 2b42f95..23c4c04 100644
--- a/src/app/search/searchPages/advanced/searchProjects.component.ts
+++ b/src/app/search/searchPages/advanced/searchProjects.component.ts
@@ -9,7 +9,6 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
 @Component({
   selector: 'monitor-advanced-search-projects',
   template: `
-    <div id="page_content">
       <search-projects *ngIf="initialized" [simpleView]="false"
                        [customFilter]=customFilter [hasPrefix]="false"
                        [includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink"
@@ -17,7 +16,6 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
                        [piwikSiteId]="piwikSiteId"
       >
       </search-projects>
-    </div>
   `
   
 })
diff --git a/src/app/search/searchPages/advanced/searchResearchResults.component.ts b/src/app/search/searchPages/advanced/searchResearchResults.component.ts
index 9d988c3..6883b18 100644
--- a/src/app/search/searchPages/advanced/searchResearchResults.component.ts
+++ b/src/app/search/searchPages/advanced/searchResearchResults.component.ts
@@ -9,7 +9,6 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
 @Component({
   selector: 'monitor-advanced-search-results',
   template: `
-    <div id="page_content">
       <search-research-results *ngIf="initialized" resultType="result" [simpleView]="false"
                                [customFilter]=customFilter [hasPrefix]="false"
                                [includeOnlyResultsAndFilter]="false"
@@ -17,7 +16,6 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
                                [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/research-outcomes'"
                                [piwikSiteId]="piwikSiteId"
       ></search-research-results>
-    </div>
   `
 })
 export class MonitorAdvancedSearchResearchResultsComponent {
diff --git a/src/app/search/searchPages/simple/searchDataproviders.component.ts b/src/app/search/searchPages/simple/searchDataproviders.component.ts
index 2bdbd82..f2e0506 100644
--- a/src/app/search/searchPages/simple/searchDataproviders.component.ts
+++ b/src/app/search/searchPages/simple/searchDataproviders.component.ts
@@ -8,12 +8,10 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
 @Component({
   selector: 'monitor-search-dataproviders',
   template: `
-    <div id="page_content">
       <search-dataproviders *ngIf="initialized"
                             [customFilter]=customFilter [hasPrefix]="false"
                             [includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink" [piwikSiteId]="piwikSiteId">
       </search-dataproviders>
-    </div>
   `
 })
 export class MonitorSearchDataprovidersComponent {
diff --git a/src/app/search/searchPages/simple/searchOrganizations.component.ts b/src/app/search/searchPages/simple/searchOrganizations.component.ts
index 44ac738..787e7d4 100644
--- a/src/app/search/searchPages/simple/searchOrganizations.component.ts
+++ b/src/app/search/searchPages/simple/searchOrganizations.component.ts
@@ -7,10 +7,8 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
 @Component({
   selector: 'monitor-search-organizations',
   template: `
-    <div id="page_content">
       <search-organizations *ngIf="initialized" [piwikSiteId]="piwikSiteId">
       </search-organizations>
-    </div>
   `
 })
 export class MonitorSearchOrganizationsComponent {
diff --git a/src/app/search/searchPages/simple/searchProjects.component.ts b/src/app/search/searchPages/simple/searchProjects.component.ts
index 42e15d0..e5ec4b1 100644
--- a/src/app/search/searchPages/simple/searchProjects.component.ts
+++ b/src/app/search/searchPages/simple/searchProjects.component.ts
@@ -9,14 +9,12 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
 @Component({
   selector: 'monitor-search-projects',
   template: `
-    <div id="page_content">
       <search-projects *ngIf="initialized"
                        [customFilter]=customFilter [hasPrefix]="false"
                        [includeOnlyResultsAndFilter]="false" 
                        [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/simple/projects'"
                        [piwikSiteId]="piwikSiteId">
       </search-projects>
-    </div>
   `
   
 })
diff --git a/src/app/search/searchPages/simple/searchResearchResults.component.ts b/src/app/search/searchPages/simple/searchResearchResults.component.ts
index 58372c7..2025210 100644
--- a/src/app/search/searchPages/simple/searchResearchResults.component.ts
+++ b/src/app/search/searchPages/simple/searchResearchResults.component.ts
@@ -9,7 +9,6 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
 @Component({
   selector: 'monitor-search-results',
   template: `
-    <div id="page_content">
       <search-research-results *ngIf="initialized" resultType="result"
                                [customFilter]=customFilter [hasPrefix]="false"
                                [includeOnlyResultsAndFilter]="false"
@@ -17,7 +16,6 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
                                [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/research-outcomes'"
                                [piwikSiteId]="piwikSiteId"
       ></search-research-results>
-    </div>
   `,
 })
 export class MonitorSearchResearchResultsComponent {
diff --git a/src/assets/dashboard-theme b/src/assets/dashboard-theme
index 4d14a0e..d4d37fc 160000
--- a/src/assets/dashboard-theme
+++ b/src/assets/dashboard-theme
@@ -1 +1 @@
-Subproject commit 4d14a0e856b7d2bd3b4ca05acb031555549b99ba
+Subproject commit d4d37fc52dd45a0cb9917403d5ce37732cab164e
diff --git a/src/assets/monitor-dashboard-custom.css b/src/assets/monitor-dashboard-custom.css
index 672ea54..4f61cee 100644
--- a/src/assets/monitor-dashboard-custom.css
+++ b/src/assets/monitor-dashboard-custom.css
@@ -1,10 +1,6 @@
-/*:root {*/
-/*  --portal-main-color: #8DCA26;*/
-/*  --portal-main-contrast: white;*/
-/*  --portal-dark-color: #7c9144;*/
 .stakeholderPage {
   /* Structure */
-  --structure-background-color: #F1F1F1;
+  --structure-page-content-background-color: #EDF1FA;
 
   /* Navbar */
   --navbar-background-image: url("~src/assets/banner.jpg");