Remove page-content from pages of monitor dashboard except monitor.component.ts

2022-03-23 15:26:35 +02:00 · 2022-03-23 15:26:35 +02:00 · 57b98cd9b5
parent 5246ddd3be
commit 57b98cd9b5
20 changed files with 10 additions and 45 deletions
--- 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>
--- 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']
 })
--- 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']
 })
--- 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>
  `,
 })
 export class MonitorDatasetComponent {
--- 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;
--- 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>
  `,
 })

--- 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;
--- 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 {
--- 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;
--- 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>
  `,
 })
 export class MonitorSoftwareComponent {
--- 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 {
--- 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 {
--- 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>
  `
  
 })
--- 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 {
--- 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 {
--- 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 {
--- 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>
  `
  
 })
--- 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 {
--- a/src/assets/dashboard-theme
+++ b/src/assets/dashboard-theme
@ -1 +1 @@
-Subproject commit 4d14a0e856b7d2bd3b4ca05acb031555549b99ba
+Subproject commit d4d37fc52dd45a0cb9917403d5ce37732cab164e
--- 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");