<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" [container]="dropdownContainer" (openChange)="onDropdownOpenChange($event)" autoClose="outside">
+ <div ngbDropdownToggle>
+ <img [src]="user.accountAvatarUrl" alt="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]="[ '/accounts', 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)">
+ (click)="onActiveLinkScrollToAnchor(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>
<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 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 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 i18n *ngIf="isRegistrationAllowed()" routerLink="/signup" class="create-account-button">Create an account</a>
</div>
- <div *ngIf="isLoggedIn" class="in-my-account">
- <div i18n class="block-title">IN MY ACCOUNT</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>
<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>
+ <ng-container i18n>My settings</ng-container>
</a>
<a routerLink="/about" routerLinkActive="active">
<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>
</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)">©</span> 2015-2020
+ <span aria-label="copyleft" class="d-inline-block" style="transform: rotateY(180deg)">©</span> 2015-2021
</a>
</small>
</div>
projects / github / Chocobozzz / PeerTube.git / blobdiff