X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fvideo-watch.component.html;h=2cdbc7aa685c07ef69a684861d166296d34b859c;hb=adb115f5522bea4d52456a9fc5eb4140bb064476;hp=7dbc96bf417dfe72ca88b6b640c5d805abeaf8c4;hpb=a54991da4224534bf4beaf994d99e4ce5a0a54f7;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 7dbc96bf4..2cdbc7aa6 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -26,14 +26,13 @@
   </div>
 
   <!-- Video information -->
-  <div *ngIf="video" class="container-fluid video-bottom">
+  <div *ngIf="video" class="margin-content video-bottom">
     <div class="row fullWidth">
-      <div class="col-12 col-md-9 video-info">
+      <div class="col-12 col-lg-auto video-info">
         <div class="video-info-first-row">
           <div>
             <div class="d-block d-sm-none"> <!-- only shown on small devices, has its conterpart for larger viewports below -->
-              <div class="video-info-name">{{ video.name }}</div>
-
+              <h1 class="video-info-name">{{ video.name }}</h1>
               <div i18n class="video-info-date-views">
                 Published {{ video.publishedAt | myFromNow }} - {{ video.views | myNumberFormatter }} views
               </div>
@@ -41,7 +40,7 @@
 
             <div class="d-flex justify-content-between align-items-sm-end">
               <div class="d-none d-sm-block">
-                <div class="video-info-name">{{ video.name }}</div>
+                <h1 class="video-info-name">{{ video.name }}</h1>
 
                 <div i18n class="video-info-date-views">
                   Published {{ video.publishedAt | myFromNow }} - {{ video.views | myNumberFormatter }} views
@@ -110,8 +109,9 @@
                 <div
                   class="video-info-likes-dislikes-bar"
                   *ngIf="video.likes !== 0 || video.dislikes !== 0"
+                  [ngbTooltip]="likesBarTooltipText"
                   placement="bottom"
-                  [ngbTooltip]="likesBarTooltipText">
+                >
                   <div class="likes-bar" [ngStyle]="{ 'width.%': video.likesPercent }"></div>
                 </div>
               </div>
@@ -119,13 +119,13 @@
 
 
             <div class="pt-3 border-top video-info-channel">
-              <a [routerLink]="[ '/video-channels', video.channel.name ]" i18n-title title="Go the channel page">
+              <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>
 
-              <my-subscribe-button *ngIf="isUserLoggedIn()" [videoChannel]="video.channel" size="small"></my-subscribe-button>
+              <my-subscribe-button #subscribeButton [videoChannel]="video.channel" size="small"></my-subscribe-button>
             </div>
 
             <div class="video-info-by">
@@ -133,8 +133,6 @@
                 <span i18n>By {{ video.byAccount }}</span>
                 <img [src]="video.accountAvatarUrl" alt="Account avatar" />
               </a>
-
-              <my-help helpType="custom" i18n-customHtml customHtml="You can subscribe to this account via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box <strong>@{{video.account.name}}@{{video.account.host}}</strong> and subscribe there."></my-help>
             </div>
           </div>
 
@@ -161,6 +159,14 @@
             <span class="video-attribute-value">{{ video.privacy.label }}</span>
           </div>
 
+          <div class="video-attribute">
+            <span i18n class="video-attribute-label">Originally published on</span>
+            <span *ngIf="!video.originallyPublishedAt" class="video-attribute-value">Unknown</span>
+            <span *ngIf="video.originallyPublishedAt" class="video-attribute-value">
+		    {{ video.originallyPublishedAt | date: 'dd MMMM yyyy' }}
+	    </span>
+          </div>
+
           <div class="video-attribute">
             <span i18n class="video-attribute-label">Category</span>
             <span *ngIf="!video.category.id" class="video-attribute-value">{{ video.category.label }}</span>
@@ -197,10 +203,10 @@
           </div>
         </div>
 
-      <my-video-comments [video]="video" [user]="user"></my-video-comments>
-    </div>
-    <my-recommended-videos class="ml-3 ml-sm-0 col-12 col-md-3"
-                           [inputVideo]="video" [user]="user"></my-recommended-videos>
+        <my-video-comments [video]="video" [user]="user"></my-video-comments>
+      </div>
+
+      <my-recommended-videos [inputRecommendation]="{ uuid: video.uuid, tags: video.tags }" [user]="user"></my-recommended-videos>
     </div>
   </div>