From ca589b42f1159d4474d7803c02b0c90579316bd5 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 18 Aug 2023 11:09:34 +0200 Subject: [PATCH] Fix button router link Using the default one assigns the directive to the host, where we just want to put it inside the `my-button` component --- .../plugin-list-installed.component.html | 2 +- .../+admin/plugins/plugin-search/plugin-search.component.html | 2 +- .../my-account-two-factor-button.component.html | 2 +- .../+my-video-channels/my-video-channels.component.html | 2 +- .../my-video-imports/my-video-imports.component.html | 2 +- .../my-video-playlists/my-video-playlists.component.html | 2 +- client/src/app/+my-library/my-videos/my-videos.component.html | 2 +- .../src/app/shared/shared-main/buttons/button.component.html | 4 ++-- client/src/app/shared/shared-main/buttons/button.component.ts | 2 +- .../app/shared/shared-main/buttons/edit-button.component.ts | 4 ++-- .../shared-video-live/live-stream-information.component.html | 2 +- .../video-playlist-element-miniature.component.html | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.html b/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.html index 374c4d96d..e80855a02 100644 --- a/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.html +++ b/client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.html @@ -9,7 +9,7 @@
diff --git a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html index 08430913a..9c45ee590 100644 --- a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html +++ b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.html @@ -41,7 +41,7 @@
diff --git a/client/src/app/+my-account/my-account-settings/my-account-two-factor/my-account-two-factor-button.component.html b/client/src/app/+my-account/my-account-settings/my-account-two-factor/my-account-two-factor-button.component.html index 2fcfffbf3..d63a402e5 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-two-factor/my-account-two-factor-button.component.html +++ b/client/src/app/+my-account/my-account-settings/my-account-two-factor/my-account-two-factor-button.component.html @@ -2,7 +2,7 @@

Two factor authentication adds an additional layer of security to your account by requiring a numeric code from another device (most commonly mobile phones) when you log in.

- Enable two-factor authentication + Enable two-factor authentication
diff --git a/client/src/app/+my-library/+my-video-channels/my-video-channels.component.html b/client/src/app/+my-library/+my-video-channels/my-video-channels.component.html index 0fe061983..154836854 100644 --- a/client/src/app/+my-library/+my-video-channels/my-video-channels.component.html +++ b/client/src/app/+my-library/+my-video-channels/my-video-channels.component.html @@ -50,7 +50,7 @@
- +
diff --git a/client/src/app/+my-library/my-video-imports/my-video-imports.component.html b/client/src/app/+my-library/my-video-imports/my-video-imports.component.html index d25eff24c..34d5bc4b2 100644 --- a/client/src/app/+my-library/my-video-imports/my-video-imports.component.html +++ b/client/src/app/+my-library/my-video-imports/my-video-imports.component.html @@ -41,7 +41,7 @@ - + diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.html b/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.html index ebcb0b1fd..5b6b7bf48 100644 --- a/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.html +++ b/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.html @@ -25,7 +25,7 @@
- +
diff --git a/client/src/app/+my-library/my-videos/my-videos.component.html b/client/src/app/+my-library/my-videos/my-videos.component.html index b95287151..120f08d11 100644 --- a/client/src/app/+my-library/my-videos/my-videos.component.html +++ b/client/src/app/+my-library/my-videos/my-videos.component.html @@ -54,7 +54,7 @@
- + + - + diff --git a/client/src/app/shared/shared-main/buttons/button.component.ts b/client/src/app/shared/shared-main/buttons/button.component.ts index e3a830891..50a3d99ef 100644 --- a/client/src/app/shared/shared-main/buttons/button.component.ts +++ b/client/src/app/shared/shared-main/buttons/button.component.ts @@ -12,7 +12,7 @@ export class ButtonComponent implements OnInit, OnChanges { @Input() label = '' @Input() className = 'grey-button' @Input() icon: GlobalIconName = undefined - @Input() routerLink: string[] | string + @Input() ptRouterLink: string[] | string @Input() title: string = undefined @Input() loading = false @Input() disabled = false diff --git a/client/src/app/shared/shared-main/buttons/edit-button.component.ts b/client/src/app/shared/shared-main/buttons/edit-button.component.ts index 28aacbbff..850be1dec 100644 --- a/client/src/app/shared/shared-main/buttons/edit-button.component.ts +++ b/client/src/app/shared/shared-main/buttons/edit-button.component.ts @@ -6,14 +6,14 @@ import { Component, Input, OnInit } from '@angular/core' ` }) export class EditButtonComponent implements OnInit { @Input() label: string @Input() title: string - @Input() routerLink: string[] | string = [] + @Input() ptRouterLink: string[] | string = [] @Input() responsiveLabel = false ngOnInit () { diff --git a/client/src/app/shared/shared-video-live/live-stream-information.component.html b/client/src/app/shared/shared-video-live/live-stream-information.component.html index e385b429c..cabae6256 100644 --- a/client/src/app/shared/shared-video-live/live-stream-information.component.html +++ b/client/src/app/shared/shared-video-live/live-stream-information.component.html @@ -53,7 +53,7 @@
diff --git a/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html b/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html index 5ab5d8921..f7849e5ec 100644 --- a/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html +++ b/client/src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html @@ -51,7 +51,7 @@ - +