X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.html;h=dafc452668a8e9630df2491ca3cf58da48a546f2;hb=6221f311de0eb8f2a9e7e4a77b8cb0ecbde6dfcd;hp=ead49196823871b807fe434971342de2052c6f89;hpb=beacf6993c93f93bf5ea86665827154eb291d1fd;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index ead491968..dafc45266 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -1,26 +1,39 @@
-<div class="container">
+<div>
+  <div class="header">
 
-  <header class="row">
-    <div class="col-md-2">
-      <h4 id="peertube-title">
-        <a [routerLink]="['/videos/list']">PeerTube</a>
-      </h4>
+    <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>
+        <span class="instance-name">{{ instanceName }}</span>
+      </a>
     </div>
 
-    <div class="col-md-9">
-      <my-search></my-search>
+    <div class="header-right">
+      <my-header></my-header>
     </div>
-  </header>
+  </div>
 
+  <div class="sub-header-container">
+    <div *ngIf="isMenuDisplayed" class="title-menu-left">
+        <my-menu></my-menu>
+    </div>
 
-  <div class="row">
-    <my-menu *ngIf="isInAdmin() === false"></my-menu>
-    <my-menu-admin *ngIf="isInAdmin() === true"></my-menu-admin>
+    <div class="main-col container-fluid" [ngClass]="getMainColClasses()">
 
-    <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>
-    PeerTube, CopyLeft 2015-2016
-  </footer>
+      <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>
+<my-confirm></my-confirm>
+<simple-notifications [options]="notificationOptions"></simple-notifications>