OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

correct local subscribe in the subscription menu

pull/1144/head
Rigel Kent 2018-09-28 13:42:33 +02:00
parent 5ce1208a0a
commit 8be9f43aed
No known key found for this signature in database
GPG Key ID: EA12971B0E438F36
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/app/shared/user-subscription/subscribe-button.component.html
View File

@ -33,15 +33,14 @@
<div class="dropdown-menu" ngbDropdownMenu> <div class="dropdown-menu" ngbDropdownMenu>
<h6 class="dropdown-header" i18n>Using an ActivityPub-compatible account</h6> <h6 class="dropdown-header" i18n>Using an ActivityPub account</h6>
<button class="dropdown-item" (click)="subscribe()" <button class="dropdown-item" (click)="subscribe()">
*ngIf="subscribed === false">
<span *ngIf="!isUserLoggedIn()" i18n>Subscribe with an account on {{ videoChannel.host }}</span> <span *ngIf="!isUserLoggedIn()" i18n>Subscribe with an account on {{ videoChannel.host }}</span>
<span *ngIf="isUserLoggedIn()" i18n>Subscribe with your local account</span> <span *ngIf="isUserLoggedIn()" i18n>Subscribe with your local account</span>
</button> </button>
<button class="dropdown-item" i18n>Subscribe with a remote account:</button> <button class="dropdown-item" i18n>Subscribe with a Mastodon account:</button>
<my-remote-subscribe showHelp="true" account="{{ uriAccount }}"></my-remote-subscribe> <my-remote-subscribe showHelp="true" account="{{ uriAccount }}"></my-remote-subscribe>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>

1
client/src/app/shared/user-subscription/subscribe-button.component.ts
View File

@ -52,6 +52,7 @@ export class SubscribeButtonComponent implements OnInit {
if (this.isUserLoggedIn()) { if (this.isUserLoggedIn()) {
this.localSubscribe() this.localSubscribe()
} else { } else {
this.authService.redirectUrl = this.router.url
this.gotoLogin() this.gotoLogin()
} }
} }

7
client/src/app/videos/+video-watch/comment/video-comment-add.component.html
View File

@ -34,7 +34,12 @@
</span> </span>
<span class="btn btn-sm mx-3" role="button" (click)="gotoLogin()" i18n>login to comment</span> <span class="btn btn-sm mx-3" role="button" (click)="gotoLogin()" i18n>login to comment</span>
<span i18n> <span i18n>
Otherwise you can comment using an account on an ActivityPub-compatible instance: Otherwise you can comment using an account on any ActivityPub-compatible instance.
On most platforms, you can find the video by typing its URL in the search bar and then comment it
from within the software's interface.
</span>
<span i18n>
If you have an account on Mastodon or Pleroma, you can open it directly in their interface:
</span> </span>
<my-remote-subscribe [interact]="true" account="{{ uri }}"></my-remote-subscribe> <my-remote-subscribe [interact]="true" account="{{ uri }}"></my-remote-subscribe>
</div> </div>