diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
index edfc4bb8ee0..b691cfb3f9e 100644
--- a/src/app/navbar/navbar.component.html
+++ b/src/app/navbar/navbar.component.html
@@ -6,7 +6,7 @@
-
-
+
-
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
index bbc4fa3ca70..f3ae261ca7f 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
@@ -22,7 +22,7 @@
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
index 58a1edfabde..0b9ea6ef4b4 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
@@ -248,7 +248,7 @@ describe('AuthNavMenuComponent', () => {
component = null;
});
it('should render UserMenuComponent component', () => {
- const logoutDropdownMenu = deNavMenuItem.query(By.css('ds-user-menu'));
+ const logoutDropdownMenu = deNavMenuItem.query(By.css('ds-themed-user-menu'));
expect(logoutDropdownMenu.nativeElement).toBeDefined();
});
});
diff --git a/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts b/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts
new file mode 100644
index 00000000000..9dafe6c4261
--- /dev/null
+++ b/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts
@@ -0,0 +1,33 @@
+import {Component, Input} from '@angular/core';
+import {ThemedComponent} from '../../theme-support/themed.component';
+import {UserMenuComponent} from './user-menu.component';
+
+/**
+ * This component represents the user nav menu.
+ */
+@Component({
+ selector: 'ds-themed-user-menu',
+ templateUrl: './../../theme-support/themed.component.html',
+ styleUrls: []
+})
+export class ThemedUserMenuComponent extends ThemedComponent{
+
+ /**
+ * The input flag to show user details in navbar expandable menu
+ */
+ @Input() inExpandableNavbar: boolean;
+
+ protected inAndOutputNames: (keyof UserMenuComponent & keyof this)[] = ['inExpandableNavbar'];
+
+ protected getComponentName(): string {
+ return 'UserMenuComponent';
+ }
+
+ protected importThemedComponent(themeName: string): Promise {
+ return import((`../../../../themes/${themeName}/app/shared/auth-nav-menu/user-menu/user-menu.component`));
+ }
+
+ protected importUnthemedComponent(): Promise {
+ return import('./user-menu.component');
+ }
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index e3a238670d8..1345ac6607e 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -281,6 +281,7 @@ import {
} from '../item-page/simple/field-components/specific-field/title/themed-item-page-field.component';
import { BitstreamListItemComponent } from './object-list/bitstream-list-item/bitstream-list-item.component';
import { NgxPaginationModule } from 'ngx-pagination';
+import { ThemedUserMenuComponent } from './auth-nav-menu/user-menu/themed-user-menu.component';
import { ThemedLangSwitchComponent } from './lang-switch/themed-lang-switch.component';
const MODULES = [
@@ -330,6 +331,7 @@ const COMPONENTS = [
AuthNavMenuComponent,
ThemedAuthNavMenuComponent,
UserMenuComponent,
+ ThemedUserMenuComponent,
DsSelectComponent,
ErrorComponent,
LangSwitchComponent,
diff --git a/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.html b/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.scss b/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.ts b/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
new file mode 100644
index 00000000000..f9f1db65ee6
--- /dev/null
+++ b/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { UserMenuComponent as BaseComponent } from '../../../../../../app/shared/auth-nav-menu/user-menu/user-menu.component';
+
+/**
+ * Component representing the {@link UserMenuComponent} of a page
+ */
+@Component({
+ selector: 'ds-user-menu',
+ // templateUrl: 'user-menu.component.html',
+ templateUrl: '../../../../../../app/shared/auth-nav-menu/user-menu/user-menu.component.html',
+ // styleUrls: ['user-menu.component.scss'],
+ styleUrls: ['../../../../../../app/shared/auth-nav-menu/user-menu/user-menu.component.scss'],
+})
+export class UserMenuComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index edb3f5478c9..937e174b7f8 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -156,6 +156,7 @@ import { ItemStatusComponent } from './app/item-page/edit-item-page/item-status/
import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
import { FormModule } from '../../app/shared/form/form.module';
import { RequestCopyModule } from 'src/app/request-copy/request-copy.module';
+import {UserMenuComponent} from './app/shared/auth-nav-menu/user-menu/user-menu.component';
const DECLARATIONS = [
FileSectionComponent,
@@ -239,6 +240,7 @@ const DECLARATIONS = [
SubmissionSectionUploadFileComponent,
ItemStatusComponent,
EditBitstreamPageComponent,
+ UserMenuComponent,
];
@NgModule({