X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fmenu%2Fmenu.component.html;h=66ccb9870c8a1ff807afcca878335f66de74d188;hb=2c2befaacaa7063df0d4557b71c187ee168a8eb6;hp=91422df77b76c9af20659aed8aea59beeaf6e577;hpb=4c1def5fd8e9f483238eb38e221f555e2e6bbf07;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html
index 91422df77..66ccb9870 100644
--- a/client/src/app/menu/menu.component.html
+++ b/client/src/app/menu/menu.component.html
@@ -1,131 +1,165 @@
 <div class="menu-wrapper">
-  <menu [ngClass]="{ 'logged-in': isLoggedIn }">
+  <menu [ngClass]="{ 'is-logged-in': isLoggedIn }">
     <div class="top-menu">
       <div *ngIf="isLoggedIn" class="logged-in-block">
-        <my-avatar-notification [user]="user"></my-avatar-notification>
-
-        <div class="logged-in-info">
-          <a *ngIf="user.account" [routerLink]="[ '/accounts', user.account.nameWithHost ]" class="logged-in-display-name">{{ user.account?.displayName }}</a>
-          <a *ngIf="!user.account" routerLink="/my-account/settings" class="logged-in-display-name">{{ user.account?.displayName }}</a>
+        <div>
+          <div
+            class="logged-in-more" ngbDropdown #dropdown="ngbDropdown" placement="bottom-left auto"
+            [container]="dropdownContainer" (openChange)="onDropdownOpenChange($event)" autoClose="outside"
+          >
+            <div ngbDropdownToggle>
+              <my-actor-avatar [account]="user.account" size="34"></my-actor-avatar>
+              <div class="logged-in-info">
+                <div class="logged-in-display-name">{{ user.account?.displayName }}</div>
+
+                <div class="logged-in-username">@{{ user.username }}</div>
+              </div>
+
+              <div class="dropdown-toggle-indicator">
+                <span class="chevron-down"></span>
+              </div>
+            </div>
+
+            <div ngbDropdownMenu>
+              <a
+                *ngIf="user.account" ngbDropdownItem ngbDropdownToggle class="dropdown-item" [routerLink]="[ '/a', user.account.nameWithHost ]"
+                #profile (click)="onActiveLinkScrollToAnchor(profile)"
+              >
+                <my-global-icon iconName="go" aria-hidden="true"></my-global-icon> <ng-container i18n>Public profile</ng-container>
+              </a>
+
+              <div class="dropdown-divider"></div>
+
+              <a
+                myPluginSelector pluginSelectorId="menu-user-dropdown-language-item"
+                ngbDropdownItem ngbDropdownToggle class="dropdown-item" (click)="openLanguageChooser()"
+              >
+                <my-global-icon iconName="language" aria-hidden="true"></my-global-icon>
+                <span i18n>Interface:</span>
+                <span class="ms-auto muted">{{ currentInterfaceLanguage }}</span>
+              </a>
+
+              <a ngbDropdownItem ngbDropdownToggle class="dropdown-item" routerLink="/my-account/settings" fragment="video-languages-subtitles"
+                #settingsLanguagesSubtitles (click)="onActiveLinkScrollToAnchor(settingsLanguagesSubtitles)">
+                <my-global-icon iconName="video-lang" aria-hidden="true"></my-global-icon>
+                <span i18n>Videos:</span>
+                <span class="ms-auto muted">{{ videoLanguages.join(', ') }}</span>
+              </a>
+
+              <a ngbDropdownItem ngbDropdownToggle class="dropdown-item settings-sensitive" routerLink="/my-account/settings"
+                fragment="video-sensitive-content-policy" #settingsSensitiveContentPolicy
+                (click)="onActiveLinkScrollToAnchor(settingsSensitiveContentPolicy)"
+              >
+                <my-global-icon class="hover-display-toggle" [hidden]="user.nsfwPolicy === 'display'" iconName="eye-open" aria-hidden="true"></my-global-icon>
+                <my-global-icon class="hover-display-toggle" [hidden]="user.nsfwPolicy !== 'display'" iconName="eye-close" aria-hidden="true"></my-global-icon>
+                <span i18n>Sensitive:</span>
+                <span class="ms-auto muted">{{ nsfwPolicy }}</span>
+              </a>
+
+              <a ngbDropdownItem class="dropdown-item" (click)="toggleUseP2P()">
+                <my-global-icon iconName="p2p" aria-hidden="true"></my-global-icon>
+                <ng-container i18n>Help share videos</ng-container>
+
+                <my-input-switch class="ms-auto" [checked]="user.p2pEnabled"></my-input-switch>
+              </a>
+
+              <div class="dropdown-divider"></div>
+
+              <a *ngIf="!isInMobileView" ngbDropdownItem ngbDropdownToggle class="dropdown-item" (click)="openHotkeysCheatSheet()">
+                <my-global-icon iconName="command" aria-hidden="true"></my-global-icon>
+                <ng-container i18n>Keyboard shortcuts</ng-container>
+              </a>
+
+              <a ngbDropdownItem ngbDropdownToggle (click)="logout($event)" class="dropdown-item" href="#">
+                <my-global-icon iconName="sign-out" aria-hidden="true"></my-global-icon>
+                <ng-container i18n>Log out</ng-container>
+              </a>
+            </div>
+          </div>
 
