X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.html;h=03f7e88ed6a9249ad5fa4ce827dbff3e2125ac00;hb=af37210c0bd7bf343fe366ddd2b253e2214f5547;hp=ea4b31421b767a113412133bc0d5e1be4c4cdc7c;hpb=629d8d6f70cf83b55011dff53bfe1c4a95ac3433;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index ea4b31421..03f7e88ed 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -1,73 +1,41 @@
-<div class="container">
-
-  <header class="row">
-    <div class="col-md-2">
-      <h4 id="peertube-title">
-        <a [routerLink]="['/videos/list']">PeerTube</a>
-      </h4>
-    </div>
-
-    <div class="col-md-9">
-      <my-search></my-search>
-    </div>
-  </header>
+<div *ngIf="customCSS" [innerHTML]="customCSS"></div>
 
+<my-hotkeys-cheatsheet></my-hotkeys-cheatsheet>
 
-  <div class="row">
+<div [ngClass]="{ 'user-logged-in': isUserLoggedIn(), 'user-not-logged-in': !isUserLoggedIn() }">
+  <div class="header">
 
-    <menu class="col-md-2 col-sm-3 col-xs-3">
-      <div class="panel-block">
-        <div id="panel-user-login" class="panel-button">
-          <span *ngIf="!isLoggedIn" >
-            <span class="hidden-xs glyphicon glyphicon-log-in"></span>
-            <a [routerLink]="['/login']">Login</a>
-          </span>
+    <div class="top-left-block" [ngClass]="{ 'border-bottom': isMenuDisplayed === false }">
+      <span class="icon icon-menu" (click)="toggleMenu()"></span>
 
-          <span *ngIf="isLoggedIn">
-            <span class="hidden-xs glyphicon glyphicon-log-out"></span>
-            <a *ngIf="isLoggedIn" (click)="logout()">Logout</a>
-          </span>
-        </div>
-
-        <div *ngIf="isLoggedIn" id="panel-user-account" class="panel-button">
-          <span class="hidden-xs glyphicon glyphicon-user"></span>
-          <a [routerLink]="['/account']">My account</a>
-        </div>
-      </div>
+      <a id="peertube-title" [routerLink]="defaultRoute" title="Homepage">
+        <span class="icon icon-logo"></span>
+        <span class="instance-name">{{ instanceName }}</span>
+      </a>
+    </div>
 
-      <div class="panel-block">
-        <div id="panel-get-videos" class="panel-button">
-          <span class="hidden-xs glyphicon glyphicon-list"></span>
-          <a [routerLink]="['/videos/list']">Get videos</a>
-        </div>
+    <div class="header-right" [ngClass]="{ 'border-bottom': isMenuDisplayed === false }">
+      <my-header></my-header>
+    </div>
+  </div>
 
-        <div id="panel-upload-video" class="panel-button" *ngIf="isLoggedIn">
-          <span class="hidden-xs glyphicon glyphicon-cloud-upload"></span>
-          <a [routerLink]="['/videos/add']">Upload a video</a>
-        </div>
-      </div>
+  <div class="sub-header-container">
+    <my-menu *ngIf="isMenuDisplayed"></my-menu>
 
-      <div class="panel-block" *ngIf="isLoggedIn">
-        <div id="panel-make-friends" class="panel-button">
-          <span class="hidden-xs glyphicon glyphicon-cloud"></span>
-          <a (click)='makeFriends()'>Make friends</a>
-        </div>
+    <div id="content" tabindex="-1" class="main-col container-fluid" [ngClass]="{ expanded: isMenuDisplayed === false }">
 
-        <div id="panel-quit-friends" class="panel-button">
-          <span class="hidden-xs glyphicon glyphicon-plane"></span>
-          <a (click)='quitFriends()'>Quit friends</a>
-        </div>
+      <div class="main-row">
+        <router-outlet></router-outlet>
       </div>
-    </menu>
 
-    <div class="col-md-9 col-sm-8 col-xs-8 router-outlet-container">
-      <router-outlet></router-outlet>
+      <footer class="row">
+        <a href="https://joinpeertube.org" title="PeerTube website" target="_blank" rel="noopener noreferrer">PeerTube v{{ serverVersion }}{{ serverCommit }}</a>&nbsp;-&nbsp;
+        <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>