aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2018-09-28 13:42:33 +0200
committerRigel Kent <sendmemail@rigelk.eu>2018-09-28 13:42:33 +0200
commit8be9f43aed84aa82a4a8e166c0855bd19e8afa90 (patch)
tree037aaffc284f35651e1cf9a47b9c79d51adfa3e5
parent5ce1208a0a57d566b5b1fd57ec291a7d053ebaf0 (diff)
downloadPeerTube-8be9f43aed84aa82a4a8e166c0855bd19e8afa90.tar.gz
PeerTube-8be9f43aed84aa82a4a8e166c0855bd19e8afa90.tar.zst
PeerTube-8be9f43aed84aa82a4a8e166c0855bd19e8afa90.zip
correct local subscribe in the subscription menu
-rw-r--r--client/src/app/shared/user-subscription/subscribe-button.component.html7
-rw-r--r--client/src/app/shared/user-subscription/subscribe-button.component.ts1
-rw-r--r--client/src/app/videos/+video-watch/comment/video-comment-add.component.html7
3 files changed, 10 insertions, 5 deletions
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 2c8481c96..dbf6a34f0 100644
--- a/client/src/app/shared/user-subscription/subscribe-button.component.html
+++ b/client/src/app/shared/user-subscription/subscribe-button.component.html
@@ -33,15 +33,14 @@
33 33
34 <div class="dropdown-menu" ngbDropdownMenu> 34 <div class="dropdown-menu" ngbDropdownMenu>
35 35
36 <h6 class="dropdown-header" i18n>Using an ActivityPub-compatible account</h6> 36 <h6 class="dropdown-header" i18n>Using an ActivityPub account</h6>
37 37
38 <button class="dropdown-item" (click)="subscribe()" 38 <button class="dropdown-item" (click)="subscribe()">
39 *ngIf="subscribed === false">
40 <span *ngIf="!isUserLoggedIn()" i18n>Subscribe with an account on {{ videoChannel.host }}</span> 39 <span *ngIf="!isUserLoggedIn()" i18n>Subscribe with an account on {{ videoChannel.host }}</span>
41 <span *ngIf="isUserLoggedIn()" i18n>Subscribe with your local account</span> 40 <span *ngIf="isUserLoggedIn()" i18n>Subscribe with your local account</span>
42 </button> 41 </button>
43 42
44 <button class="dropdown-item" i18n>Subscribe with a remote account:</button> 43 <button class="dropdown-item" i18n>Subscribe with a Mastodon account:</button>
45 <my-remote-subscribe showHelp="true" account="{{ uriAccount }}"></my-remote-subscribe> 44 <my-remote-subscribe showHelp="true" account="{{ uriAccount }}"></my-remote-subscribe>
46 45
47 <div class="dropdown-divider"></div> 46 <div class="dropdown-divider"></div>
diff --git a/client/src/app/shared/user-subscription/subscribe-button.component.ts b/client/src/app/shared/user-subscription/subscribe-button.component.ts
index 95c2bb8f8..315ea5037 100644
--- a/client/src/app/shared/user-subscription/subscribe-button.component.ts
+++ b/client/src/app/shared/user-subscription/subscribe-button.component.ts
@@ -52,6 +52,7 @@ export class SubscribeButtonComponent implements OnInit {
52 if (this.isUserLoggedIn()) { 52 if (this.isUserLoggedIn()) {
53 this.localSubscribe() 53 this.localSubscribe()
54 } else { 54 } else {
55 this.authService.redirectUrl = this.router.url
55 this.gotoLogin() 56 this.gotoLogin()
56 } 57 }
57 } 58 }
diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html b/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
index 4a48f4649..086a1d84e 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
+++ b/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
@@ -34,7 +34,12 @@
34 </span> 34 </span>
35 <span class="btn btn-sm mx-3" role="button" (click)="gotoLogin()" i18n>login to comment</span> 35 <span class="btn btn-sm mx-3" role="button" (click)="gotoLogin()" i18n>login to comment</span>
36 <span i18n> 36 <span i18n>
37 Otherwise you can comment using an account on an ActivityPub-compatible instance: 37 Otherwise you can comment using an account on any ActivityPub-compatible instance.
38 On most platforms, you can find the video by typing its URL in the search bar and then comment it
39 from within the software's interface.
40 </span>
41 <span i18n>
42 If you have an account on Mastodon or Pleroma, you can open it directly in their interface:
38 </span> 43 </span>
39 <my-remote-subscribe [interact]="true" account="{{ uri }}"></my-remote-subscribe> 44 <my-remote-subscribe [interact]="true" account="{{ uri }}"></my-remote-subscribe>
40 </div> 45 </div>