diff options
author | Chocobozzz <me@florianbigard.com> | 2019-02-11 14:09:23 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 14:09:23 +0100 |
commit | b718fd22374d64534bcfe69932cf562894abed6a (patch) | |
tree | 311d3c67e2a4d1f33ebdd1dc163527de9d33d0f7 /client/src/app/videos/+video-watch/video-watch.component.html | |
parent | adb115f5522bea4d52456a9fc5eb4140bb064476 (diff) | |
parent | 501e961199578129629cf0567033d13efced9904 (diff) | |
download | PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.tar.gz PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.tar.zst PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.zip |
Merge branch 'develop' into pr/1285
Diffstat (limited to 'client/src/app/videos/+video-watch/video-watch.component.html')
-rw-r--r-- | client/src/app/videos/+video-watch/video-watch.component.html | 35 |
1 files changed, 17 insertions, 18 deletions
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 2cdbc7aa6..6e18ab6a6 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.html +++ b/client/src/app/videos/+video-watch/video-watch.component.html | |||
@@ -52,55 +52,57 @@ | |||
52 | <div | 52 | <div |
53 | *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'like' }" (click)="setLike()" | 53 | *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'like' }" (click)="setLike()" |
54 | class="action-button action-button-like" role="button" [attr.aria-pressed]="userRating === 'like'" | 54 | class="action-button action-button-like" role="button" [attr.aria-pressed]="userRating === 'like'" |
55 | i18n-title title="Like this video" | ||
55 | > | 56 | > |
56 | <span class="icon icon-like" i18n-title title="Like this video" ></span> | 57 | <my-global-icon iconName="like"></my-global-icon> |
57 | </div> | 58 | </div> |
58 | 59 | ||
59 | <div | 60 | <div |
60 | *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'dislike' }" (click)="setDislike()" | 61 | *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'dislike' }" (click)="setDislike()" |
61 | class="action-button action-button-dislike" role="button" [attr.aria-pressed]="userRating === 'dislike'" | 62 | class="action-button action-button-dislike" role="button" [attr.aria-pressed]="userRating === 'dislike'" |
63 | i18n-title title="Dislike this video" | ||
62 | > | 64 | > |
63 | <span class="icon icon-dislike" i18n-title title="Dislike this video"></span> | 65 | <my-global-icon iconName="dislike"></my-global-icon> |
64 | </div> | 66 | </div> |
65 | 67 | ||
66 | <div *ngIf="video.support" (click)="showSupportModal()" class="action-button action-button-support"> | 68 | <div *ngIf="video.support" (click)="showSupportModal()" class="action-button action-button-support"> |
67 | <span class="icon icon-support"></span> | 69 | <my-global-icon iconName="heart"></my-global-icon> |
68 | <span class="icon-text" i18n>Support</span> | 70 | <span class="icon-text" i18n>Support</span> |
69 | </div> | 71 | </div> |
70 | 72 | ||
71 | <div (click)="showShareModal()" class="action-button action-button-share" role="button"> | 73 | <div (click)="showShareModal()" class="action-button action-button-share" role="button"> |
72 | <span class="icon icon-share"></span> | 74 | <my-global-icon iconName="share"></my-global-icon> |
73 | <span class="icon-text" i18n>Share</span> | 75 | <span class="icon-text" i18n>Share</span> |
74 | </div> | 76 | </div> |
75 | 77 | ||
76 | <div class="action-more" ngbDropdown placement="top" role="button"> | 78 | <div class="action-more" ngbDropdown placement="top" role="button"> |
77 | <div class="action-button" ngbDropdownToggle role="button"> | 79 | <div class="action-button" ngbDropdownToggle role="button"> |
78 | <span class="icon icon-more"></span> | 80 | <my-global-icon class="more-icon" iconName="more"></my-global-icon> |
79 | </div> | 81 | </div> |
80 | 82 | ||
81 | <div ngbDropdownMenu> | 83 | <div ngbDropdownMenu> |
82 | <a class="dropdown-item" i18n-title title="Download the video" href="#" (click)="showDownloadModal($event)"> | 84 | <a *ngIf="isVideoDownloadable()" class="dropdown-item" i18n-title title="Download the video" href="#" (click)="showDownloadModal($event)"> |
83 | <span class="icon icon-download"></span> <ng-container i18n>Download</ng-container> | 85 | <my-global-icon iconName="download"></my-global-icon> <ng-container i18n>Download</ng-container> |
84 | </a> | 86 | </a> |
85 | 87 | ||
86 | <a *ngIf="isUserLoggedIn()" class="dropdown-item" i18n-title title="Report this video" href="#" (click)="showReportModal($event)"> | 88 | <a *ngIf="isUserLoggedIn()" class="dropdown-item" i18n-title title="Report this video" href="#" (click)="showReportModal($event)"> |
87 | <span class="icon icon-alert"></span> <ng-container i18n>Report</ng-container> | 89 | <my-global-icon iconName="alert"></my-global-icon> <ng-container i18n>Report</ng-container> |
88 | </a> | 90 | </a> |
89 | 91 | ||
90 | <a *ngIf="isVideoUpdatable()" class="dropdown-item" i18n-title title="Update this video" href="#" [routerLink]="[ '/videos/update', video.uuid ]"> | 92 | <a *ngIf="isVideoUpdatable()" class="dropdown-item" i18n-title title="Update this video" href="#" [routerLink]="[ '/videos/update', video.uuid ]"> |
91 | <span class="icon icon-edit"></span> <ng-container i18n>Update</ng-container> | 93 | <my-global-icon iconName="edit"></my-global-icon> <ng-container i18n>Update</ng-container> |
92 | </a> | 94 | </a> |
93 | 95 | ||
94 | <a *ngIf="isVideoBlacklistable()" class="dropdown-item" i18n-title title="Blacklist this video" href="#" (click)="showBlacklistModal($event)"> | 96 | <a *ngIf="isVideoBlacklistable()" class="dropdown-item" i18n-title title="Blacklist this video" href="#" (click)="showBlacklistModal($event)"> |
95 | <span class="icon icon-blacklist"></span> <ng-container i18n>Blacklist</ng-container> | 97 | <my-global-icon iconName="no"></my-global-icon> <ng-container i18n>Blacklist</ng-container> |
96 | </a> | 98 | </a> |
97 | 99 | ||
98 | <a *ngIf="isVideoUnblacklistable()" class="dropdown-item" i18n-title title="Unblacklist this video" href="#" (click)="unblacklistVideo($event)"> | 100 | <a *ngIf="isVideoUnblacklistable()" class="dropdown-item" i18n-title title="Unblacklist this video" href="#" (click)="unblacklistVideo($event)"> |
99 | <span class="icon icon-unblacklist"></span> <ng-container i18n>Unblacklist</ng-container> | 101 | <my-global-icon iconName="undo"></my-global-icon> <ng-container i18n>Unblacklist</ng-container> |
100 | </a> | 102 | </a> |
101 | 103 | ||
102 | <a *ngIf="isVideoRemovable()" class="dropdown-item" i18n-title title="Delete this video" href="#" (click)="removeVideo($event)"> | 104 | <a *ngIf="isVideoRemovable()" class="dropdown-item" i18n-title title="Delete this video" href="#" (click)="removeVideo($event)"> |
103 | <span class="icon icon-delete"></span> <ng-container i18n>Delete</ng-container> | 105 | <my-global-icon iconName="delete"></my-global-icon> <ng-container i18n>Delete</ng-container> |
104 | </a> | 106 | </a> |
105 | </div> | 107 | </div> |
106 | </div> | 108 | </div> |
@@ -159,12 +161,9 @@ | |||
159 | <span class="video-attribute-value">{{ video.privacy.label }}</span> | 161 | <span class="video-attribute-value">{{ video.privacy.label }}</span> |
160 | </div> | 162 | </div> |
161 | 163 | ||
162 | <div class="video-attribute"> | 164 | <div *ngIf="!!video.originallyPublishedAt" class="video-attribute"> |
163 | <span i18n class="video-attribute-label">Originally published on</span> | 165 | <span i18n class="video-attribute-label">Originally published</span> |
164 | <span *ngIf="!video.originallyPublishedAt" class="video-attribute-value">Unknown</span> | 166 | <span class="video-attribute-value">{{ video.originallyPublishedAt | date: 'dd MMMM yyyy' }}</span> |
165 | <span *ngIf="video.originallyPublishedAt" class="video-attribute-value"> | ||
166 | {{ video.originallyPublishedAt | date: 'dd MMMM yyyy' }} | ||
167 | </span> | ||
168 | </div> | 167 | </div> |
169 | 168 | ||
170 | <div class="video-attribute"> | 169 | <div class="video-attribute"> |