X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.html;h=d5fec61e6aae7ebb541b96c861bcb2a4b8d11cd1;hb=3b20bdd6dc7402b0723e038c57f0606131e20e54;hp=9f2661e12fea19f85a1c61bfde1f12b2f1a05fec;hpb=5769e1db8d3d5a1e3baa8dff23090cfe93d48a50;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index 9f2661e12..d5fec61e6 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -1,31 +1,56 @@
-<div class="container">
+<div *ngIf="customCSS" [innerHTML]="customCSS"></div>
 
-  <header class="row">
-    <div class="col-md-2">
-      <h4 id="peertube-title">
-        <a [routerLink]="['/videos/list']">PeerTube</a>
-      </h4>
+<my-hotkeys-cheatsheet></my-hotkeys-cheatsheet>
+
+<div [ngClass]="{ 'user-logged-in': isUserLoggedIn(), 'user-not-logged-in': !isUserLoggedIn() }">
+  <div class="header">
+
+    <div class="top-left-block" [ngClass]="{ 'border-bottom': menu.isMenuDisplayed === false }">
+      <span class="icon icon-menu" (click)="menu.toggleMenu()"></span>
+
+      <a class="peertube-title" [routerLink]="defaultRoute" title="Homepage" i18n-title>
+        <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" [ngClass]="{ 'border-bottom': menu.isMenuDisplayed === false }">
+      <my-header class="w-100 d-flex justify-content-end"></my-header>
     </div>
-  </header>
+  </div>
 
+  <div class="sub-header-container">
+    <my-menu *ngIf="menu.isMenuDisplayed"></my-menu>
 
-  <div class="row">
-    <my-menu *ngIf="isInAdmin() === false"></my-menu>
-    <my-menu-admin *ngIf="isInAdmin() === true"></my-menu-admin>
+    <div id="content" tabindex="-1" class="main-col container-fluid" [ngClass]="{ expanded: menu.isMenuDisplayed === false }">
 
-    <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>
     </div>
   </div>
+</div>
 
-  <simple-notifications [options]="notificationOptions"></simple-notifications>
-  <my-confirm></my-confirm>
+<ngx-loading-bar [includeSpinner]="false"></ngx-loading-bar>
 
-  <footer>
-    PeerTube, CopyLeft 2015-2016
-  </footer>
-</div>
+<my-confirm></my-confirm>
+
+<p-toast position="bottom-right">
+  <ng-template let-message pTemplate="message">
+    <div class="notification-block">
+      <div class="message">
+        <h3>{{ message.summary }}</h3>
+        <p>{{ message.detail }}</p>
+      </div>
+
+      <span *ngIf="message.severity === 'success'" class="glyphicon glyphicon-ok"></span>
+      <span *ngIf="message.severity === 'info'" class="glyphicon glyphicon-info-sign"></span>
+      <span *ngIf="message.severity === 'error'" class="glyphicon glyphicon-remove"></span>
+    </div>
+  </ng-template>
+</p-toast>
+
+<ng-template [ngIf]="isUserLoggedIn()">
+  <my-welcome-modal #welcomeModal></my-welcome-modal>
+  <my-instance-config-warning-modal #instanceConfigWarningModal></my-instance-config-warning-modal>
+</ng-template>