pkp#11044 [stable-3_5_0] Display user initials on the top navbar (pkp#11066)

* pkp#11044 Assign originalUser when user is logged in as someone else

* pkp#11044 Display user initials instead of user icon in top navigation

* pkp#11044 Use var loggedInAsUser instead of originalUser

Author: blesildaramirez

classes/template/PKPTemplateManager.php

@@ -406,14 +406,22 @@ public function initialize(PKPRequest $request)
          * database is executed (e.g., when loading installer pages).
          */
         if (!PKPSessionGuard::isSessionDisable()) {
+            $loggedInAsUserId = Validation::loggedInAs();
+
             $this->assign([
                 'isUserLoggedIn' => Validation::isLoggedIn(),
-                'isUserLoggedInAs' => (bool) Validation::loggedInAs(),
+                'isUserLoggedInAs' => (bool) $loggedInAsUserId,
                 'itemsPerPage' => Config::getVar('interface', 'items_per_page'),
                 'numPageLinks' => Config::getVar('interface', 'page_links'),
                 'siteTitle' => $request->getSite()->getLocalizedData('title'),
             ]);
 
+            if ($loggedInAsUserId) {
+                $this->assign([
+                    'loggedInAsUser' => Repo::user()->get($loggedInAsUserId)
+                ]);
+            }
+
             $user = $request->getUser();
             if ($user) {
                 $unreadNotificationCount = Notification::withRead(false)

templates/layouts/backend.tpl

@@ -85,20 +85,28 @@
 					</div>
 					<dropdown class="app__headerAction app__userNav">
 						<template #button>
+							{if $isUserLoggedInAs}
+								{assign var="activeUser" value=$loggedInAsUser}
+							{else}
+								{assign var="activeUser" value=$currentUser}
+							{/if}
 							<initials-avatar
+								initials="{$activeUser->getDisplayInitials()|escape}"
 								:is-secondary="true"
 								{if $isUserLoggedInAs}
 								:is-disabled="true"
 								{/if}
 							></initials-avatar>
+							<span class="-screenReader">"{$activeUser->getData('userName')|escape}"</span>
 							{if $isUserLoggedInAs}
 								<initials-avatar
-									class="absolute right-2 top-2 rounded-full h-5 w-5"
+									initials="{$currentUser->getDisplayInitials()|escape}"
+									class="absolute right-2 top-0 rounded-full h-5 w-5"
 									:is-warnable="true"
 									:shrink="true"
 								></initials-avatar>
+								<span class="-screenReader">{$currentUser->getData('userName')|escape}</span>
 							{/if}
-							<span class="-screenReader">{$currentUser->getData('userName')}</span>
 						</template>
 						<nav aria-label="{translate key="common.navigation.user"}">
 							{if $supportedLocales|@count > 1}