diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2018-06-07 11:28:53 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-06-07 15:07:06 +0200 |
commit | 9e32b99c201d440abd539e408ee1d7631b40f382 (patch) | |
tree | 4fb00778e73a4b71660946f7bacbd8bc83456841 /client | |
parent | 46659d01dfd51a5ff3ca389978f8a0dda1d986d9 (diff) | |
download | PeerTube-9e32b99c201d440abd539e408ee1d7631b40f382.tar.gz PeerTube-9e32b99c201d440abd539e408ee1d7631b40f382.tar.zst PeerTube-9e32b99c201d440abd539e408ee1d7631b40f382.zip |
fixing #595 by using the account name instead of the displayName
Diffstat (limited to 'client')
-rw-r--r-- | client/src/app/videos/+video-watch/comment/video-comments.component.html | 5 | ||||
-rw-r--r-- | client/src/app/videos/+video-watch/video-watch.component.html | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.html b/client/src/app/videos/+video-watch/comment/video-comments.component.html index 6dc454d00..7278f7e57 100644 --- a/client/src/app/videos/+video-watch/comment/video-comments.component.html +++ b/client/src/app/videos/+video-watch/comment/video-comments.component.html | |||
@@ -3,10 +3,9 @@ | |||
3 | <div i18n class="title-page title-page-single"> | 3 | <div i18n class="title-page title-page-single"> |
4 | Comments | 4 | Comments |
5 | </div> | 5 | </div> |
6 | <my-help | 6 | <my-help |
7 | *ngIf="video.commentsEnabled === true" helpType="custom" i18n-customHtml | 7 | *ngIf="video.commentsEnabled === true" helpType="custom" i18n-customHtml |
8 | customHtml="You can either comment on the page of your instance where this video is federated with your PeerTube account, or via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box <strong>@{{video.account.displayName}}@{{video.account.host}}</strong> and find back the video. Direct commenting capabilities are being worked on in <a href='https://github.com/Chocobozzz/PeerTube/issues/224'>#224</a>." | 8 | customHtml="You can either comment on the page of your instance where this video is federated with your PeerTube account, or via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box <strong>@{{video.account.name}}@{{video.account.host}}</strong> and find back the video. Direct commenting capabilities are being worked on in <a href='https://github.com/Chocobozzz/PeerTube/issues/224'>#224</a>."></my-help> |
9 | ></my-help> | ||
10 | </div> | 9 | </div> |
11 | 10 | ||
12 | <ng-template [ngIf]="video.commentsEnabled === true"> | 11 | <ng-template [ngIf]="video.commentsEnabled === true"> |
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html index 202a12fb0..d80b633df 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.html +++ b/client/src/app/videos/+video-watch/video-watch.component.html | |||
@@ -21,11 +21,11 @@ | |||
21 | {{ video.channel.displayName }} | 21 | {{ video.channel.displayName }} |
22 | </a> | 22 | </a> |
23 | <!-- Here will be the subscribe button --> | 23 | <!-- Here will be the subscribe button --> |
24 | <my-help helpType="custom" i18n-customHtml customHtml="You can subscribe to this account via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box <strong>@{{video.account.displayName}}@{{video.account.host}}</strong> and subscribe there. Subscription as a PeerTube user is being worked on in <a href='https://github.com/Chocobozzz/PeerTube/issues/470'>#470</a>."></my-help> | 24 | <my-help helpType="custom" i18n-customHtml customHtml="You can subscribe to this account via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box <strong>@{{video.account.name}}@{{video.account.host}}</strong> and subscribe there. Subscription as a PeerTube user is being worked on in <a href='https://github.com/Chocobozzz/PeerTube/issues/470'>#470</a>."></my-help> |
25 | </div> | 25 | </div> |
26 | 26 | ||
27 | <div class="video-info-by"> | 27 | <div class="video-info-by"> |
28 | <a [routerLink]="[ '/accounts', video.by ]" i18n-title title="Go the account page"> | 28 | <a [routerLink]="[ '/accounts', video.by ]" i18n-title title="Go to the account page"> |
29 | <span i18n>By {{ video.by }}</span> | 29 | <span i18n>By {{ video.by }}</span> |
30 | <img [src]="video.accountAvatarUrl" alt="Account avatar" /> | 30 | <img [src]="video.accountAvatarUrl" alt="Account avatar" /> |
31 | </a> | 31 | </a> |