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=5a132112d920f17148a296a94d7eafb890d8bae9;hpb=3d52b300ea79bec21f090e2447c4808307078618;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 5a132112d..2cdbc7aa6 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="root-row row">
   <!-- We need the video container for videojs so we just hide it -->
   <div id="video-element-wrapper">
     <div *ngIf="remoteServerDown" class="remote-server-down">
@@ -17,189 +17,204 @@
   </div>
 
   <div i18n class="alert alert-info" *ngIf="hasVideoScheduledPublication()">
-    This video will be published on {{ video.scheduledUpdate.updateAt | date: 'full' }}
+    This video will be published on {{ video.scheduledUpdate.updateAt | date: 'full' }}.
+  </div>
+
+  <div class="alert alert-danger" *ngIf="video?.blacklisted">
+    <div class="blacklisted-label" i18n>This video is blacklisted.</div>
+    {{ video.blacklistedReason }}
   </div>
 
   <!-- Video information -->
   <div *ngIf="video" class="margin-content video-bottom">
-    <div class="video-info">
-      <div class="video-info-first-row">
-        <div>
-          <div class="video-info-name">{{ video.name }}</div>
+    <div class="row fullWidth">
+      <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 -->
+              <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 i18n class="video-info-date-views">
-            {{ video.publishedAt | myFromNow }} - {{ video.views | myNumberFormatter }} views
-          </div>
+            <div class="d-flex justify-content-between align-items-sm-end">
+              <div class="d-none d-sm-block">
+                <h1 class="video-info-name">{{ video.name }}</h1>
 
-          <div class="video-info-channel">
-            <a [routerLink]="[ '/video-channels', video.channel.uuid ]" i18n-title title="Go the channel page">
-              {{ video.channel.displayName }}
+                <div i18n class="video-info-date-views">
+                  Published {{ video.publishedAt | myFromNow }} - {{ video.views | myNumberFormatter }} views
+                </div>
+              </div>
 
-              <img [src]="video.videoChannelAvatarUrl" alt="Video channel avatar" />
-            </a>
-            <!-- Here will be the subscribe button -->
-          </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'"
+                  >
+                    <span class="icon icon-like" i18n-title title="Like this video" ></span>
+                  </div>
+
+                  <div
+                    *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'dislike' }" (click)="setDislike()"
+                    class="action-button action-button-dislike" role="button" [attr.aria-pressed]="userRating === 'dislike'"
+                  >
+                    <span class="icon icon-dislike" i18n-title title="Dislike this video"></span>
+                  </div>
+
+                  <div *ngIf="video.support" (click)="showSupportModal()" class="action-button action-button-support">
+                    <span class="icon icon-support"></span>
+                    <span class="icon-text" i18n>Support</span>
+                  </div>
+
+                  <div (click)="showShareModal()" class="action-button action-button-share" role="button">
+                    <span class="icon icon-share"></span>
+                    <span class="icon-text" i18n>Share</span>
+                  </div>
+
+                  <div class="action-more" ngbDropdown placement="top" role="button">
+                    <div class="action-button" ngbDropdownToggle role="button">
+                      <span class="icon icon-more"></span>
+                    </div>
+
+                    <div ngbDropdownMenu>
+                      <a class="dropdown-item" i18n-title title="Download the video" href="#" (click)="showDownloadModal($event)">
+                        <span class="icon icon-download"></span> <ng-container i18n>Download</ng-container>
+                      </a>
+
+                      <a *ngIf="isUserLoggedIn()" class="dropdown-item" i18n-title title="Report this video" href="#" (click)="showReportModal($event)">
+                        <span class="icon icon-alert"></span> <ng-container i18n>Report</ng-container>
+                      </a>
+
+                      <a *ngIf="isVideoUpdatable()" class="dropdown-item" i18n-title title="Update this video" href="#" [routerLink]="[ '/videos/update', video.uuid ]">
+                        <span class="icon icon-edit"></span> <ng-container i18n>Update</ng-container>
+                      </a>
+
+                      <a *ngIf="isVideoBlacklistable()" class="dropdown-item" i18n-title title="Blacklist this video" href="#" (click)="showBlacklistModal($event)">
+                        <span class="icon icon-blacklist"></span> <ng-container i18n>Blacklist</ng-container>
+                      </a>
+
+                      <a *ngIf="isVideoUnblacklistable()" class="dropdown-item" i18n-title title="Unblacklist this video" href="#" (click)="unblacklistVideo($event)">
+                        <span class="icon icon-unblacklist"></span> <ng-container i18n>Unblacklist</ng-container>
+                      </a>
+
+                      <a *ngIf="isVideoRemovable()" class="dropdown-item" i18n-title title="Delete this video" href="#" (click)="removeVideo($event)">
+                        <span class="icon icon-delete"></span> <ng-container i18n>Delete</ng-container>
+                      </a>
+                    </div>
+                  </div>
+                </div>
+
+                <div
+                  class="video-info-likes-dislikes-bar"
+                  *ngIf="video.likes !== 0 || video.dislikes !== 0"
+                  [ngbTooltip]="likesBarTooltipText"
+                  placement="bottom"
+                >
+                  <div class="likes-bar" [ngStyle]="{ 'width.%': video.likesPercent }"></div>
+                </div>
+              </div>
+            </div>
 
