X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.html;h=d5fec61e6aae7ebb541b96c861bcb2a4b8d11cd1;hb=482fa503e545e00252e25eee7b3e0f7d421cf9d4;hp=04cdbb1f83cbdf230361dc61c205c90440e0a874;hpb=d1a00ddbe245ee6cd2837025fb7757b22465dd11;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index 04cdbb1f8..d5fec61e6 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -1,37 +1,56 @@
-<div class="container-fluid">
-  <div class="row">
-    <div class="col-md-2 col-sm-3 col-xs-3 title-menu-left">
-      <div id="peertube-title" class="title-menu-left-block header">
-        <a [routerLink]="['/videos/list']" title="Homepage"></a>
-      </div>
+<div *ngIf="customCSS" [innerHTML]="customCSS"></div>
 
-      <div class="title-menu-left-block menu">
-        <my-menu *ngIf="isInAdmin() === false"></my-menu>
-        <my-menu-admin *ngIf="isInAdmin() === true"></my-menu-admin>
-      </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': menu.isMenuDisplayed === false }">
+      <span class="icon icon-menu" (click)="menu.toggleMenu()"></span>
+
+      <a class="peertube-title" [routerLink]="defaultRoute" title="Homepage" i18n-title>
+        <span class="icon icon-logo"></span>
+        <span class="instance-name">{{ instanceName }}</span>
+      </a>
     </div>
 
-    <!-- Used for the fixed menu -->
-    <div class="col-md-2 col-sm-3 col-xs-3">
+    <div class="header-right" [ngClass]="{ 'border-bottom': menu.isMenuDisplayed === false }">
+      <my-header class="w-100 d-flex justify-content-end"></my-header>
     </div>
+  </div>
 
-    <div class="col-md-10 col-sm-9 col-xs-9 main-col">
-      <div class="row header">
-        <!-- We need to reset col-md-* because my-search is in fixed position -->
-        <my-search class="col-md-10 col-sm-9 col-xs-9"></my-search>
-      </div>
+  <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 class="main-row">
         <router-outlet></router-outlet>
       </div>
-
-      <footer class="row">
-        <a href="https://github.com/Chocobozzz/PeerTube" title="PeerTube on Github">PeerTube</a> -
-        <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" title="PeerTube licence">CopyLeft 2015-2017</a>
-      </footer>
     </div>
   </div>
 </div>
 
+<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>