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

Add target condition in urls of user menu. Fix height of notification list

This commit is contained in:
Konstantinos Triantafyllou 2022-06-29 14:33:21 +03:00
parent bbbb711865
commit 13ef173406
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
login/userMini.component.ts
View File

@ -21,15 +21,15 @@ import {UserManagementService} from "../services/user-management.service";
</text>
</svg>
</a>
<div class="uk-navbar-dropdown" uk-drop="pos: bottom-right">
<div class="uk-navbar-dropdown uk-dropdown" uk-dropdown="pos: bottom-right">
<ul class="uk-nav uk-navbar-dropdown-nav">
<ng-container *ngFor="let item of userMenuItems ">
<li *ngIf="item.needsAuthorization && isAuthorized || !item.needsAuthorization"
[class.uk-active]="isTheActiveSubMenu(item)">
<a *ngIf="item.route.length > 0" [routerLink]="item.route"
<a *ngIf="item.route" [routerLink]="item.route"
[queryParams]="item.params">{{item.title}}</a>
<a *ngIf="item.route.length == 0 && item.url.length > 0" href="{{item.url}}"
target="_blank">{{item.title}}</a>
<a *ngIf="!item.route && item.url" [href]="item.url" [class.custom-external]="item.target != '_self'"
[target]="item.target">{{item.title}}</a>
</li>
</ng-container>
<li *ngIf="userMenuItems.length > 0" class="uk-nav-divider"></li>
@ -54,9 +54,9 @@ import {UserManagementService} from "../services/user-management.service";
<ul *ngIf="loggedIn" class="uk-nav-sub">
<ng-container *ngFor="let item of userMenuItems ">
<li *ngIf="item.needsAuthorization && isAuthorized || !item.needsAuthorization">
<a *ngIf="item.route.length > 0" routerLink="{{item.route}}" (click)="closeCanvas()">{{item.title}}</a>
<a *ngIf="item.route.length == 0 && item.url.length > 0" (click)="closeCanvas()"
href="{{item.url}}">{{item.title}}</a>
<a *ngIf="item.route" [routerLink]="item.route" (click)="closeCanvas()">{{item.title}}</a>
<a *ngIf="!item.route && item.url" (click)="closeCanvas()" [href]="item.url" [class.custom-external]="item.target != '_self'"
[target]="item.target">{{item.title}}</a>
</li>
</ng-container>
<li *ngIf="userMenuItems.length > 0" class="uk-nav-divider"></li>

2
notifications/notifications-sidebar/notification-sidebar.component.less
View File

@ -17,7 +17,7 @@
#notifications .notification-list ul {
overflow: auto;
padding: 20px @global-medium-gutter 20px 0;
height: calc(100% - 77px);
height: calc(100% - 104px);
}
#notifications .notification-list ul > li:nth-child(n+2){