[Connect & Library | new-theme]: Breadcrumbs position updated in html pages | Bug fix in custom menu items | In search menu, use OpenaireEntities.
1. app.component.ts: In search menu, use OpenaireEntities. 2. navigationBar.component.ts: [Bug fix] In method "isTheActiveMenu()", update condition to "if(menu instanceof MenuItem || !menu.rootItem)" - custom menu items via admin tools are MenuItems but not instanceof MenuItem. 3. projectsPage.component.ts & nationalBulletinsPage.component.ts & contentPage.component.ts: Margins & paddings updated, so that breadcrumb is at the same position on all pages.
This commit is contained in:
parent
1ece24fac9
commit
1e6bd99fa2
|
@ -28,6 +28,7 @@ import {AlertModal} from "./openaireLibrary/utils/modal/alert";
|
|||
import {QuickContactComponent} from "./openaireLibrary/sharedComponents/quick-contact/quick-contact.component";
|
||||
import {Composer} from "./openaireLibrary/utils/email/composer";
|
||||
import {NotificationHandler} from "./openaireLibrary/utils/notification-handler";
|
||||
import {OpenaireEntities} from "./openaireLibrary/utils/properties/searchFields";
|
||||
|
||||
@Component({
|
||||
selector: 'app-root',
|
||||
|
@ -280,9 +281,9 @@ export class AppComponent implements OnInit, OnDestroy {
|
|||
{
|
||||
rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {}),
|
||||
items: [
|
||||
new MenuItem("", "Research outcomes", "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {resultbestaccessright: '"' + encodeURIComponent("Open Access") + '"'}),
|
||||
new MenuItem("", "Projects", "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}),
|
||||
new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}),
|
||||
new MenuItem("", OpenaireEntities.RESULTS, "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {resultbestaccessright: '"' + encodeURIComponent("Open Access") + '"'}),
|
||||
new MenuItem("", OpenaireEntities.PROJECTS, "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}),
|
||||
new MenuItem("", OpenaireEntities.DATASOURCES, "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}),
|
||||
]
|
||||
});
|
||||
this.menuItems.push(
|
||||
|
|
|
@ -4,9 +4,9 @@ import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.compo
|
|||
@Component({
|
||||
selector: 'content',
|
||||
template: `
|
||||
<div class="">
|
||||
<div class="uk-section uk-background-norepeat uk-section-overlap uk-padding-remove-vertical">
|
||||
<breadcrumbs addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top" [breadcrumbs]="breadcrumbs"></breadcrumbs>
|
||||
<div class="uk-container uk-container-large uk-section uk-section-small uk-padding-remove-bottom">
|
||||
<div class="uk-padding-small uk-padding-remove-horizontal">
|
||||
<breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
|
||||
</div>
|
||||
<html-page description="Sources and methodology" pageTitle="Sources and methodology"></html-page>
|
||||
</div>
|
||||
|
|
|
@ -4,9 +4,9 @@ import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.co
|
|||
@Component({
|
||||
selector: 'national-bulletin',
|
||||
template: `
|
||||
<div class="">
|
||||
<div class="uk-section uk-background-norepeat uk-section-overlap uk-padding-remove-vertical">
|
||||
<breadcrumbs addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top" [breadcrumbs]="breadcrumbs"></breadcrumbs>
|
||||
<div class="uk-container uk-container-large uk-section uk-section-small uk-padding-remove-bottom">
|
||||
<div class="uk-padding-small uk-padding-remove-horizontal">
|
||||
<breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
|
||||
</div>
|
||||
<html-page description="National Bulletins" pageTitle="National Bulletins"></html-page>
|
||||
</div>
|
||||
|
|
|
@ -4,10 +4,9 @@ import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.co
|
|||
@Component({
|
||||
selector: 'projects',
|
||||
template: `
|
||||
<div class="">
|
||||
<div class="uk-section uk-background-norepeat uk-section-overlap uk-padding-remove-vertical">
|
||||
<breadcrumbs addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top"
|
||||
[breadcrumbs]="breadcrumbs"></breadcrumbs>
|
||||
<div class="uk-container uk-container-large uk-section uk-section-small uk-padding-remove-bottom">
|
||||
<div class="uk-padding-small uk-padding-remove-horizontal">
|
||||
<breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
|
||||
</div>
|
||||
<html-page description="Projects and funding Opportunities" pageTitle="Projects and funding Opportunities"></html-page>
|
||||
</div>
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 0c4df8a34dd4f518353c5924238eca9d2cf0a91e
|
||||
Subproject commit bbce674da9073de8767b6c0ce25a3a72f9294812
|
Loading…
Reference in New Issue