X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.html;h=3a7aedac6a46dd6eb9c10c331a8972272958e2fd;hb=f6dc2fff48cbc3b95eb71d3af5eb60d3b689c2ad;hp=640524e23e7bebe2d4f4b2b09189aa292cfefa36;hpb=26c6ee80d0fecfce595e8970f15717560b4f4ceb;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index 640524e23..3a7aedac6 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -6,22 +6,18 @@
 
       <a id="peertube-title" [routerLink]="['/videos/list']" title="Homepage">
         <span class="icon icon-logo"></span>
-        PeerTube
+        {{ instanceName }}
       </a>
     </div>
 
     <div class="header-right">
-      <my-search></my-search>
+      <my-header></my-header>
     </div>
   </div>
 
   <div class="sub-header-container">
-    <div class="title-menu-left">
-
-      <div class="title-menu-left-block menu">
-        <my-menu *ngIf="isMenuDisplayed && isInAdmin() === false"></my-menu>
-        <my-menu-admin *ngIf="isMenuDisplayed && isInAdmin() === true"></my-menu-admin>
-      </div>
+    <div *ngIf="isMenuDisplayed" class="title-menu-left">
+        <my-menu></my-menu>
     </div>
 
     <div class="main-col container-fluid" [ngClass]="getMainColClasses()">
@@ -31,12 +27,13 @@
       </div>
 
       <footer class="row">
-        <a href="https://github.com/Chocobozzz/PeerTube" title="PeerTube on Github">PeerTube</a> -
+        <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>