<div class="top-menu">
<div *ngIf="isLoggedIn" class="logged-in-block">
<div>
- <div class="logged-in-more" ngbDropdown #dropdown="ngbDropdown" placement="bottom-left" [container]="dropdownContainer" (openChange)="onDropdownOpenChange($event)" autoClose="outside">
+ <div
+ class="logged-in-more" ngbDropdown #dropdown="ngbDropdown" placement="bottom-left auto"
+ [container]="dropdownContainer" (openChange)="onDropdownOpenChange($event)" autoClose="outside"
+ >
<div ngbDropdownToggle>
- <img [src]="user.accountAvatarUrl" alt="Avatar" />
+ <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>
<div ngbDropdownMenu>
- <a *ngIf="user.account" ngbDropdownItem ngbDropdownToggle class="dropdown-item" [routerLink]="[ '/accounts', user.account.nameWithHost ]"
- #profile (click)="onActiveLinkScrollToAnchor(profile)">
+ <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" (click)="openLanguageChooser()">
+ <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="ml-auto text-muted">{{ currentInterfaceLanguage }}</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="ml-auto text-muted">{{ videoLanguages.join(', ') }}</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" [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>
+ <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="ml-auto" [checked]="user.webTorrentEnabled"></my-input-switch>
+ <my-input-switch class="ms-auto" [checked]="user.p2pEnabled"></my-input-switch>
</a>
<div class="dropdown-divider"></div>
</div>
<div class="logged-in-menu">
- <a routerLink="/my-account" routerLinkActive="active" #settingsLink (click)="onActiveLinkScrollToAnchor(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)="onActiveLinkScrollToAnchor(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>
</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 *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="on-instance">
- <div i18n class="block-title">ON {{instanceName}}</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" 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>
-
- <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 *ngIf="link.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>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">
</div>
<div class="footer-copyleft">
- <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>
+ <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>
<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-2021
+ <span aria-label="copyleft" class="d-inline-block" style="transform: rotateY(180deg)">©</span> 2015-2022
</a>
</small>
</div>
projects / github / Chocobozzz / PeerTube.git / blobdiff