From 0be362e6467b11e3e9a3681954f4d481a2db5d9e Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Wed, 25 Oct 2023 15:16:39 +0300
Subject: [PATCH] [angular-16 | DONE | CHANGED]: Make dashboard-sidebar sticky
 instead of fixed.

---
 src/app/app.component.html | 18 +++++++++---------
 src/app/openaireLibrary    |  2 +-
 src/assets/common-assets   |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/app/app.component.html b/src/app/app.component.html
index 3d850d9..78a4651 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -2,23 +2,23 @@
   <loading [full]="true"></loading>
 </div>
 <div *ngIf="!loading" [class.monitor]="isFrontPage">
-  <div  class="sidebar_main_swipe uk-background-default" [class.sidebar_main_active]="open && (hasSidebar || hasAdminMenu || hasInternalSidebar)"
-       [class.sidebar_mini]="!open &&  (hasSidebar || hasAdminMenu || hasInternalSidebar)" [class.sidebar_hover]="hover">
-    <div id="modal-container"></div>
+  <div id="modal-container"></div>
+  <navbar *ngIf="hasHeader" portal="monitor_dashboard" [header]="menuHeader" [userMenuItems]=userMenuItems [menuItems]="menuItems" [user]="user"
+          [notificationConfiguration]="isMobile && user && notificationGroupsInitialized?notificationConfiguration:null"></navbar>
+  <div>
     <ng-container *ngIf="!isHidden">
-      <navbar *ngIf="hasHeader" portal="monitor_dashboard" [header]="menuHeader" [userMenuItems]=userMenuItems [menuItems]="menuItems" [user]="user"
-              [notificationConfiguration]="isMobile && user && notificationGroupsInitialized?notificationConfiguration:null"></navbar>
-      <div>
+      <div class="sidebar_main_swipe uk-flex uk-background-default" [class.sidebar_main_active]="open && (hasSidebar || hasAdminMenu || hasInternalSidebar)"
+           [class.sidebar_mini]="!open &&  (hasSidebar || hasAdminMenu || hasInternalSidebar)" [class.sidebar_hover]="hover">
         <dashboard-sidebar *ngIf="stakeholder && isFrontPage && hasSidebar && !hasInternalSidebar" queryParamsHandling="merge" [items]="sideBarItems"
                            [activeItem]="activeTopic?activeTopic.alias:null" [activeSubItem]="activeCategory?activeCategory.alias:null"></dashboard-sidebar>
         <dashboard-sidebar *ngIf="hasAdminMenu && !hasInternalSidebar" [items]="adminMenuItems" [backItem]="backItem"></dashboard-sidebar>
         <main>
           <router-outlet></router-outlet>
         </main>
-        <bottom id="bottom" *ngIf="isFrontPage" [centered]="true" [properties]="properties" [showMenuItems]="true"></bottom>
-        <notification-sidebar *ngIf="!isMobile && user && notificationGroupsInitialized" [configuration]="notificationConfiguration" [user]="user"></notification-sidebar>
-        <cache-indicators *ngIf="stakeholder && !isFrontPage && isCurator()" [alias]="stakeholder.alias"></cache-indicators>
       </div>
+      <bottom id="bottom" *ngIf="isFrontPage" [centered]="true" [properties]="properties" [showMenuItems]="true"></bottom>
+      <notification-sidebar *ngIf="!isMobile && user && notificationGroupsInitialized" [configuration]="notificationConfiguration" [user]="user"></notification-sidebar>
+      <cache-indicators *ngIf="stakeholder && !isFrontPage && isCurator()" [alias]="stakeholder.alias"></cache-indicators>
       <div *ngIf="view" class="preview uk-text-small uk-flex uk-flex-middle">
         <span>You are currently in a <span class="uk-text-bold">"Preview"</span> mode. <span class="uk-visible@m"><a (click)="removeView()">The current view</a> of this dashboard may differ.</span></span>
       </div>
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 8647136..660387b 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 864713680315a5c9bf0cf4323b428547e04db957
+Subproject commit 660387b8da13f36a656d7965a0147d7302fb3749
diff --git a/src/assets/common-assets b/src/assets/common-assets
index 9e58421..0a58acb 160000
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit 9e58421a1adf3fbeb361e21616feaea8c7f867af
+Subproject commit 0a58acbbd45074327642e132cd7deae31188a978