X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.html;h=3a7aedac6a46dd6eb9c10c331a8972272958e2fd;hb=d169c4ad46291b8895498da268800bec650b43f2;hp=061ebe134f1643ab426931bc6e9f0a4467ea925a;hpb=ea9f487b40c7f1d7348d9f88703cb9d52c7e8603;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index 061ebe134..3a7aedac6 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -1,35 +1,39 @@
-<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>
+  <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]="['/videos/list']" title="Homepage">
+        <span class="icon icon-logo"></span>
+        {{ instanceName }}
+      </a>
     </div>
 
-    <!-- Used for the fixed menu -->
-    <div class="col-md-2 col-sm-3 col-xs-3">
+    <div class="header-right">
+      <my-header></my-header>
     </div>
+  </div>
 
-    <div class="col-md-10 col-sm-9 col-xs-9 main-col">
-      <div class="header">
-        <my-search></my-search>
-      </div>
+  <div class="sub-header-container">
+    <div *ngIf="isMenuDisplayed" class="title-menu-left">
+        <my-menu></my-menu>
+    </div>
+
+    <div class="main-col container-fluid" [ngClass]="getMainColClasses()">
 
       <div class="main-row">
         <router-outlet></router-outlet>
       </div>
 
-      <footer>
-        PeerTube, CopyLeft 2015-2017
+      <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-2017</a>
       </footer>
     </div>
   </div>
 </div>
 
+<ngx-loading-bar [includeSpinner]="false" color="#F1680D"></ngx-loading-bar>
 <my-confirm></my-confirm>
 <simple-notifications [options]="notificationOptions"></simple-notifications>