X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Bvideos%2F%2Bvideo-watch%2Fvideo-watch.component.html;h=74c82fbfd821377535f919a50c1adf04f17731c4;hb=da0310f821b039fea1fcbf8aea49e1d2279ba98e;hp=4279437d23688e6716098b91af2b5f730e8fe14b;hpb=82f443de1aba70ce75c72a4a7f669385600ab3c6;p=github%2FChocobozzz%2FPeerTube.git

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 4279437d2..74c82fbfd 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.html
+++ b/client/src/app/+videos/+video-watch/video-watch.component.html
@@ -11,7 +11,8 @@
 
     <my-video-watch-playlist
       #videoWatchPlaylist
-      [video]="video" [playlist]="playlist" class="playlist"
+      [playlist]="playlist" class="playlist"
+      (videoFound)="onPlaylistVideoFound($event)"
     ></my-video-watch-playlist>
   </div>
 
@@ -28,6 +29,14 @@
       This video will be published on {{ video.scheduledUpdate.updateAt | date: 'full' }}.
     </div>
 
+    <div i18n class="col-md-12 alert alert-info" *ngIf="isWaitingForLive()">
+      This live has not started yet.
+    </div>
+
+    <div i18n class="col-md-12 alert alert-info" *ngIf="isLiveEnded()">
+      This live is finished.
+    </div>
+
     <div class="col-md-12 alert alert-danger" *ngIf="video?.blacklisted">
       <div class="blocked-label" i18n>This video is blocked.</div>
       {{ video.blockedReason }}
@@ -58,9 +67,13 @@
               </div>
 
               <div class="video-actions-rates">
+                <ng-template #ratePopoverText>
+                  <span [innerHTML]="getRatePopoverText()"></span>
+                </ng-template>
+
                 <div class="video-actions fullWidth justify-content-end">
                   <button
-                    [ngbPopover]="getRatePopoverText()" [ngClass]="{ 'activated': userRating === 'like' }" (click)="setLike()" (keyup.enter)="setLike()"
+                    [ngbPopover]="getRatePopoverText() && ratePopoverText" [ngClass]="{ 'activated': userRating === 'like' }" (click)="setLike()" (keyup.enter)="setLike()"
                     class="action-button action-button-like" [attr.aria-pressed]="userRating === 'like'" [attr.aria-label]="tooltipLike"
                     [ngbTooltip]="tooltipLike"
                     placement="bottom auto"
@@ -70,7 +83,7 @@
                 </button>
 
                   <button
-                    [ngbPopover]="getRatePopoverText()" [ngClass]="{ 'activated': userRating === 'dislike' }" (click)="setDislike()" (keyup.enter)="setDislike()"
+                    [ngbPopover]="getRatePopoverText() && ratePopoverText" [ngClass]="{ 'activated': userRating === 'dislike' }" (click)="setDislike()" (keyup.enter)="setDislike()"
                     class="action-button action-button-dislike" [attr.aria-pressed]="userRating === 'dislike'" [attr.aria-label]="tooltipDislike"
                     [ngbTooltip]="tooltipDislike"
                     placement="bottom auto"
@@ -108,7 +121,7 @@
                     </div>
                   </div>
 
-                  <ng-container *ngIf="!isUserLoggedIn()">
+                  <ng-container *ngIf="!isUserLoggedIn() && !isLive()">
                     <button
                       *ngIf="isVideoDownloadable()" class="action-button action-button-save"
                       (click)="showDownloadModal()" (keydown.enter)="showDownloadModal()"
@@ -255,9 +268,9 @@
           >{{ tag }}</a>
         </div>
 
-        <div class="video-attribute">
+        <div class="video-attribute" *ngIf="!video.isLive">
           <span i18n class="video-attribute-label">Duration</span>
-          <span class="video-attribute-value">{{ video.duration | myVideoDurationFormatter }}</span>
+          <span class="video-attribute-value">{{ video.duration | myDurationFormatter }}</span>
         </div>
       </div>