diff options
author | Rigel <sendmemail@rigelk.eu> | 2018-05-07 17:40:46 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-05-11 08:28:55 +0200 |
commit | 169310b288ea4ecfd0a664bc0829b404e1cc7bc2 (patch) | |
tree | 7aebf9a39f9121a70a3163d0828aa9f24c22647b | |
parent | dea65ef24130c9024dccecd3ec5f04890c44eabb (diff) | |
download | PeerTube-169310b288ea4ecfd0a664bc0829b404e1cc7bc2.tar.gz PeerTube-169310b288ea4ecfd0a664bc0829b404e1cc7bc2.tar.zst PeerTube-169310b288ea4ecfd0a664bc0829b404e1cc7bc2.zip |
adding basic helpers to guide users for comments/subscribe to accounts
4 files changed, 18 insertions, 2 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 6f3e57160..114a56dc7 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 | |||
@@ -1,6 +1,9 @@ | |||
1 | <div> | 1 | <div> |
2 | <div class="title-page title-page-single"> | 2 | <div class="title-block"> |
3 | Comments | 3 | <div class="title-page title-page-single"> |
4 | Comments | ||
5 | </div> | ||
6 | <my-help *ngIf="video.commentsEnabled === true" helpType="custom" 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>."></my-help> | ||
4 | </div> | 7 | </div> |
5 | 8 | ||
6 | <ng-template [ngIf]="video.commentsEnabled === true"> | 9 | <ng-template [ngIf]="video.commentsEnabled === true"> |
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.scss b/client/src/app/videos/+video-watch/comment/video-comments.component.scss index 0b8aa1854..d5af929d7 100644 --- a/client/src/app/videos/+video-watch/comment/video-comments.component.scss +++ b/client/src/app/videos/+video-watch/comment/video-comments.component.scss | |||
@@ -19,6 +19,14 @@ | |||
19 | font-size: 13px; | 19 | font-size: 13px; |
20 | } | 20 | } |
21 | 21 | ||
22 | .title-block .title-page { | ||
23 | margin-right: 0; | ||
24 | } | ||
25 | |||
26 | my-help { | ||
27 | display: inline-block; | ||
28 | } | ||
29 | |||
22 | @media screen and (max-width: 600px) { | 30 | @media screen and (max-width: 600px) { |
23 | .view-replies { | 31 | .view-replies { |
24 | margin-left: 46px; | 32 | margin-left: 46px; |
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 402a91647..990b9400d 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.html +++ b/client/src/app/videos/+video-watch/video-watch.component.html | |||
@@ -21,6 +21,7 @@ | |||
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" 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 | </div> | 25 | </div> |
25 | 26 | ||
26 | <div class="video-info-by"> | 27 | <div class="video-info-by"> |
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss index 508c553a4..990f86cc5 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss | |||
@@ -76,6 +76,10 @@ | |||
76 | opacity: 0.8; | 76 | opacity: 0.8; |
77 | } | 77 | } |
78 | } | 78 | } |
79 | |||
80 | my-help { | ||
81 | display: inline-block; | ||
82 | } | ||
79 | } | 83 | } |
80 | 84 | ||
81 | .video-info-by a { | 85 | .video-info-by a { |