MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Navigation Bar: Remove link and routes from parent items in mobile-menu. Add search-input in mobile menu.

This commit is contained in:
Konstantinos Triantafyllou 2023-07-06 16:57:40 +03:00
parent 2c7e3794c5
commit 87e75bca00
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sharedComponents/navigationBar.component.html
View File

@ -41,12 +41,12 @@
*ngIf="isAtleastOneEnabled(menu.entitiesRequired,showEntity) && isAtleastOneEnabled(menu.routeRequired, showPage)"> *ngIf="isAtleastOneEnabled(menu.entitiesRequired,showEntity) && isAtleastOneEnabled(menu.routeRequired, showPage)">
<!--a routerLink="{{menu.rootItem.route}}" [queryParams]=menu.rootItem.params class="uk-offcanvas-close custom-offcanvas-close">{{menu.rootItem.title}}</a--> <!--a routerLink="{{menu.rootItem.route}}" [queryParams]=menu.rootItem.params class="uk-offcanvas-close custom-offcanvas-close">{{menu.rootItem.title}}</a-->
<a *ngIf="menu.route && (isEnabled([menu.route], showPage) || !menu.routeRequired)" <a *ngIf="menu.route && (isEnabled([menu.route], showPage) || !menu.routeRequired)"
routerLink="{{menu.route}}" (click)="menu.items.length === 0?closeCanvas(canvas):null" [routerLink]="menu.items.length === 0?menu.route:null" (click)="menu.items.length === 0?closeCanvas(canvas):null"
[queryParams]="menu.params" [queryParams]="menu.params"
[fragment]="menu.fragment">{{menu.title}}</a> [fragment]="menu.fragment">{{menu.title}}</a>
<a *ngIf="!menu.route && menu.url" <a *ngIf="!menu.route && menu.url"
href="{{menu.url}}" (click)="menu.items.length === 0?closeCanvas(canvas):null" [class.custom-external]="menu.target != '_self'" [href]="menu.items.length === 0?menu.url:null" (click)="menu.items.length === 0?closeCanvas(canvas):null"
target="{{menu.target}}">{{menu.title}}</a> [class.custom-external]="menu.target != '_self'" [target]="menu.target">{{menu.title}}</a>
<a *ngIf="(!menu.route && !menu.url) || <a *ngIf="(!menu.route && !menu.url) ||
(menu.route && menu.routeRequired && !isEnabled([menu.route], showPage) (menu.route && menu.routeRequired && !isEnabled([menu.route], showPage)
&& isAtleastOneEnabled(menu.routeRequired, showPage))" && isAtleastOneEnabled(menu.routeRequired, showPage))"
@ -144,6 +144,9 @@
<ng-content select="[extra-s]"></ng-content> <ng-content select="[extra-s]"></ng-content>
</ng-container> </ng-container>
</ul> </ul>
<div *ngIf="hasSearchBar" search-input [(value)]="keyword" placeholder="Search"
[searchInputClass]="'flat background small-vertical'" (searchEmitter)="goTo(canvas)"
class="uk-width-1-1 uk-padding-small uk-margin-medium-top"></div>
</div> </div>
</div> </div>
</div> </div>
@ -170,7 +173,7 @@
<ng-container *ngIf="!activeHeader.menuPosition || activeHeader.menuPosition === 'center'"> <ng-container *ngIf="!activeHeader.menuPosition || activeHeader.menuPosition === 'center'">
<ng-container *ngTemplateOutlet="mainMenu"></ng-container> <ng-container *ngTemplateOutlet="mainMenu"></ng-container>
</ng-container> </ng-container>
<div *ngIf="searchMode" #search_input search-input [(value)]="keyword" placeholder="Search in Explore" <div *ngIf="searchMode" #search_input search-input [(value)]="keyword" placeholder="Search"
[searchInputClass]="'flat background small-vertical'" (searchEmitter)="goTo()" [searchInputClass]="'flat background small-vertical'" (searchEmitter)="goTo()"
class="uk-width-large@l uk-width-medium uk-width-xlarge@xl"></div> class="uk-width-large@l uk-width-medium uk-width-xlarge@xl"></div>
</div> </div>

5
sharedComponents/navigationBar.component.ts
View File

@ -243,7 +243,7 @@ export class NavigationBarComponent implements OnInit, OnDestroy, OnChanges {
this.search_input.input.focus(true); this.search_input.input.focus(true);
} }
goTo() { goTo(canvas = null) {
let parameterNames = []; let parameterNames = [];
let parameterValues = []; let parameterValues = [];
@ -259,5 +259,8 @@ export class NavigationBarComponent implements OnInit, OnDestroy, OnChanges {
parameterValues.push("q"); parameterValues.push("q");
} }
this.router.navigate([this.properties.searchLinkToAll], {queryParams: this.routerHelper.createQueryParams(parameterNames, parameterValues)}); this.router.navigate([this.properties.searchLinkToAll], {queryParams: this.routerHelper.createQueryParams(parameterNames, parameterValues)});
if(canvas) {
this.closeCanvas(canvas);
}
} }
} }