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

This commit is contained in:
Konstantinos Triantafyllou 2022-03-23 15:26:35 +02:00
parent 5246ddd3be
commit 57b98cd9b5
20 changed files with 10 additions and 45 deletions

View File

@ -6,7 +6,7 @@
[class.sidebar_mini]="!open && hasSidebar" [class.stakeholderPage]="isFrontPage"> [class.sidebar_mini]="!open && hasSidebar" [class.stakeholderPage]="isFrontPage">
<navbar *ngIf="properties && hasHeader" [properties]="properties" portal="monitor_dashboard" [header]="menuHeader" <navbar *ngIf="properties && hasHeader" [properties]="properties" portal="monitor_dashboard" [header]="menuHeader"
[userMenuItems]=userMenuItems [menuItems]="menuItems" [user]="user" [offCanvasFlip]="true"></navbar> [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="stakeholder && isFrontPage && hasSidebar" [items]="sideBarItems" [activeItem]="activeTopic?activeTopic.alias:null"></dashboard-sidebar>
<dashboard-sidebar *ngIf="hasAdminMenu" [items]="adminMenuItems" [specialMenuItem]="specialSideBarMenuItem"></dashboard-sidebar> <dashboard-sidebar *ngIf="hasAdminMenu" [items]="adminMenuItems" [specialMenuItem]="specialSideBarMenuItem"></dashboard-sidebar>
<main> <main>

View File

@ -11,8 +11,7 @@ import {StakeholderUtils} from "../utils/indicator-utils";
@Component({ @Component({
selector: 'develop', selector: 'develop',
template: ` template: `
<div page-content> <div class="uk-section">
<div inner>
<div class="uk-container uk-container-large"> <div class="uk-container uk-container-large">
<h1>Help developers <br> with OpenAIRE APIs<span class="uk-text-primary">.</span></h1> <h1>Help developers <br> with OpenAIRE APIs<span class="uk-text-primary">.</span></h1>
</div> </div>
@ -112,7 +111,6 @@ import {StakeholderUtils} from "../utils/indicator-utils";
</div> </div>
</div> </div>
</div> </div>
</div>
`, `,
styleUrls: ['develop.component.css'] styleUrls: ['develop.component.css']
}) })

View File

@ -10,8 +10,7 @@ import {ActivatedRoute, Router} from "@angular/router";
@Component({ @Component({
selector: 'methodology', selector: 'methodology',
template: ` template: `
<div page-content> <div class="uk-section">
<div inner>
<div class="uk-container uk-container-large"> <div class="uk-container uk-container-large">
<h1>Terminology and <br> construction<span class="uk-text-primary">.</span></h1> <h1>Terminology and <br> construction<span class="uk-text-primary">.</span></h1>
</div> </div>
@ -221,7 +220,6 @@ import {ActivatedRoute, Router} from "@angular/router";
</div> </div>
</div> </div>
</div> </div>
</div>
`, `,
styleUrls: ['methodology.component.css'] styleUrls: ['methodology.component.css']
}) })

View File

@ -7,9 +7,7 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
@Component({ @Component({
selector: 'monitor-dataset', selector: 'monitor-dataset',
template: ` template: `
<div id="page_content"> <result-landing *ngIf="initialized" type="dataset" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></result-landing>
<result-landing *ngIf="initialized" type="dataset" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></result-landing>
</div>
`, `,
}) })
export class MonitorDatasetComponent { export class MonitorDatasetComponent {

View File

@ -7,9 +7,8 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
@Component({ @Component({
selector: 'monitor-organization', selector: 'monitor-organization',
template: ` template: `
<div id="page_content">
<organization *ngIf="initialized" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></organization> <organization *ngIf="initialized" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></organization>
</div>`, `,
}) })
export class MonitorOrganizationComponent { export class MonitorOrganizationComponent {
initialized: boolean = false; initialized: boolean = false;

View File

@ -7,9 +7,7 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
@Component({ @Component({
selector: 'monitor-orp', selector: 'monitor-orp',
template: ` template: `
<div id="page_content">
<result-landing *ngIf="initialized" type="orp" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></result-landing> <result-landing *ngIf="initialized" type="orp" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></result-landing>
</div>
`, `,
}) })

View File

@ -7,9 +7,8 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
@Component({ @Component({
selector: 'monitor-project', selector: 'monitor-project',
template: ` template: `
<div id="page_content">
<project *ngIf="initialized" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></project> <project *ngIf="initialized" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></project>
</div>`, `,
}) })
export class MonitorProjectComponent { export class MonitorProjectComponent {
initialized: boolean = false; initialized: boolean = false;

View File

@ -7,9 +7,7 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
@Component({ @Component({
selector: 'monitor-publication', selector: 'monitor-publication',
template: ` template: `
<div id="page_content">
<result-landing *ngIf="initialized" type="publication" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></result-landing> <result-landing *ngIf="initialized" type="publication" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></result-landing>
</div>
`, `,
}) })
export class MonitorPublicationComponent { export class MonitorPublicationComponent {

View File

@ -7,9 +7,8 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
@Component({ @Component({
selector: 'monitor-result', selector: 'monitor-result',
template: ` template: `
<div id="page_content">
<result-landing *ngIf="initialized" type="result" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></result-landing> <result-landing *ngIf="initialized" type="result" [communityId]="communityId" [piwikSiteId]="piwikSiteId"></result-landing>
</div>`, `,
}) })
export class MonitorResultComponent { export class MonitorResultComponent {
initialized: boolean = false; initialized: boolean = false;

View File

@ -7,9 +7,7 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
@Component({ @Component({
selector: 'monitor-software', selector: 'monitor-software',
template: ` template: `
<div id="page_content"> <result-landing *ngIf="initialized" type="software" [piwikSiteId]="piwikSiteId"></result-landing>
<result-landing *ngIf="initialized" type="software" [piwikSiteId]="piwikSiteId"></result-landing>
</div>
`, `,
}) })
export class MonitorSoftwareComponent { export class MonitorSoftwareComponent {

View File

@ -8,12 +8,10 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
@Component({ @Component({
selector: 'monitor-advanced-search-dataproviders', selector: 'monitor-advanced-search-dataproviders',
template: ` template: `
<div id="page_content">
<search-dataproviders *ngIf="initialized" [simpleView]="false" <search-dataproviders *ngIf="initialized" [simpleView]="false"
[customFilter]=customFilter [hasPrefix]="false" [customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink" [piwikSiteId]="piwikSiteId"> [includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink" [piwikSiteId]="piwikSiteId">
</search-dataproviders> </search-dataproviders>
</div>
` `
}) })
export class MonitorAdvancedSearchDataprovidersComponent { export class MonitorAdvancedSearchDataprovidersComponent {

View File

@ -8,11 +8,9 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
@Component({ @Component({
selector: 'monitor-advanced-search-organizations', selector: 'monitor-advanced-search-organizations',
template: ` template: `
<div id="page_content">
<search-organizations *ngIf="initialized" [simpleView]="false" [showSwitchSearchLink]="false" [customFilter]="customFilter" <search-organizations *ngIf="initialized" [simpleView]="false" [showSwitchSearchLink]="false" [customFilter]="customFilter"
[piwikSiteId]="piwikSiteId"> [piwikSiteId]="piwikSiteId">
</search-organizations> </search-organizations>
</div>
` `
}) })
export class MonitorAdvancedSearchOrganizationsComponent { export class MonitorAdvancedSearchOrganizationsComponent {

View File

@ -9,7 +9,6 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
@Component({ @Component({
selector: 'monitor-advanced-search-projects', selector: 'monitor-advanced-search-projects',
template: ` template: `
<div id="page_content">
<search-projects *ngIf="initialized" [simpleView]="false" <search-projects *ngIf="initialized" [simpleView]="false"
[customFilter]=customFilter [hasPrefix]="false" [customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink" [includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink"
@ -17,7 +16,6 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
[piwikSiteId]="piwikSiteId" [piwikSiteId]="piwikSiteId"
> >
</search-projects> </search-projects>
</div>
` `
}) })

View File

@ -9,7 +9,6 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
@Component({ @Component({
selector: 'monitor-advanced-search-results', selector: 'monitor-advanced-search-results',
template: ` template: `
<div id="page_content">
<search-research-results *ngIf="initialized" resultType="result" [simpleView]="false" <search-research-results *ngIf="initialized" resultType="result" [simpleView]="false"
[customFilter]=customFilter [hasPrefix]="false" [customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="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'" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/research-outcomes'"
[piwikSiteId]="piwikSiteId" [piwikSiteId]="piwikSiteId"
></search-research-results> ></search-research-results>
</div>
` `
}) })
export class MonitorAdvancedSearchResearchResultsComponent { export class MonitorAdvancedSearchResearchResultsComponent {

View File

@ -8,12 +8,10 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
@Component({ @Component({
selector: 'monitor-search-dataproviders', selector: 'monitor-search-dataproviders',
template: ` template: `
<div id="page_content">
<search-dataproviders *ngIf="initialized" <search-dataproviders *ngIf="initialized"
[customFilter]=customFilter [hasPrefix]="false" [customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink" [piwikSiteId]="piwikSiteId"> [includeOnlyResultsAndFilter]="false" [showSwitchSearchLink]="showSwitchSearchLink" [piwikSiteId]="piwikSiteId">
</search-dataproviders> </search-dataproviders>
</div>
` `
}) })
export class MonitorSearchDataprovidersComponent { export class MonitorSearchDataprovidersComponent {

View File

@ -7,10 +7,8 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
@Component({ @Component({
selector: 'monitor-search-organizations', selector: 'monitor-search-organizations',
template: ` template: `
<div id="page_content">
<search-organizations *ngIf="initialized" [piwikSiteId]="piwikSiteId"> <search-organizations *ngIf="initialized" [piwikSiteId]="piwikSiteId">
</search-organizations> </search-organizations>
</div>
` `
}) })
export class MonitorSearchOrganizationsComponent { export class MonitorSearchOrganizationsComponent {

View File

@ -9,14 +9,12 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
@Component({ @Component({
selector: 'monitor-search-projects', selector: 'monitor-search-projects',
template: ` template: `
<div id="page_content">
<search-projects *ngIf="initialized" <search-projects *ngIf="initialized"
[customFilter]=customFilter [hasPrefix]="false" [customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="false" [includeOnlyResultsAndFilter]="false"
[openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/simple/projects'" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/simple/projects'"
[piwikSiteId]="piwikSiteId"> [piwikSiteId]="piwikSiteId">
</search-projects> </search-projects>
</div>
` `
}) })

View File

@ -9,7 +9,6 @@ import {ConfigurationService} from "../../../openaireLibrary/utils/configuration
@Component({ @Component({
selector: 'monitor-search-results', selector: 'monitor-search-results',
template: ` template: `
<div id="page_content">
<search-research-results *ngIf="initialized" resultType="result" <search-research-results *ngIf="initialized" resultType="result"
[customFilter]=customFilter [hasPrefix]="false" [customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="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'" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/research-outcomes'"
[piwikSiteId]="piwikSiteId" [piwikSiteId]="piwikSiteId"
></search-research-results> ></search-research-results>
</div>
`, `,
}) })
export class MonitorSearchResearchResultsComponent { export class MonitorSearchResearchResultsComponent {

@ -1 +1 @@
Subproject commit 4d14a0e856b7d2bd3b4ca05acb031555549b99ba Subproject commit d4d37fc52dd45a0cb9917403d5ce37732cab164e

View File

@ -1,10 +1,6 @@
/*:root {*/
/* --portal-main-color: #8DCA26;*/
/* --portal-main-contrast: white;*/
/* --portal-dark-color: #7c9144;*/
.stakeholderPage { .stakeholderPage {
/* Structure */ /* Structure */
--structure-background-color: #F1F1F1; --structure-page-content-background-color: #EDF1FA;
/* Navbar */ /* Navbar */
--navbar-background-image: url("~src/assets/banner.jpg"); --navbar-background-image: url("~src/assets/banner.jpg");