-          <div class="logged-in-username">{{ user.username }}</div>
+          <my-notification (navigate)="onActiveLinkScrollToAnchor($event)"></my-notification>
         </div>
 
-        <div class="logged-in-more" ngbDropdown placement="bottom-right auto" container="body">
-          <my-global-icon iconName="more-vertical" ngbDropdownToggle role="button"></my-global-icon>
-
-          <div ngbDropdownMenu>
-            <a *ngIf="user.account" [routerLink]="[ '/accounts', user.account.nameWithHost ]" class="dropdown-item">
-              <my-global-icon iconName="go"></my-global-icon> <ng-container i18n>Public profile</ng-container>
-            </a>
-
-            <div class="dropdown-divider"></div>
-
-            <a routerLink="/my-account" class="dropdown-item">
-              <my-global-icon iconName="user"></my-global-icon> <ng-container i18n>Account settings</ng-container>
-            </a>
-
-            <a routerLink="/my-account/video-channels" class="dropdown-item">
-              <my-global-icon iconName="folder"></my-global-icon> <ng-container i18n>Channels settings</ng-container>
-            </a>
-
-            <div class="dropdown-divider"></div>
-
-            <a class="dropdown-item" href="https://joinpeertube.org/help" target="_blank" rel="noopener noreferrer">
-              <my-global-icon iconName="help"></my-global-icon> <ng-container i18n>Help</ng-container>
-            </a>
-
-            <a (click)="logout($event)" class="dropdown-item" href="#">
-              <my-global-icon iconName="sign-out"></my-global-icon> <ng-container i18n>Log out</ng-container>
-            </a>
-          </div>
+        <div class="logged-in-menu">
+          <a class="menu-link" routerLink="/my-account" routerLinkActive="active" #settingsLink (click)="onActiveLinkScrollToAnchor(settingsLink)">
+            <my-global-icon iconName="user" aria-hidden="true"></my-global-icon>
+            <ng-container i18n>My account</ng-container>
+          </a>
+
+          <a class="menu-link" routerLink="/my-library" routerLinkActive="active" #libraryLink (click)="onActiveLinkScrollToAnchor(libraryLink)">
+            <my-global-icon iconName="channel" aria-hidden="true"></my-global-icon>
+            <ng-container i18n>My library</ng-container>
+          </a>
+
+          <a class="menu-link" *ngIf="userHasAdminAccess" [routerLink]="getFirstAdminRouteAvailable()" routerLinkActive="active">
+            <my-global-icon iconName="cog" aria-hidden="true"></my-global-icon>
+            <ng-container i18n>Administration</ng-container>
+          </a>
         </div>
       </div>
 
-      <div *ngIf="!isLoggedIn" class="button-block">
-        <a i18n routerLink="/login" class="login-button">Login</a>
-        <a i18n *ngIf="isRegistrationAllowed()" routerLink="/signup" class="create-account-button">Create an account</a>
-      </div>
-
-      <div *ngIf="isLoggedIn" class="panel-block">
-        <div i18n class="block-title">My library</div>
-
-        <a routerLink="/my-account/videos" routerLinkActive="active">
-          <my-global-icon iconName="videos"></my-global-icon>
-          <ng-container i18n>Videos</ng-container>
-        </a>
-
-        <a routerLink="/my-account/video-playlists" routerLinkActive="active">
-          <my-global-icon iconName="playlists"></my-global-icon>
-          <ng-container i18n>Playlists</ng-container>
-        </a>
-
-        <a routerLink="/videos/subscriptions" routerLinkActive="active">
-          <my-global-icon iconName="subscriptions"></my-global-icon>
-          <ng-container i18n>Subscriptions</ng-container>
-        </a>
-
-        <a routerLink="/my-account/history/videos" routerLinkActive="active">
-          <my-global-icon iconName="history"></my-global-icon>
-          <ng-container i18n>History</ng-container>
-        </a>
+      <div *ngIf="!isLoggedIn" class="login-buttons-block">
+        <a i18n *ngIf="!getExternalLoginHref()" routerLink="/login" class="peertube-button-link orange-button">Login</a>
+        <a i18n *ngIf="getExternalLoginHref()" [href]="getExternalLoginHref()" class="peertube-button-link orange-button">Login</a>
 
+        <a i18n *ngIf="isRegistrationAllowed()" routerLink="/signup" class="peertube-button-link create-account-button">Create an account</a>
       </div>
 
-      <div class="panel-block">
-        <div i18n class="block-title">Videos</div>
+      <ng-container *ngFor="let menuSection of menuSections" >
+        <div [ngClass]="[ menuSection.key, 'menu-block' ]">
+          <div i18n class="block-title">{{ menuSection.title }}</div>
 
