diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-04-23 21:57:08 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-04-26 21:23:19 +0200 |
commit | 8ce9e815c8212647d702b94ca8633943d1aa663a (patch) | |
tree | 76bec30e63d3d8bbc34425d7bd28b7b53052f5ac /client | |
parent | b362290d40a93cf0f9746f9aeae4fe5457157a81 (diff) | |
download | PeerTube-8ce9e815c8212647d702b94ca8633943d1aa663a.tar.gz PeerTube-8ce9e815c8212647d702b94ca8633943d1aa663a.tar.zst PeerTube-8ce9e815c8212647d702b94ca8633943d1aa663a.zip |
Client: display video tags
Diffstat (limited to 'client')
4 files changed, 31 insertions, 2 deletions
diff --git a/client/src/app/videos/video-list/video-miniature.component.html b/client/src/app/videos/video-list/video-miniature.component.html index 826aa6a29..ba70002b0 100644 --- a/client/src/app/videos/video-list/video-miniature.component.html +++ b/client/src/app/videos/video-list/video-miniature.component.html | |||
@@ -24,6 +24,12 @@ | |||
24 | <a [routerLink]="['/videos/watch', video.id]" [attr.title]="getVideoName()" class="video-miniature-name">{{ getVideoName() }}</a> | 24 | <a [routerLink]="['/videos/watch', video.id]" [attr.title]="getVideoName()" class="video-miniature-name">{{ getVideoName() }}</a> |
25 | </span> | 25 | </span> |
26 | 26 | ||
27 | <div class="video-miniature-tags"> | ||
28 | <span *ngFor="let tag of video.tags" class="video-miniature-tag"> | ||
29 | <a [routerLink]="['/videos/list', { field: 'tags', search: tag, sort: currentSort }]" class="label label-primary">{{ tag }}</a> | ||
30 | </span> | ||
31 | </div> | ||
32 | |||
27 | <a [routerLink]="['/videos/list', { field: 'author', search: video.author, sort: currentSort }]" class="video-miniature-author">{{ video.by }}</a> | 33 | <a [routerLink]="['/videos/list', { field: 'author', search: video.author, sort: currentSort }]" class="video-miniature-author">{{ video.by }}</a> |
28 | <span class="video-miniature-created-at">{{ video.createdAt | date:'short' }}</span> | 34 | <span class="video-miniature-created-at">{{ video.createdAt | date:'short' }}</span> |
29 | </div> | 35 | </div> |
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 059465d65..124a3ba8b 100644 --- a/client/src/app/videos/video-watch/video-watch.component.html +++ b/client/src/app/videos/video-watch/video-watch.component.html | |||
@@ -157,6 +157,19 @@ | |||
157 | {{ video.languageLabel }} | 157 | {{ video.languageLabel }} |
158 | </span> | 158 | </span> |
159 | </div> | 159 | </div> |
160 | |||
161 | <div class="video-details-attribute"> | ||
162 | <span class="video-details-attribute-label"> | ||
163 | Tags: | ||
164 | </span> | ||
165 | |||
166 | <div class="video-details-tags"> | ||
167 | <a *ngFor="let tag of video.tags" [routerLink]="['/videos/list', { field: 'tags', search: tag }]" class="label label-primary"> | ||
168 | {{ tag }} | ||
169 | </a> | ||
170 | </div> | ||
171 | </div> | ||
172 | |||
160 | </div> | 173 | </div> |
161 | </div> | 174 | </div> |
162 | </div> | 175 | </div> |
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 a8c7fdbac..8d8454cfd 100644 --- a/client/src/app/videos/video-watch/video-watch.component.scss +++ b/client/src/app/videos/video-watch/video-watch.component.scss | |||
@@ -80,7 +80,7 @@ | |||
80 | .option .glyphicon { | 80 | .option .glyphicon { |
81 | font-size: 22px; | 81 | font-size: 22px; |
82 | color: inherit; | 82 | color: inherit; |
83 | opacity: 0.9; | 83 | opacity: 0.6; |
84 | margin-bottom: 10px; | 84 | margin-bottom: 10px; |
85 | } | 85 | } |
86 | 86 | ||
@@ -170,5 +170,15 @@ | |||
170 | margin-right: 5px; | 170 | margin-right: 5px; |
171 | } | 171 | } |
172 | } | 172 | } |
173 | |||
174 | .video-details-tags { | ||
175 | display: inline-block; | ||
176 | |||
177 | a { | ||
178 | display: inline-block; | ||
179 | margin-right: 3px; | ||
180 | font-size: 11px; | ||
181 | } | ||
182 | } | ||
173 | } | 183 | } |
174 | } | 184 | } |
diff --git a/client/src/sass/_variables.scss b/client/src/sass/_variables.scss index 723b2bcc8..5c06fae9d 100644 --- a/client/src/sass/_variables.scss +++ b/client/src/sass/_variables.scss | |||
@@ -15,6 +15,6 @@ $video-miniature-other-infos: #686767; | |||
15 | 15 | ||
16 | $video-watch-border-color: #eceef4; | 16 | $video-watch-border-color: #eceef4; |
17 | $video-watch-title-height: 90px; | 17 | $video-watch-title-height: 90px; |
18 | $video-watch-info-color: #8e909b; | 18 | $video-watch-info-color: #9da0ae; |
19 | $video-watch-info-height: 120px; | 19 | $video-watch-info-height: 120px; |
20 | $video-watch-info-padding-left: 40px; | 20 | $video-watch-info-padding-left: 40px; |