-          <div class="video-info-by">
-            <a [routerLink]="[ '/accounts', video.by ]" i18n-title title="Go to the account page">
-              <span i18n>By {{ video.by }}</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. Subscription as a PeerTube user is being worked on in <a href='https://github.com/Chocobozzz/PeerTube/issues/470'>#470</a>."></my-help>
-          </div>
-        </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 }}
 
-        <div class="video-actions-rates">
-          <div class="video-actions">
-            <div
-              *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'like' }" (click)="setLike()"
-              class="action-button action-button-like" role="button" [attr.aria-pressed]="userRating === 'like'"
-            >
-              <span class="icon icon-like" i18n-title title="Like this video" ></span>
-            </div>
+                <img [src]="video.videoChannelAvatarUrl" alt="Video channel avatar" />
+              </a>
 
-            <div
-              *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'dislike' }" (click)="setDislike()"
-              class="action-button action-button-dislike" role="button" [attr.aria-pressed]="userRating === 'dislike'"
-            >
-              <span class="icon icon-dislike" i18n-title title="Dislike this video"></span>
+              <my-subscribe-button #subscribeButton [videoChannel]="video.channel" size="small"></my-subscribe-button>
             </div>
 
-            <div *ngIf="video.support" (click)="showSupportModal()" class="action-button action-button-support">
-              <span class="icon icon-support"></span>
-              <span class="icon-text" i18n>Support</span>
+            <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 (click)="showShareModal()" class="action-button action-button-share" role="button">
-              <span class="icon icon-share"></span>
-              <span class="icon-text" i18n>Share</span>
-            </div>
+        </div>
 
-            <div class="action-more" dropdown dropup="true" placement="right" role="button">
-              <div class="action-button" dropdownToggle>
-                <span class="icon icon-more"></span>
-              </div>
+        <div class="video-info-description">
+          <div class="video-info-description-html" [innerHTML]="videoHTMLDescription"></div>
 
