X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.html;h=0564e1a7bd06ffc37bf9bb9cfd335a96ca6bd921;hb=9a0fc8409c7a783348ec212fa9f38d0a98413467;hp=f1eb6e021808de5ed196647edf46648a9029207d;hpb=383bfc8356d444cbed1dab7e5c1b3bb16becfdfd;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index f1eb6e021..0564e1a7b 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -1,31 +1,41 @@
-<div class="container-fluid">
-  <div class="row">
-    <div class="col-md-2 col-sm-3 col-xs-3 title-menu-left">
-      <h4 id="peertube-title" class="title-menu-left-block header">
-        <a [routerLink]="['/videos/list']">PeerTube</a>
-      </h4>
-
-      <div class="title-menu-left-block menu">
-        <my-menu *ngIf="isInAdmin() === false"></my-menu>
-        <my-menu-admin *ngIf="isInAdmin() === true"></my-menu-admin>
-      </div>
+<div *ngIf="customCSS" [innerHTML]="customCSS"></div>
+
+<hotkeys-cheatsheet></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">
+        <span class="icon icon-logo"></span>
+        <span class="instance-name">{{ instanceName }}</span>
+      </a>
     </div>
 
-    <div class="col-md-10 col-sm-9 col-xs-9 main-col">
-      <div class="header">
-        <my-search></my-search>
-      </div>
+    <div class="header-right" [ngClass]="{ 'border-bottom': isMenuDisplayed === false }">
+      <my-header></my-header>
+    </div>
+  </div>
+
+  <div class="sub-header-container">
+    <my-menu *ngIf="isMenuDisplayed"></my-menu>
+
+    <div id="right-container" 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>
+      </footer>
     </div>
   </div>
-
-  <footer>
-    PeerTube, CopyLeft 2015-2017
-  </footer>
 </div>
 
+<ngx-loading-bar [includeSpinner]="false" color="#F1680D"></ngx-loading-bar>
 <my-confirm></my-confirm>
 <simple-notifications [options]="notificationOptions"></simple-notifications>