X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.html;h=b0d2e5050a0c1d18baac76d8e19099ffed612dce;hb=70afd522ba3fc08fd407f622aad0f15e8e88b249;hp=dafc452668a8e9630df2491ca3cf58da48a546f2;hpb=8a44f8354e614ee24f4b749c4e1a3cf1fde2b4d4;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index dafc45266..b0d2e5050 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -1,39 +1,58 @@
-<div>
+<div *ngIf="customCSS" [innerHTML]="customCSS"></div>
+
+<my-hotkeys-cheatsheet></my-hotkeys-cheatsheet>
+
+<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 id="peertube-title" [routerLink]="['/videos/list']" title="Homepage">
+      <a class="peertube-title" [routerLink]="defaultRoute" title="Homepage" i18n-title>
         <span class="icon icon-logo"></span>
         <span class="instance-name">{{ instanceName }}</span>
       </a>
     </div>
 
     <div class="header-right">
-      <my-header></my-header>
+      <my-header class="w-100 d-flex justify-content-end"></my-header>
     </div>
   </div>
 
   <div class="sub-header-container">
-    <div *ngIf="isMenuDisplayed" class="title-menu-left">
-        <my-menu></my-menu>
-    </div>
+    <my-menu *ngIf="menu.isMenuDisplayed"></my-menu>
 
-    <div class="main-col container-fluid" [ngClass]="getMainColClasses()">
+    <div id="content" tabindex="-1" class="main-col" [ngClass]="{ expanded: menu.isMenuDisplayed === false }">
 
       <div class="main-row">
         <router-outlet></router-outlet>
       </div>
-
-      <footer class="row">
-        <a href="https://github.com/Chocobozzz/PeerTube" title="PeerTube on Github">PeerTube v{{ serverVersion }}</a> -
-        <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" title="PeerTube licence">CopyLeft 2015-2018</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>
+
+<my-custom-modal #customModal></my-custom-modal>