-              <ul *dropdownMenu class="dropdown-menu" id="more-menu" role="menu" aria-labelledby="single-button">
-                <li role="menuitem">
-                  <a class="dropdown-item" i18n-title title="Download the video" href="#" (click)="showDownloadModal($event)">
-                    <span class="icon icon-download"></span> <ng-container i18n>Download</ng-container>
-                  </a>
-                </li>
-
-                <li *ngIf="isUserLoggedIn()" role="menuitem">
-                  <a class="dropdown-item" i18n-title title="Report this video" href="#" (click)="showReportModal($event)">
-                    <span class="icon icon-alert"></span> <ng-container i18n>Report</ng-container>
-                  </a>
-                </li>
-
-                <li *ngIf="isVideoBlacklistable()" role="menuitem">
-                  <a class="dropdown-item" i18n-title title="Blacklist this video" href="#" (click)="blacklistVideo($event)">
-                    <span class="icon icon-blacklist"></span> <ng-container i18n>Blacklist</ng-container>
-                  </a>
-                </li>
-
-                <li *ngIf="isVideoUpdatable()" role="menuitem">
-                  <a class="dropdown-item" i18n-title title="Update this video" href="#" [routerLink]="[ '/videos/update', video.uuid ]">
-                    <span class="icon icon-edit"></span> <ng-container i18n>Update</ng-container>
-                  </a>
-                </li>
-
-                <li *ngIf="isVideoRemovable()" role="menuitem">
-                  <a class="dropdown-item" i18n-title title="Delete this video" href="#" (click)="removeVideo($event)">
-                    <span class="icon icon-blacklist"></span> <ng-container i18n>Delete</ng-container>
-                  </a>
-                </li>
-              </ul>
-            </div>
+          <div class="video-info-description-more" *ngIf="completeDescriptionShown === false && video.description?.length >= 250" (click)="showMoreDescription()">
+            <ng-container i18n>Show more</ng-container>
+            <span *ngIf="descriptionLoading === false" class="glyphicon glyphicon-menu-down"></span>
+            <my-loader class="description-loading" [loading]="descriptionLoading"></my-loader>
           </div>
 
-          <div
-              class="video-info-likes-dislikes-bar"
-              *ngIf="video.likes !== 0 || video.dislikes !== 0"  [tooltip]="likesBarTooltipText">
-            <div class="likes-bar" [ngStyle]="{ 'width.%': video.likesPercent }"></div>
+          <div *ngIf="completeDescriptionShown === true" (click)="showLessDescription()" class="video-info-description-more">
+            <ng-container i18n>Show less</ng-container>
+            <span *ngIf="descriptionLoading === false" class="glyphicon glyphicon-menu-up"></span>
           </div>
         </div>
-      </div>
-
-      <div class="video-info-description">
-        <div class="video-info-description-html" [innerHTML]="videoHTMLDescription"></div>
-
-        <div class="video-info-description-more" *ngIf="completeDescriptionShown === false && video.description?.length >= 250" (click)="showMoreDescription()">
-          <ng-container i18n>Show more</ng-container>
-          <span *ngIf="descriptionLoading === false" class="glyphicon glyphicon-menu-down"></span>
-          <my-loader class="description-loading" [loading]="descriptionLoading"></my-loader>
-        </div>
 
-        <div *ngIf="completeDescriptionShown === true" (click)="showLessDescription()" class="video-info-description-more">
-          <ng-container i18n>Show less</ng-container>
-          <span *ngIf="descriptionLoading === false" class="glyphicon glyphicon-menu-up"></span>
-        </div>
-      </div>
+        <div class="video-attributes">
+          <div class="video-attribute">
+            <span i18n class="video-attribute-label">Privacy</span>
+            <span class="video-attribute-value">{{ video.privacy.label }}</span>
+          </div>
 
-      <div class="video-attributes">
-        <div class="video-attribute">
-          <span i18n class="video-attribute-label">Privacy</span>
-          <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>
-          <a
-            *ngIf="video.category.id" class="video-attribute-value"
-            [routerLink]="[ '/search' ]" [queryParams]="{ categoryOneOf: [ video.category.id ] }"
-          >{{ video.category.label }}</a>
-        </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>
+            <a
+              *ngIf="video.category.id" class="video-attribute-value"
+              [routerLink]="[ '/search' ]" [queryParams]="{ categoryOneOf: [ video.category.id ] }"
+            >{{ video.category.label }}</a>
+          </div>
 
