From 47989aead436efb4a6b72200aa87bc1e6ef5c9b2 Mon Sep 17 00:00:00 2001
From: "argiro.kokogiannaki"
 <argiro.kokogiannaki@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Wed, 23 Jan 2019 09:02:02 +0000
Subject: [PATCH] Navigation bar: Change the checks for the root menu item,
 show only the text if there are required routes (not null)

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54623 d315682c-612b-4755-9ff5-7f18f6832af3
---
 sharedComponents/navigationBar.component.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sharedComponents/navigationBar.component.html b/sharedComponents/navigationBar.component.html
index 3dcca21d..e9d65df1 100644
--- a/sharedComponents/navigationBar.component.html
+++ b/sharedComponents/navigationBar.component.html
@@ -45,9 +45,10 @@
                       <ng-container *ngFor="let menu of menuItems">
                       <li class="uk-nav-header uk-parent" *ngIf="isAtleastOneEnabled(menu.rootItem.entitiesRequired,showEntity) && isAtleastOneEnabled(menu.rootItem.routeRequired, showPage)">
                          <!--a routerLinkActive="uk-link" routerLink="{{menu.rootItem.route}}"  [queryParams]=menu.rootItem.params class="uk-offcanvas-close custom-offcanvas-close">{{menu.rootItem.title}}</a-->
-                         <a *ngIf="menu.rootItem.route.length > 0 && isEnabled([menu.rootItem.route], showPage)" routerLinkActive="uk-link" routerLink="{{menu.rootItem.route}}"  [queryParams]=menu.rootItem.params class="uk-offcanvas-close custom-offcanvas-close">{{menu.rootItem.title}}</a>
+                         <a *ngIf="menu.rootItem.route.length > 0 && isEnabled([menu.rootItem.route], showPage) || !menu.rootItem.routeRequired )" routerLinkActive="uk-link" routerLink="{{menu.rootItem.route}}"  [queryParams]=menu.rootItem.params class="uk-offcanvas-close custom-offcanvas-close">{{menu.rootItem.title}}</a>
                          <a *ngIf="menu.rootItem.route.length == 0 && menu.rootItem.url.length > 0" routerLinkActive="uk-link"  href="{{menu.rootItem.url}}" target="_blank" class="uk-offcanvas-close custom-offcanvas-close">{{menu.rootItem.title}}</a>
-                        <a *ngIf="(menu.rootItem.route.length == 0 && menu.rootItem.url.length == 0) || (!isEnabled([menu.rootItem.route], showPage) && isAtleastOneEnabled(menu.rootItem.routeRequired, showPage))"   class="uk-offcanvas-close custom-offcanvas-close">{{menu.rootItem.title}}</a>
+                        <a *ngIf="(menu.rootItem.route.length == 0 && menu.rootItem.url.length == 0) ||  menu.rootItem.route.length >0 && menu.rootItem.routeRequired && !isEnabled([menu.rootItem.route], showPage) && isAtleastOneEnabled(menu.rootItem.routeRequired, showPage))"   class="uk-offcanvas-close custom-offcanvas-close">{{menu.rootItem.title}}</a>
+
                          <ul class="uk-nav-sub">
                            <ng-container *ngFor="let submenu of menu.items">
                               <li   *ngIf="isEnabled(submenu.entitiesRequired,showEntity) && isEnabled(submenu.routeRequired, showPage)  && (submenu.route.length > 0 || submenu.url.length > 0)">
@@ -141,9 +142,9 @@
                  <ng-container *ngFor="let menu of menuItems">
                    <li class="uk-parent" *ngIf="isAtleastOneEnabled(menu.rootItem.entitiesRequired,showEntity) && isAtleastOneEnabled(menu.rootItem.routeRequired, showPage)">
                       <!--a routerLinkActive="uk-link" routerLink="{{menu.rootItem.route}}"   [queryParams]=menu.rootItem.params class="" aria-expanded="false">{{menu.rootItem.title}}</a-->
-                      <a *ngIf="menu.rootItem.route.length > 0 && isEnabled([menu.rootItem.route], showPage)" routerLinkActive="uk-link" routerLink="{{menu.rootItem.route}}"  [queryParams]=menu.rootItem.params >{{menu.rootItem.title}}</a>
+                      <a *ngIf="menu.rootItem.route.length > 0 && (isEnabled([menu.rootItem.route], showPage) || !menu.rootItem.routeRequired )" routerLinkActive="uk-link" routerLink="{{menu.rootItem.route}}"  [queryParams]=menu.rootItem.params > {{menu.rootItem.title}}</a>
                       <a *ngIf="menu.rootItem.route.length == 0 && menu.rootItem.url.length > 0" routerLinkActive="uk-link"  href="{{menu.rootItem.url}}" target="_blank"  aria-expanded="false">{{menu.rootItem.title}}</a>
-                      <a *ngIf="(menu.rootItem.route.length == 0 && menu.rootItem.url.length == 0) || ( menu.rootItem.route.length >0 && !isEnabled([menu.rootItem.route], showPage) && isAtleastOneEnabled(menu.rootItem.routeRequired, showPage)) "   class="uk-offcanvas-close custom-offcanvas-close">{{menu.rootItem.title}}</a>
+                      <a *ngIf="(menu.rootItem.route.length == 0 && menu.rootItem.url.length == 0) || ( menu.rootItem.route.length >0 && menu.rootItem.routeRequired && !isEnabled([menu.rootItem.route], showPage) && isAtleastOneEnabled(menu.rootItem.routeRequired, showPage)) "   class="uk-offcanvas-close custom-offcanvas-close">{{menu.rootItem.title}}</a>
 
 
                       <div *ngIf="menu.items.length > 0" class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 0px;" id="{{menu.rootItem.id}}" (click)="onClick(menu.rootItem.id)">