X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.html;h=87de874bb9b8ba13ec1aa9195e664141dec95073;hb=ae04a0ce1298ca4db8b2d0d69df36845213e5fcb;hp=04c32f596344624014b008ccc615d24a1d3cff3e;hpb=52672600223d840ab123cd48c4c4d0457ac2e1a1;p=oweals%2Fpeertube.git

diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index 04c32f596..87de874bb 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -1,28 +1,41 @@
-<div class="container">
+<div *ngIf="customCSS" [innerHTML]="customCSS"></div>
 
-  <header class="row">
-    <div class="col-md-2">
-      <h4 id="peertube-title">
-        <a [routerLink]="['/videos/list']">PeerTube</a>
-      </h4>
+<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">
+        <span class="icon icon-logo"></span>
+        <span class="instance-name">{{ instanceName }}</span>
+      </a>
     </div>
 
-    <div class="col-md-9">
-      <my-search></my-search>
+    <div class="header-right" [ngClass]="{ 'border-bottom': isMenuDisplayed === false }">
+      <my-header></my-header>
     </div>
-  </header>
+  </div>
 
+  <div class="sub-header-container">
+    <my-menu *ngIf="isMenuDisplayed"></my-menu>
 
-  <div class="row">
-    <my-menu *ngIf="isInAdmin() === false"></my-menu>
-    <my-menu-admin *ngIf="isInAdmin() === true"></my-menu-admin>
+    <div id="content" tabindex="-1" class="main-col container-fluid" [ngClass]="{ expanded: isMenuDisplayed === false }">
 
-    <div class="col-md-9 col-sm-8 col-xs-8 router-outlet-container">
-      <router-outlet></router-outlet>
+      <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-2016
-  </footer>
 </div>
+
+<ngx-loading-bar [includeSpinner]="false"></ngx-loading-bar>
+<my-confirm></my-confirm>
+<simple-notifications [options]="notificationOptions"></simple-notifications>