X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fvideo-watch.component.html;h=e10056f932ee69da5ac940d230a967138d937869;hb=6f787ea25de7f752f449eca9caf2ba9b431c2e52;hp=6a02f630ad81532811cc7274258b70f0f546766b;hpb=b6a1dd4d1b3b0032f8b968e72cbd074f646e8827;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 6a02f630a..e10056f93 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -29,8 +29,8 @@
     </div>
 
     <div class="col-md-12 alert alert-danger" *ngIf="video?.blacklisted">
-      <div class="blacklisted-label" i18n>This video is blacklisted.</div>
-      {{ video.blacklistedReason }}
+      <div class="blocked-label" i18n>This video is blocked.</div>
+      {{ video.blockedReason }}
     </div>
   </div>
 
@@ -39,67 +39,95 @@
     <div class="video-info">
       <div class="video-info-first-row">
         <div>
-          <div class="d-block d-md-none"> <!-- only shown on medium devices, has its conterpart for larger viewports below -->
+          <div class="d-block d-md-none"> <!-- only shown on medium devices, has its counterpart for larger viewports below -->
             <h1 class="video-info-name">{{ video.name }}</h1>
+
             <div i18n class="video-info-date-views">
-              Published {{ video.publishedAt | myFromNow }} - {{ video.views | myNumberFormatter }} views
+              Published <my-date-toggle [date]="video.publishedAt"></my-date-toggle> <span class="views"> • {{ video.views | myNumberFormatter }} views</span>
             </div>
           </div>
 
-          <div class="d-flex justify-content-between align-items-md-end">
+          <div class="d-flex justify-content-between flex-direction-column">
             <div class="d-none d-md-block">
               <h1 class="video-info-name">{{ video.name }}</h1>
-
-              <div i18n class="video-info-date-views">
-                Published {{ video.publishedAt | myFromNow }} - {{ video.views | myNumberFormatter }} views
-              </div>
             </div>
 
-            <div class="video-actions-rates">
-              <div class="video-actions fullWidth justify-content-end">
-                <div
-                  *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'like' }" (click)="setLike()"
-                  class="action-button action-button-like" role="button" [attr.aria-pressed]="userRating === 'like'"
-                  i18n-title title="Like this video"
-                >
-                  <my-global-icon iconName="like"></my-global-icon>
-                </div>
-
-                <div
-                  *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'dislike' }" (click)="setDislike()"
-                  class="action-button action-button-dislike" role="button" [attr.aria-pressed]="userRating === 'dislike'"
-                  i18n-title title="Dislike this video"
-                >
-                  <my-global-icon iconName="dislike"></my-global-icon>
-                </div>
+            <div class="video-info-first-row-bottom">
+              <div i18n class="d-none d-md-block video-info-date-views">
+                Published <my-date-toggle [date]="video.publishedAt"></my-date-toggle> <span class="views"> • {{ video.views | myNumberFormatter }} views</span>
+              </div>
 