-        <div class="video-attribute">
-          <span i18n class="video-attribute-label">Licence</span>
-          <span *ngIf="!video.licence.id" class="video-attribute-value">{{ video.licence.label }}</span>
-          <a
-            *ngIf="video.licence.id" class="video-attribute-value"
-            [routerLink]="[ '/search' ]" [queryParams]="{ licenceOneOf: [ video.licence.id ] }"
-          >{{ video.licence.label }}</a>
-        </div>
+          <div class="video-attribute">
+            <span i18n class="video-attribute-label">Licence</span>
+            <span *ngIf="!video.licence.id" class="video-attribute-value">{{ video.licence.label }}</span>
+            <a
+              *ngIf="video.licence.id" class="video-attribute-value"
+              [routerLink]="[ '/search' ]" [queryParams]="{ licenceOneOf: [ video.licence.id ] }"
+            >{{ video.licence.label }}</a>
+          </div>
 
-        <div class="video-attribute">
-          <span i18n class="video-attribute-label">Language</span>
-          <span *ngIf="!video.language.id" class="video-attribute-value">{{ video.language.label }}</span>
-          <a
-            *ngIf="video.language.id" class="video-attribute-value"
-            [routerLink]="[ '/search' ]" [queryParams]="{ languageOneOf: [ video.language.id ] }"
-          >{{ video.language.label }}</a>
-        </div>
+          <div class="video-attribute">
+            <span i18n class="video-attribute-label">Language</span>
+            <span *ngIf="!video.language.id" class="video-attribute-value">{{ video.language.label }}</span>
+            <a
+              *ngIf="video.language.id" class="video-attribute-value"
+              [routerLink]="[ '/search' ]" [queryParams]="{ languageOneOf: [ video.language.id ] }"
+            >{{ video.language.label }}</a>
+          </div>
 
-        <div class="video-attribute video-attribute-tags">
-          <span i18n class="video-attribute-label">Tags</span>
-          <a
-            *ngFor="let tag of getVideoTags()"
-            class="video-attribute-value" [routerLink]="[ '/search' ]" [queryParams]="{ tagsOneOf: [ tag ] }"
-          >{{ tag }}</a>
+          <div class="video-attribute video-attribute-tags">
+            <span i18n class="video-attribute-label">Tags</span>
+            <a
+              *ngFor="let tag of getVideoTags()"
+              class="video-attribute-value" [routerLink]="[ '/search' ]" [queryParams]="{ tagsOneOf: [ tag ] }"
+            >{{ tag }}</a>
+          </div>
         </div>
-      </div>
 
-      <my-video-comments [video]="video" [user]="user"></my-video-comments>
-    </div>
-
-    <div class="other-videos">
-      <div i18n class="title-page title-page-single">
-        Other videos
+        <my-video-comments [video]="video" [user]="user"></my-video-comments>
       </div>
 
-      <div *ngFor="let video of otherVideosDisplayed">
-        <my-video-miniature [video]="video" [user]="user"></my-video-miniature>
-      </div>
+      <my-recommended-videos [inputRecommendation]="{ uuid: video.uuid, tags: video.tags }" [user]="user"></my-recommended-videos>
     </div>
   </div>
 
-
   <div class="privacy-concerns" *ngIf="hasAlreadyAcceptedPrivacyConcern === false">
-    <strong i18n>Friendly Reminder:</strong>
     <div class="privacy-concerns-text">
+      <strong i18n>Friendly Reminder: </strong>
       <ng-container i18n>
-        The sharing system used by this video implies that some technical information about your system (such as a public IP address) can be sent to other peers.
+        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>
     </div>
@@ -208,11 +223,11 @@
       OK
     </div>
   </div>
-</div>
 
 <ng-template [ngIf]="video !== null">
   <my-video-support #videoSupportModal [video]="video"></my-video-support>
   <my-video-share #videoShareModal [video]="video"></my-video-share>
   <my-video-download #videoDownloadModal [video]="video"></my-video-download>
   <my-video-report #videoReportModal [video]="video"></my-video-report>
+  <my-video-blacklist #videoBlacklistModal [video]="video"></my-video-blacklist>
 </ng-template>