Reorganize left menu and account menu

Add my-settings and my-library in left menu
Move administration below my-library
Split account menu: my-setting and my library

1 files changed, 92 insertions, 87 deletions

diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html
index 2011899d3..a4b4f26d0 100644
--- a/client/src/app/menu/menu.component.html
+++ b/client/src/app/menu/menu.component.html
@@ -1,98 +1,106 @@
 <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" (navigate)="onSameUrlRestoreScrollPosition($event)"></my-avatar-notification>
+        <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-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 ngbDropdownMenu>
-            <a *ngIf="user.account" ngbDropdownItem ngbDropdownToggle class="dropdown-item" [routerLink]="[ '/accounts', user.account.nameWithHost ]">
-              <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/settings"
-              #settingsLink (click)="onSameUrlRestoreScrollPosition(settingsLink)">
-              <my-global-icon iconName="user" aria-hidden="true"></my-global-icon> <ng-container i18n>Account settings</ng-container>
-            </a>
-
-            <a ngbDropdownItem ngbDropdownToggle class="dropdown-item" routerLink="/my-account/video-channels"
-              #channelsLink (click)="onSameUrlRestoreScrollPosition(channelsLink)">
-              <my-global-icon iconName="channel" aria-hidden="true"></my-global-icon> <ng-container i18n>Channels settings</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>
-            </a>
-
-            <a ngbDropdownItem ngbDropdownToggle class="dropdown-item" routerLink="/my-account/settings" fragment="video-languages-subtitles"
-              #settingsLanguagesSubtitles (click)="onSameUrlRestoreScrollPosition(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"
-              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>
-              <span i18n>Sensitive:</span>
-              <span class="ml-auto text-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>
-              <input type="checkbox" [checked]="user.webTorrentEnabled"/><label class="ml-auto" for="switch">Toggle p2p</label>
-            </a>
-
-            <a ngbDropdownItem ngbDropdownToggle class="dropdown-item" routerLink="/my-account/settings"
-              #settingsMoreLink (click)="onSameUrlRestoreScrollPosition(settingsMoreLink)">
-              <my-global-icon iconName="more-horizontal" aria-hidden="true"></my-global-icon> <ng-container i18n>More account settings</ng-container>
-            </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>
+            <div class="logged-in-username">@{{ user.username }}</div>
+          </div>
 
-            <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 class="logged-in-more" ngbDropdown [placement]="placement" container="body" autoClose="outside">
+            <my-global-icon iconName="more-vertical" ngbDropdownToggle role="button"></my-global-icon>
+
+            <div ngbDropdownMenu>
+              <a *ngIf="user.account" ngbDropdownItem ngbDropdownToggle class="dropdown-item" [routerLink]="[ '/accounts', user.account.nameWithHost ]">
+                <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>
+              </a>
+
+              <a ngbDropdownItem ngbDropdownToggle class="dropdown-item" routerLink="/my-account/settings" fragment="video-languages-subtitles"
+                #settingsLanguagesSubtitles (click)="onSameUrlRestoreScrollPosition(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"
+                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>
+                <span i18n>Sensitive:</span>
+                <span class="ml-auto text-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>
+                <input type="checkbox" [checked]="user.webTorrentEnabled"/><label class="ml-auto" for="switch">Toggle p2p</label>
+              </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>
+
+              <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>
+
+        <div class="logged-in-menu">
+          <a routerLink="/my-account" routerLinkActive="active" #settingsLink (click)="onSameUrlRestoreScrollPosition(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)">
+            <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">
+            <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">
+      <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="panel-block">
-        <div i18n class="block-title">MY LIBRARY</div>
+      <div *ngIf="isLoggedIn" class="in-my-account">
+        <div i18n class="block-title">IN MY ACCOUNT</div>
 
-        <a *ngIf="user.canSeeVideosLink" routerLink="/my-account/videos" routerLinkActive="active">
+        <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-account/video-playlists" routerLinkActive="active">
+        <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>
@@ -102,15 +110,15 @@
           <ng-container i18n>Subscriptions</ng-container>
         </a>
 
-        <a routerLink="/my-account/history/videos" routerLinkActive="active">
+        <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>
 
       </div>
 
-      <div class="panel-block">
-        <div i18n class="block-title">VIDEOS</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>
@@ -134,22 +142,19 @@
 
         <a routerLink="/videos/local" routerLinkActive="active">
           <my-global-icon iconName="home" aria-hidden="true"></my-global-icon>
-          <ng-container i18n>Local</ng-container>
+          <ng-container i18n>Local videos</ng-container>
         </a>
       </div>
     </div>
 
     <div class="footer">
-      <div class="panel-block">
-        <a *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 class="footer-block">
         <a *ngIf="!isLoggedIn" (click)="openQuickSettings()">
           <my-global-icon iconName="cog" aria-hidden="true"></my-global-icon>
           <ng-container i18n>Settings</ng-container>
         </a>
-        <a routerLink="/about/instance">
+
+        <a routerLink="/about" routerLinkActive="active">
           <my-global-icon iconName="help" aria-hidden="true"></my-global-icon>
           <ng-container i18n>About</ng-container>
         </a>
@@ -168,7 +173,7 @@
             <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>Shortcuts</a>
+            <a (click)="openHotkeysCheatSheet()" class="c-hand" i18n>Keyboard shortcuts</a>
           </div>
         </div>