X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fvideo-watch.component.html;h=b3def01faa36afb2000ff2090289e79bcaac976c;hb=2de7f588eb7185525cc8687872fed443a24fd27b;hp=5b2e91bc52996bfe32d91a2e9761db28a34f185c;hpb=3a1fed11c52705002cbf2a17294509fb5a89237c;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 5b2e91bc5..b3def01fa 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -39,68 +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 <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>
 
-              <div i18n class="video-info-date-views">
+            <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>
-
-            <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-actions-rates">
+                <div class="video-actions fullWidth justify-content-end">
+                  <div
+                    [ngbPopover]="getRatePopoverText()" [ngClass]="{ 'activated': userRating === 'like' }" (click)="setLike()"
+                    class="action-button action-button-like" role="button" [attr.aria-pressed]="userRating === 'like'"
+                    [ngbTooltip]="tooltipLike"
+                    placement="bottom auto"
+                  >
+                    <my-global-icon iconName="like"></my-global-icon>
+                    <span *ngIf="video.likes" class="count">{{ video.likes }}</span>
+                  </div>
 
-                <div *ngIf="video.support" (click)="showSupportModal()" class="action-button action-button-support">
-                  <my-global-icon iconName="support"></my-global-icon>
-                  <span class="icon-text" i18n>Support</span>
-                </div>
+                  <div
+                    [ngbPopover]="getRatePopoverText()" [ngClass]="{ 'activated': userRating === 'dislike' }" (click)="setDislike()"
+                    class="action-button action-button-dislike" role="button" [attr.aria-pressed]="userRating === 'dislike'"
+                    [ngbTooltip]="tooltipDislike"
+                    placement="bottom auto"
+                  >
+                    <my-global-icon iconName="dislike"></my-global-icon>
+                    <span *ngIf="video.dislikes" class="count">{{ video.dislikes }}</span>
+                  </div>
 
-                <div (click)="showShareModal()" class="action-button" role="button">
-                  <my-global-icon iconName="share"></my-global-icon>
-                  <span class="icon-text" i18n>Share</span>
-                </div>
+                  <div *ngIf="video.support" (click)="showSupportModal()" class="action-button"
+                    [ngbTooltip]="tooltipSupport"
+                    placement="bottom auto"
+                  >
+                    <my-global-icon iconName="support"></my-global-icon>
+                    <span class="icon-text" i18n>Support</span>
+                  </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 (click)="showShareModal()" class="action-button" role="button">
+                    <my-global-icon iconName="share"></my-global-icon>
+                    <span class="icon-text" i18n>Share</span>
                   </div>
 
-                  <div ngbDropdownMenu>
-                    <my-video-add-to-playlist #addContent [video]="video"></my-video-add-to-playlist>
+                  <div
+                    class="action-dropdown" ngbDropdown placement="top" role="button" autoClose="outside"
+                     *ngIf="isUserLoggedIn()" (openChange)="addContent.openChange($event)"
+                     [ngbTooltip]="tooltipSaveToPlaylist"
+                     placement="bottom auto"
+                  >
+                    <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>
                   </div>
+
+                  <my-video-actions-dropdown
+                    placement="top auto" buttonDirection="horizontal" [buttonStyled]="true" [video]="video"
+                    (videoRemoved)="onVideoRemoved()" (modalOpened)="onModalOpened()"
+                  ></my-video-actions-dropdown>
                 </div>
 
-                <my-video-actions-dropdown
-                  placement="top" buttonDirection="horizontal" [buttonStyled]="true" [video]="video"
-                  (videoRemoved)="onVideoRemoved()" (modalOpened)="onModalOpened()"
-                ></my-video-actions-dropdown>
+                <div class="video-info-likes-dislikes-bar-outerContainer">
+                  <div
+                    class="video-info-likes-dislikes-bar-innerContainer"
+                    *ngIf="video.likes !== 0 || video.dislikes !== 0"
+                    [ngbTooltip]="likesBarTooltipText"
+                    placement="bottom"
+                  >
+                    <div
+                      class="video-info-likes-dislikes-bar"
+                    >
+                      <div class="likes-bar" [ngStyle]="{ 'width.%': video.likesPercent }"></div>
+                    </div>
+                  </div>
+                </div>
               </div>
 
               <div
@@ -115,22 +142,21 @@
           </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>
+              <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>
 
             <my-subscribe-button #subscribeButton [videoChannel]="video.channel" size="small"></my-subscribe-button>
           </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>
-          </div>
         </div>
 
       </div>
@@ -150,7 +176,7 @@
         </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>
@@ -197,12 +223,13 @@
         </div>
       </div>
 
-      <my-video-comments [video]="video" [user]="user"></my-video-comments>
+      <my-video-comments class="border-top" [video]="video" [user]="user"></my-video-comments>
     </div>
 
     <my-recommended-videos
         [inputRecommendation]="{ uuid: video.uuid, tags: video.tags }"
         [user]="user"
+        [playlist]="playlist"
         (gotRecommendations)="onRecommendations($event)"
     ></my-recommended-videos>
   </div>