X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.html;h=5fefffaf49d765d1bbf5a5f5993362c29bad6dc4;hb=476ce1d7f42701cb2ce456b52c27a23ccfcef6d4;hp=d5fec61e6aae7ebb541b96c861bcb2a4b8d11cd1;hpb=3b20bdd6dc7402b0723e038c57f0606131e20e54;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index d5fec61e6..5fefffaf4 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -2,19 +2,21 @@
 
 <my-hotkeys-cheatsheet></my-hotkeys-cheatsheet>
 
-<div [ngClass]="{ 'user-logged-in': isUserLoggedIn(), 'user-not-logged-in': !isUserLoggedIn() }">
-  <div class="header">
+<div class="peertube-container" [ngClass]="{ 'user-logged-in': isUserLoggedIn(), 'user-not-logged-in': !isUserLoggedIn() }">
+  <div class="root-header">
 
-    <div class="top-left-block" [ngClass]="{ 'border-bottom': menu.isMenuDisplayed === false }">
-      <span class="icon icon-menu" (click)="menu.toggleMenu()"></span>
+    <div class="top-left-block">
+      <span role="button" tabindex="0" [title]="getToggleTitle()" (click)="menu.toggleMenu()" (keyup.enter)="menu.toggleMenu()">
+        <span class="icon icon-menu"></span>
+      </span>
 
-      <a class="peertube-title" [routerLink]="defaultRoute" title="Homepage" i18n-title>
+      <a class="peertube-title c-hand" [routerLink]="getDefaultRoute()">
         <span class="icon icon-logo"></span>
         <span class="instance-name">{{ instanceName }}</span>
       </a>
     </div>
 
-    <div class="header-right" [ngClass]="{ 'border-bottom': menu.isMenuDisplayed === false }">
+    <div class="root-header-right">
       <my-header class="w-100 d-flex justify-content-end"></my-header>
     </div>
   </div>
@@ -22,16 +24,26 @@
   <div class="sub-header-container">
     <my-menu *ngIf="menu.isMenuDisplayed"></my-menu>
 
-    <div id="content" tabindex="-1" class="main-col container-fluid" [ngClass]="{ expanded: menu.isMenuDisplayed === false }">
+    <div id="content" 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>
     </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>
 
@@ -43,14 +55,15 @@
         <p>{{ message.detail }}</p>
       </div>
 
-      <span *ngIf="message.severity === 'success'" class="glyphicon glyphicon-ok"></span>
-      <span *ngIf="message.severity === 'info'" class="glyphicon glyphicon-info-sign"></span>
-      <span *ngIf="message.severity === 'error'" class="glyphicon glyphicon-remove"></span>
+      <my-global-icon [iconName]="getNotificationIcon(message)"></my-global-icon>
     </div>
   </ng-template>
 </p-toast>
 
-<ng-template [ngIf]="isUserLoggedIn()">
-  <my-welcome-modal #welcomeModal></my-welcome-modal>
+<ng-container *ngIf="isUserLoggedIn()">
+  <my-account-setup-warning-modal #accountSetupWarningModal></my-account-setup-warning-modal>
+  <my-admin-welcome-modal #adminWelcomeModal></my-admin-welcome-modal>
   <my-instance-config-warning-modal #instanceConfigWarningModal></my-instance-config-warning-modal>
-</ng-template>
+</ng-container>
+
+<my-custom-modal #customModal></my-custom-modal>