-        <a routerLink="/videos/overview" routerLinkActive="active">
-          <my-global-icon iconName="globe"></my-global-icon>
-          <ng-container i18n>Discover</ng-container>
-        </a>
-
-        <a routerLink="/videos/trending" routerLinkActive="active">
-          <my-global-icon iconName="trending"></my-global-icon>
-          <ng-container i18n>Trending</ng-container>
-        </a>
-
-        <a routerLink="/videos/most-liked" routerLinkActive="active">
-          <my-global-icon iconName="like"></my-global-icon>
-          <ng-container i18n>Most liked</ng-container>
-        </a>
+          <a class="menu-link" *ngFor="let link of menuSection.links" [routerLink]="link.path" routerLinkActive="active">
+            <my-global-icon *ngIf="link.icon" [iconName]="link.icon" aria-hidden="true"></my-global-icon>
+            <ng-container>{{ link.shortLabel }}</ng-container>
+          </a>
+        </div>
+      </ng-container>
+    </div>
 
-        <a routerLink="/videos/recently-added" routerLinkActive="active">
-          <my-global-icon iconName="recently-added"></my-global-icon>
-          <ng-container i18n>Recently added</ng-container>
+    <div class="footer">
+      <div class="footer-block">
+        <a *ngIf="!isLoggedIn" class="menu-link" (click)="openQuickSettings()">
+          <my-global-icon iconName="cog" aria-hidden="true"></my-global-icon>
+          <ng-container i18n>My settings</ng-container>
         </a>
 
-        <a routerLink="/videos/local" routerLinkActive="active">
-          <my-global-icon iconName="home"></my-global-icon>
-          <ng-container i18n>Local</ng-container>
+        <a class="menu-link" routerLink="/about" routerLinkActive="active">
+          <my-global-icon iconName="help" aria-hidden="true"></my-global-icon>
+          <ng-container i18n>About</ng-container>
         </a>
       </div>
 
-      <div class="panel-block">
-        <div class="block-title" i18n>More</div>
+      <div class="footer-bottom">
 
-        <a *ngIf="userHasAdminAccess" [routerLink]="getFirstAdminRouteAvailable()" routerLinkActive="active">
-          <my-global-icon iconName="administration"></my-global-icon>
-          <ng-container i18n>Administration</ng-container>
-        </a>
+        <div class="footer-links">
+          <div *ngIf="isLoggedIn === false">
+            <span role="button" (click)="openLanguageChooser()" class="c-hand" i18n>Interface: {{ currentInterfaceLanguage }}</span>
+          </div>
 
-        <a routerLink="/about" routerLinkActive="active">
-          <my-global-icon iconName="about"></my-global-icon>
-          <ng-container i18n>About</ng-container>
-        </a>
-      </div>
-    </div>
+          <div>
+            <a i18n routerLink="/about/instance">Contact</a>
+            <a i18n href="https://joinpeertube.org/help" i18n-title title="Get help using PeerTube" target="_blank" rel="noopener noreferrer">Help</a>
+            <a i18n href="https://joinpeertube.org/faq" i18n-title title="Frequently asked questions about PeerTube" target="_blank" rel="noopener noreferrer">FAQ</a>
+            <a i18n routerLink="/about/instance" fragment="statistics">Stats</a>
+            <a i18n href="https://docs.joinpeertube.org/api-rest-reference.html" i18n-title title="API documentation" target="_blank" rel="noopener noreferrer">API</a>
+            <a (click)="openHotkeysCheatSheet()" class="c-hand" i18n>Keyboard shortcuts</a>
+          </div>
+        </div>
 
-    <div class="footer d-flex justify-content-between">
-      <span class="language">
-        <span tabindex="0" role="button" (keyup.enter)="openLanguageChooser()" (click)="openLanguageChooser()" i18n-title title="Change the language" class="icon icon-language"></span>
-      </span>
+        <div class="footer-copyleft">
+          <small class="d-inline" i18n-title title="powered by PeerTube - CopyLeft 2015-2022">
+            <a href="https://joinpeertube.org" class="me-1" target="_blank" rel="noopener noreferrer" i18n>powered by PeerTube</a>
 
-      <span class="shortcuts">
-        <span tabindex="0" role="button" (keyup.enter)="openHotkeysCheatSheet()" (click)="openHotkeysCheatSheet()" i18n-title title="Show keyboard shortcuts" class="icon icon-shortcuts"></span>
-      </span>
+            <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" target="_blank" rel="noopener noreferrer">
+              <span aria-label="copyleft" class="d-inline-block" style="transform: rotateY(180deg)">&copy;</span> 2015-2022
+            </a>
+          </small>
+        </div>
+      </div>
     </div>
   </menu>
 </div>
 
 <my-language-chooser #languageChooserModal></my-language-chooser>
+<my-quick-settings #quickSettingsModal></my-quick-settings>