X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.html;h=df0ec5a5dfdcf5cb6b431ae190e4169ce82592e4;hb=d15ab38a905e6b50972e6f884917db9198279daf;hp=58967abca9fc6c900ac86ca2ec3154a623cacab4;hpb=7da18e4420c4b71a8ecfda07f39324fbfec081c3;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index 58967abca..df0ec5a5d 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -1,78 +1,49 @@
-<div class="container">
+<div class="container-fluid">
+  <div class="row header">
 
-  <header class="row">
-    <div class="col-md-2">
-      <h4 id="peertube-title">
-        <a [routerLink]="['/videos/list']">PeerTube</a>
-      </h4>
-    </div>
+    <div class="col-md-2 col-sm-3 col-xs-3 top-left-block" [ngClass]="{ 'border-bottom': isMenuDisplayed === false }">
+      <div class="hamburger-block" (click)="toggleMenu()">
+        <span class="glyphicon glyphicon-menu-hamburger"></span>
+      </div>
 
-    <div class="col-md-9">
-      <my-search></my-search>
+      <div id="peertube-title">
+        <a [routerLink]="['/videos/list']" title="Homepage"></a>
+      </div>
     </div>
-  </header>
-
 
-  <div class="row">
-
-    <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>
+    <!-- Used for the fixed title -->
+    <div class="col-md-2 col-sm-3 col-xs-3 fake-title-block"></div>
 
-          <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>
+    <!-- We need to reset col-md-* because my-search is in fixed position -->
+    <my-search class="col-md-10 col-sm-9 col-xs-9"></my-search>
+  </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="row">
+    <div class="col-md-2 col-sm-3 col-xs-3 title-menu-left">
 
-        <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 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>
 
-      <div class="panel-block" *ngIf="isUserAdmin()">
-        <div id="panel-users" class="panel-button">
-          <span class="hidden-xs glyphicon glyphicon-user"></span>
-          <a [routerLink]="['/admin/users/list']">List users</a>
-        </div>
+    <!-- Used for the fixed menu -->
+    <div class="col-md-2 col-sm-3 col-xs-3">
+    </div>
 
-        <div id="panel-make-friends" class="panel-button">
-          <span class="hidden-xs glyphicon glyphicon-cloud"></span>
-          <a (click)='makeFriends()'>Make friends</a>
-        </div>
+    <div [ngClass]="getMainColClasses()">
 
-        <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://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>
+      </footer>
     </div>
-
   </div>
-
-
-  <footer>
-    PeerTube, CopyLeft 2015-2016
-  </footer>
 </div>
+
+<my-confirm></my-confirm>
+<simple-notifications [options]="notificationOptions"></simple-notifications>