X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fmenu%2Fmenu.component.html;h=46dd807ec5b171eba79a819907e42e4b401a6971;hb=7337a75bf06dd3ee501b502c1e4251dbf78aa04d;hp=ada53d844f2ad9e4af43fc384ee09a45800397ae;hpb=f0048d5edd6394a672c80332e9007413fbba57f5;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html
index ada53d844..46dd807ec 100644
--- a/client/src/app/menu/menu.component.html
+++ b/client/src/app/menu/menu.component.html
@@ -3,49 +3,52 @@
     <div class="top-menu">
       <div *ngIf="isLoggedIn" class="logged-in-block">
         <div>
-          <my-avatar-notification [user]="user" (navigate)="onSameUrlRestoreScrollPosition($event)"></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 class="logged-in-username">@{{ user.username }}</div>
-          </div>
-
-          <div class="logged-in-more" ngbDropdown [placement]="placement" container="body" autoClose="outside">
-            <my-global-icon iconName="more-vertical" ngbDropdownToggle role="button"></my-global-icon>
+          <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="glyphicon glyphicon-chevron-down"></span>
+              </div>
+            </div>
 
             <div ngbDropdownMenu>
-              <a *ngIf="user.account" ngbDropdownItem ngbDropdownToggle class="dropdown-item" [routerLink]="[ '/accounts', user.account.nameWithHost ]">
+              <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 ngbDropdownItem ngbDropdownToggle class="dropdown-item" routerLink="/my-account/notifications">
-                <my-global-icon iconName="inbox-full" aria-hidden="true"></my-global-icon> <ng-container i18n>My notifications</ng-container>
-              </a>
-
-              <div class="dropdown-divider"></div>
-
               <a ngbDropdownItem ngbDropdownToggle class="dropdown-item" (click)="openLanguageChooser()">
                 <my-global-icon iconName="language" aria-hidden="true"></my-global-icon>
                 <span i18n>Interface:</span>
-                <span class="ml-auto text-muted">{{ language }}</span>
+                <span class="ml-auto text-muted">{{ currentInterfaceLanguage }}</span>
               </a>
 
               <a ngbDropdownItem ngbDropdownToggle class="dropdown-item" routerLink="/my-account/settings" fragment="video-languages-subtitles"
-                #settingsLanguagesSubtitles (click)="onSameUrlRestoreScrollPosition(settingsLanguagesSubtitles)">
+                #settingsLanguagesSubtitles (click)="onActiveLinkScrollToAnchor(settingsLanguagesSubtitles)">
                 <my-global-icon iconName="video-lang" aria-hidden="true"></my-global-icon>
                 <span i18n>Videos:</span>
                 <span class="ml-auto text-muted">{{ videoLanguages.join(', ') }}</span>
               </a>
 
-              <a ngbDropdownItem ngbDropdownToggle class="dropdown-item" routerLink="/my-account/settings"
+              <a ngbDropdownItem ngbDropdownToggle class="dropdown-item settings-sensitive" routerLink="/my-account/settings"
                 fragment="video-sensitive-content-policy" #settingsSensitiveContentPolicy
-                (click)="onSameUrlRestoreScrollPosition(settingsSensitiveContentPolicy)">
-                <my-global-icon class="hover-display-toggle" [ngClass]="{ 'not-displayed': user.nsfwPolicy === 'display' }" iconName="sensitive" aria-hidden="true"></my-global-icon>
-                <my-global-icon class="hover-display-toggle" [ngClass]="{ 'not-displayed': user.nsfwPolicy !== 'display' }" iconName="unsensitive" aria-hidden="true"></my-global-icon>
+                (click)="onActiveLinkScrollToAnchor(settingsSensitiveContentPolicy)"
+              >
+                <my-global-icon class="hover-display-toggle" [hidden]="user.nsfwPolicy === 'display'" iconName="sensitive" aria-hidden="true"></my-global-icon>
+                <my-global-icon class="hover-display-toggle" [hidden]="user.nsfwPolicy !== 'display'" iconName="unsensitive" aria-hidden="true"></my-global-icon>
                 <span i18n>Sensitive:</span>
                 <span class="ml-auto text-muted">{{ nsfwPolicy }}</span>
               </a>
@@ -53,34 +56,39 @@
               <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>
-                <input type="checkbox" [checked]="user.webTorrentEnabled"/><label class="ml-auto" for="switch">Toggle p2p</label>
+
+                <my-input-switch class="ml-auto" [checked]="user.webTorrentEnabled"></my-input-switch>
               </a>
 
               <div class="dropdown-divider"></div>
 
-              <a ngbDropdownItem ngbDropdownToggle class="dropdown-item" (click)="openHotkeysCheatSheet()">
-                <i class="icon icon-shortcuts" aria-hidden="true"></i> <ng-container i18n>Keyboard shortcuts</ng-container>
+              <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>
+                <my-global-icon iconName="sign-out" aria-hidden="true"></my-global-icon>
+                <ng-container i18n>Log out</ng-container>
               </a>
             </div>
           </div>
+
+          <my-notification (navigate)="onActiveLinkScrollToAnchor($event)"></my-notification>
         </div>
 
         <div class="logged-in-menu">
