From 13ef1734063f5331eaad586cf874a5b0f3f30521 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Wed, 29 Jun 2022 14:33:21 +0300
Subject: [PATCH] Add target condition in urls of user menu. Fix height of
 notification list

---
 login/userMini.component.ts                        | 14 +++++++-------
 .../notification-sidebar.component.less            |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/login/userMini.component.ts b/login/userMini.component.ts
index 74cfaf2e..1b5feabd 100644
--- a/login/userMini.component.ts
+++ b/login/userMini.component.ts
@@ -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>
diff --git a/notifications/notifications-sidebar/notification-sidebar.component.less b/notifications/notifications-sidebar/notification-sidebar.component.less
index 48553951..ca48bd96 100644
--- a/notifications/notifications-sidebar/notification-sidebar.component.less
+++ b/notifications/notifications-sidebar/notification-sidebar.component.less
@@ -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){