X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.html;h=2660c537761018e38f572bf59e4d5f9d4d44f507;hb=ab4d4db44a4f943056b856cbdc7b8d157cabf9af;hp=a7128d4fae2b5a1415567829d87ab01bb6da905a;hpb=d414207f07f47307947d86d5bc5c5fc0ae73be18;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index a7128d4fa..2660c5377 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -1,41 +1,61 @@
 <div *ngIf="customCSS" [innerHTML]="customCSS"></div>
 
+<my-hotkeys-cheatsheet></my-hotkeys-cheatsheet>
+
 <div [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>
 
-      <a id="peertube-title" [routerLink]="defaultRoute" title="Homepage">
+      <a class="peertube-title" [routerLink]="defaultRoute" title="Homepage">
         <span class="icon icon-logo"></span>
         <span class="instance-name">{{ instanceName }}</span>
       </a>
     </div>
 
-    <div class="header-right">
+    <div class="header-right" [ngClass]="{ 'border-bottom': isMenuDisplayed === false }">
       <my-header></my-header>
     </div>
   </div>
 
   <div class="sub-header-container">
-    <div *ngIf="isMenuDisplayed" class="title-menu-left">
-        <my-menu></my-menu>
-    </div>
+    <my-menu *ngIf="isMenuDisplayed"></my-menu>
 
-    <div class="main-col container-fluid" [ngClass]="getMainColClasses()">
+    <div id="content" tabindex="-1" class="main-col container-fluid" [ngClass]="{ expanded: isMenuDisplayed === false }">
 
       <div class="main-row">
         <router-outlet></router-outlet>
       </div>
 
       <footer class="row">
-        <a href="https://joinpeertube.org" title="PeerTube website" target="_blank" rel="noopener noreferrer">PeerTube v{{ serverVersion }}</a> -
-        <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" title="PeerTube license" target="_blank" rel="noopener noreferrer">CopyLeft 2015-2018</a>
+        <a href="https://joinpeertube.org" title="PeerTube website" target="_blank" rel="noopener noreferrer" i18n>Powered by PeerTube</a>&nbsp;-&nbsp;
+        <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" title="PeerTube license" target="_blank" rel="noopener noreferrer">CopyLeft 2015-2020</a>
       </footer>
     </div>
   </div>
 </div>
 
-<ngx-loading-bar [includeSpinner]="false" color="#F1680D"></ngx-loading-bar>
+<ngx-loading-bar [includeSpinner]="false"></ngx-loading-bar>
+
 <my-confirm></my-confirm>
-<simple-notifications [options]="notificationOptions"></simple-notifications>
+
+<p-toast position="bottom-right">
+  <ng-template let-message pTemplate="message">
+    <div class="notification-block">
+      <div class="message">
+        <h3>{{ message.summary }}</h3>
+        <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>
+    </div>
+  </ng-template>
+</p-toast>
+
+<ng-template [ngIf]="isUserLoggedIn()">
+  <my-welcome-modal #welcomeModal></my-welcome-modal>
+  <my-instance-config-warning-modal #instanceConfigWarningModal></my-instance-config-warning-modal>
+</ng-template>