ActivityPub-federated video streaming platform using P2P directly in your web browser
FIx menu entry highlight
Chocobozzz4f36a137cdbe
diff --git a/client/src/app/+about/about-instance/about-instance.component.ts b/client/src/app/+about/about-instance/about-instance.component.tsindex 24fe961ce5..d86bb53cac 100644--- a/client/src/app/+about/about-instance/about-instance.component.ts+++ b/client/src/app/+about/about-instance/about-instance.component.ts@@ -1,10 +1,10 @@-import { Component, ElementRef, OnInit, inject, viewChild, ChangeDetectionStrategy } from '@angular/core'+import { ChangeDetectionStrategy, Component, ElementRef, OnInit, inject, viewChild } from '@angular/core'import { ActivatedRoute, RouterOutlet } from '@angular/router'import { AboutHTML } from '@app/shared/shared-main/instance/instance.service'+import { HorizontalMenuComponent, HorizontalMenuEntry } from '@app/shared/shared-main/menu/horizontal-menu.component'import { ServerConfig, ServerStats } from '@peertube/peertube-models'import { ResolverData } from './about-instance.resolver'import { InstanceStatRulesComponent } from './instance-stat-rules.component'-import { HorizontalMenuComponent, HorizontalMenuEntry } from '@app/shared/shared-main/menu/horizontal-menu.component'@Component({selector: 'my-about-instance',@@ -65,5 +65,23 @@ export class AboutInstanceComponent implements OnInit {label: $localize`Technical information`,routerLink: '/about/instance/tech'})++ if (serverConfig.instance.support.text) {+ this.menuEntries.push({+ label: $localize`Support`,+ routerLink: '/about/instance/support',+ // Only used to highlight the menu entry, not to display it+ isDisplayed: () => false+ })+ }++ if (serverConfig.email.enabled && serverConfig.contactForm.enabled) {+ this.menuEntries.push({+ label: $localize`Contact`,+ routerLink: '/about/instance/contact',+ // Only used to highlight the menu entry, not to display it+ isDisplayed: () => false+ })+ }}}diff --git a/client/src/app/+about/about-instance/about-instance.routes.ts b/client/src/app/+about/about-instance/about-instance.routes.tsindex 6688867f6a..1e34d80f8b 100644--- a/client/src/app/+about/about-instance/about-instance.routes.ts+++ b/client/src/app/+about/about-instance/about-instance.routes.ts@@ -1,4 +1,5 @@import { Routes } from '@angular/router'+import { AboutContactComponent } from '../about-contact/about-contact.component'import { AboutInstanceComponent } from './about-instance.component'import { AboutInstanceResolver } from './about-instance.resolver'import { AboutInstanceHomeComponent } from './children/about-instance-home.component'@@ -47,6 +48,15 @@ export const aboutInstanceRoutes: Routes = [{path: 'moderation',component: AboutInstanceModerationComponent+ },+ {+ path: 'contact',+ component: AboutContactComponent,+ data: {+ meta: {+ title: $localize`Contact`+ }+ }}]}diff --git a/client/src/app/+about/about-instance/instance-stat-rules.component.html b/client/src/app/+about/about-instance/instance-stat-rules.component.htmlindex 9c8f07a41a..093ba2f780 100644--- a/client/src/app/+about/about-instance/instance-stat-rules.component.html+++ b/client/src/app/+about/about-instance/instance-stat-rules.component.html@@ -163,7 +163,7 @@<ng-container i18n>By default, your account does not allow to publish videos.</ng-container>@if (isContactFormEnabled()) {- <ng-container i18n> If you want to publish videos, <a routerLink="/about/contact">contact us</a>.</ng-container>+ <ng-container i18n> If you want to publish videos, <a routerLink="/about/instance/contact">contact us</a>.</ng-container>}</div></div>diff --git a/client/src/app/+about/about.component.html b/client/src/app/+about/about.component.htmlindex 8ac969b0d3..628ca661aa 100644--- a/client/src/app/+about/about.component.html+++ b/client/src/app/+about/about.component.html@@ -66,7 +66,7 @@<div class="d-flex flex-wrap justify-content-end">@if (isContactFormEnabled()) {- <my-button class="ms-3" theme="primary" ptRouterLink="/about/contact" i18n>Contact us</my-button>+ <my-button class="ms-3" theme="primary" ptRouterLink="/about/instance/contact" i18n>Contact us</my-button>}@if (config.instance.support.text) {diff --git a/client/src/app/+about/about.component.ts b/client/src/app/+about/about.component.tsindex bb42bf5712..a3183bfb9f 100644--- a/client/src/app/+about/about.component.ts+++ b/client/src/app/+about/about.component.ts@@ -1,4 +1,4 @@-import { Component, OnInit, inject, viewChild, ChangeDetectionStrategy } from '@angular/core'+import { ChangeDetectionStrategy, Component, OnInit, inject, viewChild } from '@angular/core'import { RouterOutlet } from '@angular/router'import { ServerService } from '@app/core'import { GlobalIconComponent } from '@app/shared/shared-icons/global-icon.component'diff --git a/client/src/app/+about/routes.ts b/client/src/app/+about/routes.tsindex 94cd835115..ae252f8f2c 100644--- a/client/src/app/+about/routes.ts+++ b/client/src/app/+about/routes.ts@@ -4,7 +4,6 @@ import { AboutPeertubeComponent } from '@app/+about/about-peertube/about-peertubimport { CustomMarkupService } from '@app/shared/shared-custom-markup/custom-markup.service'import { DynamicElementService } from '@app/shared/shared-custom-markup/dynamic-element.service'import { InstanceFollowService } from '@app/shared/shared-instance/instance-follow.service'-import { AboutContactComponent } from './about-contact/about-contact.component'import { aboutInstanceRoutes } from './about-instance/about-instance.routes'import { AboutComponent } from './about.component'@@ -48,12 +47,8 @@ export default [{path: 'contact',- component: AboutContactComponent,- data: {- meta: {- title: $localize`Contact`- }- }+ redirectTo: 'instance/contact',+ pathMatch: 'full'}]}diff --git a/client/src/app/+videos-publish-manage/+video-publish/video-publish.component.html b/client/src/app/+videos-publish-manage/+video-publish/video-publish.component.htmlindex 3a283ce1c8..51efb8a192 100644--- a/client/src/app/+videos-publish-manage/+video-publish/video-publish.component.html+++ b/client/src/app/+videos-publish-manage/+video-publish/video-publish.component.html@@ -1,6 +1,6 @@<ng-template #helpButtons>@if (isContactFormEnabled) {- <a i18n routerLink="/about/contact" class="peertube-button-link primary-button mt-3 me-3">Contact us</a>+ <a i18n routerLink="/about/instance/contact" class="peertube-button-link primary-button mt-3 me-3">Contact us</a>}<a i18n routerLink="/about/instance" class="peertube-button-link primary-button mt-3">Read instance rules for help</a>