hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-17 06:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

57053: added menu preview

Browse Source
This commit is contained in:
lotte
2018-12-07 17:06:44 +01:00
parent 38652b7a6a
commit c0a4fdc797
21 changed files with 179 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/+admin/admin-sidebar/admin-sidebar.component.ts
View File

@@ -8,7 +8,8 @@ import { MenuComponent } from '../../shared/menu/menu.component';
import { TextSectionTypeModel } from '../../shared/menu/models/section-types/text.model';
import { LinkSectionTypeModel } from '../../shared/menu/models/section-types/link.model';
import { AuthService } from '../../core/auth/auth.service';
import { first } from 'rxjs/operators';
import { first, map } from 'rxjs/operators';
import { combineLatest as combineLatestObservable } from 'rxjs';
@Component({
selector: 'ds-admin-sidebar',
@@ -19,8 +20,9 @@ import { first } from 'rxjs/operators';
export class AdminSidebarComponent extends MenuComponent implements OnInit {
menuID = MenuID.ADMIN;
sidebarWidth: Observable<string>;
sidebarOpen = true;
sidebarClosed = !this.sidebarOpen;
sidebarOpen = true; // Open in UI, animation finished
sidebarClosed = !this.sidebarOpen; // Closed in UI, animation finished
sidebarExpanded: Observable<boolean>;
constructor(protected menuService: MenuService,
protected injector: Injector,
@@ -33,7 +35,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
ngOnInit(): void {
this.createMenu();
super.ngOnInit();
this.sidebarWidth = this.variableService.getVariable('adminSidebarWidth');
this.sidebarWidth = this.variableService.getVariable('sidebarItemsWidth');
this.authService.isAuthenticated()
.subscribe((loggedIn: boolean) => {
if (loggedIn) {
@@ -44,7 +46,11 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
.subscribe((collapsed: boolean) => {
this.sidebarOpen = !collapsed;
this.sidebarClosed = collapsed;
})
});
this.sidebarExpanded = combineLatestObservable(this.menuCollapsed, this.menuPreviewCollapsed)
.pipe(
map(([collapsed, previewCollapsed]) => (!collapsed || !previewCollapsed))
);
}
createMenu() {
@@ -431,5 +437,4 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
this.sidebarOpen = true;
}
}
}