-          <a routerLink="/my-account" routerLinkActive="active" #settingsLink (click)="onSameUrlRestoreScrollPosition(settingsLink)">
+          <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 routerLink="/my-library" routerLinkActive="active" #libraryLink (click)="onSameUrlRestoreScrollPosition(libraryLink)">
+          <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 *ngIf="userHasAdminAccess" [routerLink]="getFirstAdminRouteAvailable()" routerLinkActive="active">
+          <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>
@@ -88,83 +96,40 @@
       </div>
 
       <div *ngIf="!isLoggedIn" class="login-buttons-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="in-my-library">
-        <div i18n class="block-title">IN MY LIBRARY</div>
-
-        <a *ngIf="user.canSeeVideosLink" routerLink="/my-library/videos" routerLinkActive="active">
-          <my-global-icon iconName="videos" aria-hidden="true"></my-global-icon>
-          <ng-container i18n>Videos</ng-container>
-        </a>
-
-        <a routerLink="/my-library/video-playlists" routerLinkActive="active">
-          <my-global-icon iconName="playlists" aria-hidden="true"></my-global-icon>
-          <ng-container i18n>Playlists</ng-container>
-        </a>
-
-        <a routerLink="/videos/subscriptions" routerLinkActive="active">
-          <my-global-icon iconName="subscriptions" aria-hidden="true"></my-global-icon>
-          <ng-container i18n>Subscriptions</ng-container>
-        </a>
-
-        <a routerLink="/my-library/history/videos" routerLinkActive="active">
-          <my-global-icon iconName="history" aria-hidden="true"></my-global-icon>
-          <ng-container i18n>History</ng-container>
-        </a>
-
+        <a i18n routerLink="/login" 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="on-instance">
-        <div i18n class="block-title">ON {{instanceName}}</div>
-
-        <a routerLink="/videos/overview" routerLinkActive="active">
-          <my-global-icon iconName="globe" aria-hidden="true"></my-global-icon>
-          <ng-container i18n>Discover</ng-container>
-        </a>
-
-        <a routerLink="/videos/trending" routerLinkActive="active">
-          <my-global-icon iconName="trending" aria-hidden="true"></my-global-icon>
-          <ng-container i18n>Trending</ng-container>
-        </a>
+      <ng-container *ngFor="let menuSection of menuSections" >
+        <div [ngClass]="[ menuSection.key, 'menu-block' ]">
+          <div i18n class="block-title">{{ menuSection.title }}</div>
 
-        <a routerLink="/videos/most-liked" routerLinkActive="active">
-          <my-global-icon iconName="like" aria-hidden="true"></my-global-icon>
-          <ng-container i18n>Most liked</ng-container>
-        </a>
-
-        <a routerLink="/videos/recently-added" routerLinkActive="active">
-          <my-global-icon iconName="recently-added" aria-hidden="true"></my-global-icon>
-          <ng-container i18n>Recently added</ng-container>
-        </a>
-
-        <a routerLink="/videos/local" routerLinkActive="active">
-          <my-global-icon iconName="home" aria-hidden="true"></my-global-icon>
-          <ng-container i18n>Local videos</ng-container>
-        </a>
-      </div>
+          <a class="menu-link" *ngFor="let link of menuSection.links" [routerLink]="link.path" routerLinkActive="active">
+            <my-global-icon [iconName]="link.icon" aria-hidden="true"></my-global-icon>
+            <ng-container>{{ link.shortLabel }}</ng-container>
+          </a>
+        </div>
+      </ng-container>
     </div>
 
     <div class="footer">
       <div class="footer-block">
-        <a *ngIf="!isLoggedIn" (click)="openQuickSettings()">
+        <a *ngIf="!isLoggedIn" class="menu-link" (click)="openQuickSettings()">
           <my-global-icon iconName="cog" aria-hidden="true"></my-global-icon>
-          <ng-container i18n>Settings</ng-container>
+          <ng-container i18n>My settings</ng-container>
         </a>
 
-        <a routerLink="/about" routerLinkActive="active">
+        <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="bottom-links">
+      <div class="footer-bottom">
 
         <div class="footer-links">
           <div *ngIf="isLoggedIn === false">
-            <span role="button" (click)="openLanguageChooser()" class="c-hand" i18n>Interface: {{ language }}</span>
+            <span role="button" (click)="openLanguageChooser()" class="c-hand" i18n>Interface: {{ currentInterfaceLanguage }}</span>
           </div>
 
           <div>
@@ -178,11 +143,11 @@
         </div>
 
         <div class="footer-copyleft">
-          <small class="d-inline" i18n-title title="powered by PeerTube - CopyLeft 2015-2020">
+          <small class="d-inline" i18n-title title="powered by PeerTube - CopyLeft 2015-2021">
             <a href="https://joinpeertube.org" class="mr-1" target="_blank" rel="noopener noreferrer" i18n>powered by PeerTube</a>
 
             <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-2020
+              <span aria-label="copyleft" class="d-inline-block" style="transform: rotateY(180deg)">&copy;</span> 2015-2021
             </a>
           </small>
         </div>