Merge branch 'release/2.1.0' 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 48e97d5239952ce3f5a6bca44db3790f89034505..f5a8dbd34659ce99a9d43967c5638beb9c94798a 100644 (file)
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -1,60 +1,61 @@
-<div class="container">
+<div *ngIf="customCSS" [innerHTML]="customCSS"></div>
 
-  <header class="row">
-    <div class="col-md-2">
-      <h4>PeerTube</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': isMenuDisplayed === false }">
+      <span class="icon icon-menu" (click)="toggleMenu()"></span>
+
+      <a class="peertube-title" [routerLink]="defaultRoute" title="Homepage">
+        <span class="icon icon-logo"></span>
+        <span class="instance-name">{{ instanceName }}</span>
+      </a>
     </div>
 
-    <div class="col-md-9">
-      <my-search (search)="onSearch($event)"></my-search>
+    <div class="header-right" [ngClass]="{ 'border-bottom': 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="isMenuDisplayed"></my-menu>
 
-  <div class="row">
+    <div id="content" tabindex="-1" class="main-col container-fluid" [ngClass]="{ expanded: isMenuDisplayed === false }">
 
-    <menu class="col-md-2 col-xs-3">
-      <div class="panel_block">
-        <div id="panel_user_login" class="panel_button">
-          <span class="glyphicon glyphicon-user"></span>
-          <a *ngIf="!isLoggedIn" [routerLink]="['UserLogin']">Login</a>
-          <a *ngIf="isLoggedIn" (click)="logout()">Logout</a>
-        </div>
+      <div class="main-row">
+        <router-outlet></router-outlet>
       </div>
 
-      <div class="panel_block">
-        <div id="panel_get_videos" class="panel_button">
-          <span class="glyphicon glyphicon-list"></span>
-          <a [routerLink]="['VideosList']">Get videos</a>
-        </div>
+      <footer class="row">
+        <a href="https://joinpeertube.org" title="PeerTube website" target="_blank" rel="noopener noreferrer" i18n>Powered by PeerTube</a>&nbsp;-&nbsp;
+        <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" title="PeerTube license" target="_blank" rel="noopener noreferrer">CopyLeft 2015-2020</a>
+      </footer>
+    </div>
+  </div>
+</div>
 
-        <div id="panel_upload_video" class="panel_button" *ngIf="isLoggedIn">
-          <span class="glyphicon glyphicon-cloud-upload"></span>
-          <a [routerLink]="['VideosAdd']">Upload a video</a>
-        </div>
-      </div>
+<ngx-loading-bar [includeSpinner]="false"></ngx-loading-bar>
 
-      <div class="panel_block" *ngIf="isLoggedIn">
-        <div id="panel_make_friends" class="panel_button">
-          <span class="glyphicon glyphicon-cloud"></span>
-          <a (click)='makeFriends()'>Make friends</a>
-        </div>
+<my-confirm></my-confirm>
 
-        <div id="panel_quit_friends" class="panel_button">
-          <span class="glyphicon glyphicon-plane"></span>
-          <a (click)='quitFriends()'>Quit friends</a>
-        </div>
+<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>
-    </menu>
 
-    <div class="col-md-9 col-xs-8 router_outler_container">
-      <router-outlet></router-outlet>
+      <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>
 
-  </div>
-
-
-  <footer>
-    PeerTube, CopyLeft 2015-2016
-  </footer>
-</div>
+<ng-template [ngIf]="isUserLoggedIn()">
+  <my-welcome-modal #welcomeModal></my-welcome-modal>
+  <my-instance-config-warning-modal #instanceConfigWarningModal></my-instance-config-warning-modal>
+</ng-template>