-                <div *ngIf="video.support" (click)="showSupportModal()" class="action-button">
-                  <my-global-icon iconName="heart"></my-global-icon>
-                  <span class="icon-text" i18n>Support</span>
-                </div>
+              <div class="video-actions-rates">
+                <div class="video-actions fullWidth justify-content-end">
+                  <button
+                    [ngbPopover]="getRatePopoverText()" [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"
+                  >
+                    <my-global-icon iconName="like"></my-global-icon>
+                    <span *ngIf="video.likes" class="count">{{ video.likes }}</span>
+                </button>
+
+                  <button
+                    [ngbPopover]="getRatePopoverText()" [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"
+                  >
+                    <my-global-icon iconName="dislike"></my-global-icon>
+                    <span *ngIf="video.dislikes" class="count">{{ video.dislikes }}</span>
+                  </button>
+
+                  <button *ngIf="video.support" (click)="showSupportModal()" (keyup.enter)="showSupportModal()" class="action-button action-button-support" [attr.aria-label]="tooltipSupport"
+                    [ngbTooltip]="tooltipSupport"
+                    placement="bottom auto"
+                  >
+                    <my-global-icon iconName="support" aria-hidden="true"></my-global-icon>
+                    <span class="icon-text" i18n>SUPPORT</span>
+                  </button>
+
+                  <button (click)="showShareModal()" (keyup.enter)="showShareModal()" class="action-button">
+                    <my-global-icon iconName="share" aria-hidden="true"></my-global-icon>
+                    <span class="icon-text" i18n>SHARE</span>
+                  </button>
+
+                  <div
+                    class="action-dropdown" ngbDropdown placement="top" role="button" autoClose="outside"
+                     *ngIf="isUserLoggedIn()" (openChange)="addContent.openChange($event)"
+                     [ngbTooltip]="tooltipSaveToPlaylist"
+                     placement="bottom auto"
+                  >
+                    <button class="action-button action-button-save" ngbDropdownToggle>
+                      <my-global-icon iconName="playlist-add" aria-hidden="true"></my-global-icon>
+                      <span class="icon-text" i18n>SAVE</span>
+                    </button>
+
+                    <div ngbDropdownMenu>
+                      <my-video-add-to-playlist #addContent [video]="video"></my-video-add-to-playlist>
+                    </div>
+                  </div>
 
-                <div (click)="showShareModal()" class="action-button" role="button">
-                  <my-global-icon iconName="share"></my-global-icon>
-                  <span class="icon-text" i18n>Share</span>
+                  <my-video-actions-dropdown
+                    placement="bottom auto" buttonDirection="horizontal" [buttonStyled]="true" [video]="video" [videoCaptions]="videoCaptions"
+                    (videoRemoved)="onVideoRemoved()" (modalOpened)="onModalOpened()"
+                  ></my-video-actions-dropdown>
                 </div>
 
-                <div
-                  class="action-dropdown" ngbDropdown placement="top" role="button" autoClose="outside"
-                   *ngIf="isUserLoggedIn()" (openChange)="addContent.openChange($event)"
-                >
-                  <div class="action-button action-button-save" ngbDropdownToggle role="button">
-                    <my-global-icon iconName="playlist-add"></my-global-icon>
-                    <span class="icon-text" i18n>Save</span>
-                  </div>
-
-                  <div ngbDropdownMenu>
-                    <my-video-add-to-playlist #addContent [video]="video"></my-video-add-to-playlist>
+                <div class="video-info-likes-dislikes-bar-outer-container">
+                  <div
+                    class="video-info-likes-dislikes-bar-inner-container"
+                    *ngIf="video.likes !== 0 || video.dislikes !== 0"
+                    [ngbTooltip]="likesBarTooltipText"
+                    placement="bottom"
+                  >
+                    <div
+                      class="video-info-likes-dislikes-bar"
+                    >
+                      <div class="likes-bar" [ngClass]="{ 'liked': userRating !== 'none' }" [ngStyle]="{ 'width.%': video.likesPercent }"></div>
+                    </div>
                   </div>
                 </div>
-
-                <my-video-actions-dropdown
-                  placement="top" buttonDirection="horizontal" [buttonStyled]="true" [video]="video" (videoRemoved)="onVideoRemoved()"
-                ></my-video-actions-dropdown>
               </div>
 
               <div
@@ -114,28 +142,33 @@
           </div>
 
 
-          <div class="pt-3 border-top video-info-channel">
-            <a [routerLink]="[ '/video-channels', video.byVideoChannel ]" i18n-title title="Go the channel page">
-              {{ video.channel.displayName }}
-
-              <img [src]="video.videoChannelAvatarUrl" alt="Video channel avatar" />
-            </a>
+          <div class="pt-3 border-top video-info-channel d-flex">
+            <div class="video-info-channel-left d-flex">
+              <avatar-channel [video]="video"></avatar-channel>
 
-            <my-subscribe-button #subscribeButton [videoChannel]="video.channel" size="small"></my-subscribe-button>
-          </div>
+              <div class="video-info-channel-left-links ml-1">
+                <a [routerLink]="[ '/video-channels', video.byVideoChannel ]" i18n-title title="Go the channel page">
+                  {{ video.channel.displayName }}
+                </a>
+                <a [routerLink]="[ '/accounts', video.byAccount ]" i18n-title title="Go to the account page">
+                  <span i18n>By {{ video.byAccount }}</span>
+                </a>
+              </div>
+            </div>
 
-          <div class="video-info-by">
-            <a [routerLink]="[ '/accounts', video.byAccount ]" i18n-title title="Go to the account page">
-              <span i18n>By {{ video.byAccount }}</span>
-              <img [src]="video.accountAvatarUrl" alt="Account avatar" />
-            </a>
+            <my-subscribe-button #subscribeButton [videoChannels]="[video.channel]" size="small"></my-subscribe-button>
           </div>
         </div>
 
       </div>
 
       <div class="video-info-description">
-        <div class="video-info-description-html" [innerHTML]="videoHTMLDescription"></div>
+        <div
+          class="video-info-description-html"
+          [innerHTML]="videoHTMLDescription"
+          (timestampClicked)="handleTimestampClicked($event)"
+          timestampRouteTransformer
+        ></div>
 
         <div class="video-info-description-more" *ngIf="completeDescriptionShown === false && video.description?.length >= 250" (click)="showMoreDescription()">
           <ng-container i18n>Show more</ng-container>
@@ -149,12 +182,17 @@
         </div>
       </div>
 
-      <div class="video-attributes">
+      <div class="video-attributes mb-3">
         <div class="video-attribute">
           <span i18n class="video-attribute-label">Privacy</span>
           <span class="video-attribute-value">{{ video.privacy.label }}</span>
         </div>
 
+        <div *ngIf="video.isLocal === false" class="video-attribute">
+          <span i18n class="video-attribute-label">Origin instance</span>
+          <a class="video-attribute-value" target="_blank" rel="noopener noreferrer" [href]="video.originInstanceUrl">{{ video.originInstanceHost }}</a>
+        </div>
+
         <div *ngIf="!!video.originallyPublishedAt" class="video-attribute">
           <span i18n class="video-attribute-label">Originally published</span>
           <span class="video-attribute-value">{{ video.originallyPublishedAt | date: 'dd MMMM yyyy' }}</span>
@@ -194,30 +232,46 @@
             class="video-attribute-value" [routerLink]="[ '/search' ]" [queryParams]="{ tagsOneOf: [ tag ] }"
           >{{ tag }}</a>
         </div>
+
+        <div class="video-attribute">
+          <span i18n class="video-attribute-label">Duration</span>
+          <span class="video-attribute-value">{{ video.duration | myVideoDurationFormatter }}</span>
+        </div>
       </div>
 
-      <my-video-comments [video]="video" [user]="user"></my-video-comments>
+      <my-video-comments
+        class="border-top"
+        [video]="video"
+        [user]="user"
+        (timestampClicked)="handleTimestampClicked($event)"
+      ></my-video-comments>
     </div>
 
-    <my-recommended-videos [inputRecommendation]="{ uuid: video.uuid, tags: video.tags }" [user]="user"></my-recommended-videos>
+    <my-recommended-videos
+      [inputRecommendation]="{ uuid: video.uuid, tags: video.tags }"
+      [playlist]="playlist"
+      (gotRecommendations)="onRecommendations($event)"
+    ></my-recommended-videos>
   </div>
 
   <div class="row privacy-concerns" *ngIf="hasAlreadyAcceptedPrivacyConcern === false">
     <div class="privacy-concerns-text">
-      <strong i18n>Friendly Reminder: </strong>
-      <ng-container i18n>
-        the sharing system used for this video implies that some technical information about your system (such as a public IP address) can be sent to other peers.
-      </ng-container>
-      <a i18n i18n-title title="Get more information" target="_blank" rel="noopener noreferrer" href="/about/peertube">More information</a>
+      <span class="mr-2">
+        <strong i18n>Friendly Reminder: </strong>
+        <ng-container i18n>
+          the sharing system used for this video implies that some technical information about your system (such as a public IP address) can be sent to other peers.
+        </ng-container>
+      </span>
+      <a i18n i18n-title title="Get more information" target="_blank" rel="noopener noreferrer" href="/about/peertube#privacy">More information</a>
     </div>
 
-    <div i18n class="privacy-concerns-okay" (click)="acceptedPrivacyConcern()">
+    <div i18n class="privacy-concerns-button privacy-concerns-okay" (click)="acceptedPrivacyConcern()">
       OK
     </div>
   </div>
 </div>
 
-<ng-template [ngIf]="video !== null">
+<ng-container *ngIf="video !== null">
   <my-video-support #videoSupportModal [video]="video"></my-video-support>
-  <my-video-share #videoShareModal [video]="video" [videoCaptions]="videoCaptions"></my-video-share>
-</ng-template>
+  <my-video-share #videoShareModal [video]="video" [videoCaptions]="videoCaptions" [playlist]="playlist"></my-video-share>
+</ng-container>