From 41eb700fceee1085dd0e1a9ce78ecbd0e111eb6e Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Tue, 7 Jan 2020 23:51:14 +0100 Subject: Refactor my-subscribe-button to support full account subscription --- .../account-video-channels.component.html | 10 +- client/src/app/+accounts/accounts.component.html | 9 +- client/src/app/+accounts/accounts.component.scss | 10 ++ client/src/app/+accounts/accounts.component.ts | 10 +- .../my-account-subscriptions.component.html | 2 +- .../+video-channels/video-channels.component.html | 2 +- client/src/app/search/search.component.html | 2 +- .../subscribe-button.component.html | 52 ++++++---- .../subscribe-button.component.ts | 114 +++++++++++++++++---- .../shared/video/video-miniature.component.html | 6 +- .../videos/+video-watch/video-watch.component.html | 2 +- 11 files changed, 167 insertions(+), 52 deletions(-) (limited to 'client/src') diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.html b/client/src/app/+accounts/account-video-channels/account-video-channels.component.html index 4ebad514c..93f43a350 100644 --- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.html +++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.html @@ -9,14 +9,18 @@ Avatar
{{ videoChannel.displayName }}
-
{{ videoChannel.followersCount }} subscribers
+
{{ videoChannel.followersCount }} + + subscriber + subscribers +
- +
-
This channel does not have videos.
+
This channel doesn't have any videos.
-
{{ account.followersCount }} subscribers
+
+ {{ account.followersCount }} + + subscriber + subscribers +
+ + - + diff --git a/client/src/app/+video-channels/video-channels.component.html b/client/src/app/+video-channels/video-channels.component.html index f8b7fa583..f4b944c59 100644 --- a/client/src/app/+video-channels/video-channels.component.html +++ b/client/src/app/+video-channels/video-channels.component.html @@ -15,7 +15,7 @@ - +
{{ videoChannel.followersCount }} subscribers
diff --git a/client/src/app/search/search.component.html b/client/src/app/search/search.component.html index 055f64cc8..496ee970a 100644 --- a/client/src/app/search/search.component.html +++ b/client/src/app/search/search.component.html @@ -44,7 +44,7 @@
{{ result.followersCount }} subscribers
- +
diff --git a/client/src/app/shared/user-subscription/subscribe-button.component.html b/client/src/app/shared/user-subscription/subscribe-button.component.html index 25f3be215..a119beff6 100644 --- a/client/src/app/shared/user-subscription/subscribe-button.component.html +++ b/client/src/app/shared/user-subscription/subscribe-button.component.html @@ -1,34 +1,46 @@
- + + + + + + + - + +
- +
-- cgit v1.2.3