Merge branch 'master-3.0' into enhancement/1354

This commit is contained in:
Jeremy Grossmann
2022-07-23 00:52:38 +02:00
committed by GitHub
553 changed files with 10566 additions and 3757 deletions

View File

@ -2,19 +2,19 @@
<mat-toolbar color="primary">
<button mat-icon-button><mat-icon svgIcon="gns3"></mat-icon></button>
<button mat-button routerLink="/servers">Servers</button>
<button mat-button routerLink="/controllers">Controllers</button>
<button *ngIf="!recentlyOpenedProjectId && serverIdProjectList" mat-button (click)="listProjects()">
<button *ngIf="!recentlyOpenedProjectId && controllerIdProjectList" mat-button (click)="listProjects()">
Projects
</button>
<button *ngIf="recentlyOpenedProjectId && recentlyOpenedServerId && !isLoginPage" mat-button (click)="backToProject()">
<button *ngIf="recentlyOpenedProjectId && recentlyOpenedcontrollerId && !isLoginPage" mat-button (click)="backToProject()">
Back to project
</button>
<span class="fill-space"></span>
<button mat-button *ngIf="!isLoginPage" [matMenuTriggerFor]="menu">
<button mat-button *ngIf="!isLoginPage && router.url !='/controllers'" [matMenuTriggerFor]="menu">
<mat-icon>more_vert</mat-icon>
</button>
@ -35,23 +35,28 @@
<mat-icon>settings</mat-icon>
<span>Settings</span>
</button>
<button mat-menu-item routerLink="/user_management">
<button mat-menu-item
[disabled]="!controllerId"
[routerLink]="['controller', controllerId, 'management', 'users']">
<mat-icon>groups</mat-icon>
<span>User management</span>
<span>Management</span>
</button>
<button mat-menu-item routerLink="/help">
<mat-icon>help</mat-icon>
<span>Help</span>
</button>
<button mat-menu-item (click)="goToUserInfo()">
<button
[disabled]="!controllerId"
[routerLink]="['/controller', controllerId, 'loggeduser']"
mat-menu-item>
<mat-icon>person</mat-icon>
<span>User info</span>
</button>
<button mat-menu-item (click)="goToDocumentation()">
<button [disabled]="!controllerId" mat-menu-item (click)="goToDocumentation()">
<mat-icon>person</mat-icon>
<span>API documentation</span>
</button>
<button mat-menu-item (click)="logout()">
<button mat-menu-item [disabled]="!controllerId" (click)="logout()">
<mat-icon>highlight_off</mat-icon>
<span>Logout</span>
</button>
@ -63,4 +68,4 @@
<app-progress></app-progress>
<footer class="footer mat-app-background">GNS3 Web UI &copy; 2021 - v{{ uiVersion }}</footer>
<footer class="footer mat-app-background">GNS3 Web UI &copy; 2022 - v{{ uiVersion }}</footer>