Merge branch 'release/beta-10' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / app.component.html

diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index cb1f4e4ef3c9725fb48b500ec6ea7dbfb5bc1d69..09b2c15be7225cbf9fae9ae6964a5ffe39ff7f24 100644 (file)
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -1,12 +1,14 @@
-<div>
+<div *ngIf="customCSS" [innerHTML]="customCSS"></div>
+
+<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]="['/videos/list']" title="Homepage">
+      <a id="peertube-title" [routerLink]="defaultRoute" title="Homepage">
         <span class="icon icon-logo"></span>
-        PeerTube
+        <span class="instance-name">{{ instanceName }}</span>
       </a>
     </div>
 
@@ -16,26 +18,22 @@
   </div>
 
   <div class="sub-header-container">
-    <div class="title-menu-left">
-
-      <div class="title-menu-left-block menu">
-        <my-menu *ngIf="isMenuDisplayed"></my-menu>
-      </div>
-    </div>
+    <my-menu *ngIf="isMenuDisplayed"></my-menu>
 
-    <div class="main-col container-fluid" [ngClass]="getMainColClasses()">
+    <div class="main-col container-fluid" [ngClass]="{ expanded: isMenuDisplayed === false }">
 
       <div class="main-row">
         <router-outlet></router-outlet>
       </div>
 
       <footer class="row">
-        <a href="https://github.com/Chocobozzz/PeerTube" title="PeerTube on Github">PeerTube</a> -
-        <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" title="PeerTube licence">CopyLeft 2015-2017</a>
+        <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>
 </div>
 
+<ngx-loading-bar [includeSpinner]="false" color="#F1680D"></ngx-loading-bar>
 <my-confirm></my-confirm>
 <simple-notifications [options]="notificationOptions"></simple-notifications>