<my-hotkeys-cheatsheet></my-hotkeys-cheatsheet>
-<div [ngClass]="{ 'user-logged-in': isUserLoggedIn(), 'user-not-logged-in': !isUserLoggedIn() }">
+<div class="peertube-container" [ngClass]="{ 'user-logged-in': isUserLoggedIn(), 'user-not-logged-in': !isUserLoggedIn() }">
<div class="header">
- <div class="top-left-block" [ngClass]="{ 'border-bottom': isMenuDisplayed === false }">
- <span class="icon icon-menu" (click)="toggleMenu()"></span>
+ <div class="top-left-block">
+ <span class="icon icon-menu" (click)="menu.toggleMenu()"></span>
- <a class="peertube-title" [routerLink]="defaultRoute" title="Homepage">
+ <a class="peertube-title" [routerLink]="defaultRoute">
<span class="icon icon-logo"></span>
<span class="instance-name">{{ instanceName }}</span>
</a>
</div>
- <div class="header-right" [ngClass]="{ 'border-bottom': isMenuDisplayed === false }">
- <my-header></my-header>
+ <div class="header-right">
+ <my-header class="w-100 d-flex justify-content-end"></my-header>
</div>
</div>
<div class="sub-header-container">
- <my-menu *ngIf="isMenuDisplayed"></my-menu>
+ <my-menu *ngIf="menu.isMenuDisplayed"></my-menu>
- <div id="content" tabindex="-1" class="main-col container-fluid" [ngClass]="{ expanded: isMenuDisplayed === false }">
+ <div id="content" tabindex="-1" class="main-col" [ngClass]="{ expanded: menu.isMenuDisplayed === false }">
<div class="main-row">
+
+ <div *ngIf="broadcastMessage" class="broadcast-message alert" [ngClass]="broadcastMessage.class">
+ <div [innerHTML]="broadcastMessage.message"></div>
+
+ <my-global-icon
+ *ngIf="broadcastMessage.dismissable" (click)="hideBroadcastMessage()"
+ iconName="cross" role="button" title="Close this message" i18n-title
+ ></my-global-icon>
+ </div>
+
<router-outlet></router-outlet>
</div>
-
- <footer class="row">
- <a href="https://joinpeertube.org" title="PeerTube website" target="_blank" rel="noopener noreferrer">PeerTube v{{ serverVersion }}{{ serverCommit }}</a> -
- <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" title="PeerTube license" target="_blank" rel="noopener noreferrer">CopyLeft 2015-2019</a>
- </footer>
</div>
</div>
</div>
-<ngx-loading-bar [includeSpinner]="false"></ngx-loading-bar>
+<ngx-loading-bar [includeSpinner]="false" color="var(--mainColor)"></ngx-loading-bar>
<my-confirm></my-confirm>
<my-welcome-modal #welcomeModal></my-welcome-modal>
<my-instance-config-warning-modal #instanceConfigWarningModal></my-instance-config-warning-modal>
</ng-template>
+
+<my-custom-modal #customModal></my-custom-modal>