X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.html;h=629c04e6b07c7d53c97a82bd5d9a1e99c398023f;hb=85cfe29be65b34ae816bcecf5413c2655a3b76f3;hp=b0d2e5050a0c1d18baac76d8e19099ffed612dce;hpb=0ac458bffb9389d649adcd86038385795bb6ad65;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index b0d2e5050..629c04e6b 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -6,9 +6,9 @@
   <div class="header">
 
     <div class="top-left-block">
-      <span class="icon icon-menu" (click)="menu.toggleMenu()"></span>
+      <span class="icon icon-menu" role="button" [title]="getToggleTitle()" (click)="menu.toggleMenu()"></span>
 
-      <a class="peertube-title" [routerLink]="defaultRoute" title="Homepage" i18n-title>
+      <a class="peertube-title c-hand" (click)="goToDefaultRoute()">
         <span class="icon icon-logo"></span>
         <span class="instance-name">{{ instanceName }}</span>
       </a>
@@ -25,13 +25,23 @@
     <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>
     </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,16 +53,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>