X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fvideo-watch.component.html;h=6a02f630ad81532811cc7274258b70f0f546766b;hb=b6a1dd4d1b3b0032f8b968e72cbd074f646e8827;hp=91f77cbf3929819bdb63369c5eedf8875b73d633;hpb=9a18a6252071cf21b18f82a24bb63078abb75bc1;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 91f77cbf3..6a02f630a 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -9,52 +9,29 @@
 
     <div id="videojs-wrapper"></div>
 
-    <div *ngIf="playlist && video" class="playlist"  myInfiniteScroller [autoInit]="true" [onItself]="true" (nearOfBottom)="onPlaylistVideosNearOfBottom()">
-      <div class="playlist-info">
-        <div class="playlist-display-name">
-          {{ playlist.displayName }}
-
-          <span *ngIf="isUnlistedPlaylist()" class="badge badge-warning" i18n>Unlisted</span>
-          <span *ngIf="isPrivatePlaylist()" class="badge badge-danger" i18n>Private</span>
-          <span *ngIf="isPublicPlaylist()" class="badge badge-info" i18n>Public</span>
-        </div>
-
-        <div class="playlist-by-index">
-          <div class="playlist-by">{{ playlist.ownerBy }}</div>
-          <div class="playlist-index">
-            <span>{{currentPlaylistPosition}}</span><span>{{playlistPagination.totalItems}}</span>
-          </div>
-        </div>
-      </div>
-
-      <div *ngFor="let playlistVideo of playlistVideos">
-        <my-video-playlist-element-miniature
-          [video]="playlistVideo" [playlist]="playlist" [owned]="isPlaylistOwned()" (elementRemoved)="onElementRemoved($event)"
-          [playing]="currentPlaylistPosition === playlistVideo.playlistElement.position" [accountLink]="false" [position]="playlistVideo.playlistElement.position"
-        ></my-video-playlist-element-miniature>
-      </div>
-    </div>
-  </div>
-
-  <div i18n class="alert alert-warning" *ngIf="isVideoToImport()">
-    The video is being imported, it will be available when the import is finished.
+    <my-video-watch-playlist
+      #videoWatchPlaylist
+      [video]="video" [playlist]="playlist" class="playlist"
+    ></my-video-watch-playlist>
   </div>
 
-  <div i18n class="alert alert-warning" *ngIf="isVideoToTranscode()">
-    The video is being transcoded, it may not work properly.
-  </div>
+  <div class="row">
+    <div i18n class="col-md-12 alert alert-warning" *ngIf="isVideoToImport()">
+      The video is being imported, it will be available when the import is finished.
+    </div>
 
-  <div i18n class="alert alert-info" *ngIf="hasVideoScheduledPublication()">
-    This video will be published on {{ video.scheduledUpdate.updateAt | date: 'full' }}.
-  </div>
+    <div i18n class="col-md-12 alert alert-warning" *ngIf="isVideoToTranscode()">
+      The video is being transcoded, it may not work properly.
+    </div>
 
-  <div i18n class="alert alert-info" *ngIf="noPlaylistVideos">
-    This playlist does not have videos.
-  </div>
+    <div i18n class="col-md-12 alert alert-info" *ngIf="hasVideoScheduledPublication()">
+      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 class="col-md-12 alert alert-danger" *ngIf="video?.blacklisted">
+      <div class="blacklisted-label" i18n>This video is blacklisted.</div>
+      {{ video.blacklistedReason }}
+    </div>
   </div>
 
   <!-- Video information -->
@@ -120,37 +97,9 @@
                   </div>
                 </div>
 
-                <div class="action-dropdown" ngbDropdown placement="top" role="button">
-                  <div class="action-button" ngbDropdownToggle role="button">
-                    <my-global-icon class="more-icon" iconName="more-horizontal"></my-global-icon>
-                  </div>
-
-                  <div ngbDropdownMenu>
-                    <a *ngIf="isVideoDownloadable()" class="dropdown-item" i18n-title title="Download the video" href="#" (click)="showDownloadModal($event)">
-                      <my-global-icon iconName="download"></my-global-icon> <ng-container i18n>Download</ng-container>
-                    </a>
-
-                    <a *ngIf="isUserLoggedIn()" class="dropdown-item" i18n-title title="Report this video" href="#" (click)="showReportModal($event)">
-                      <my-global-icon iconName="alert"></my-global-icon> <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 ]">
-                      <my-global-icon iconName="edit"></my-global-icon> <ng-container i18n>Update</ng-container>
-                    </a>
-
-                    <a *ngIf="isVideoBlacklistable()" class="dropdown-item" i18n-title title="Blacklist this video" href="#" (click)="showBlacklistModal($event)">
-                      <my-global-icon iconName="no"></my-global-icon> <ng-container i18n>Blacklist</ng-container>
-                    </a>
-
-                    <a *ngIf="isVideoUnblacklistable()" class="dropdown-item" i18n-title title="Unblacklist this video" href="#" (click)="unblacklistVideo($event)">
-                      <my-global-icon iconName="undo"></my-global-icon> <ng-container i18n>Unblacklist</ng-container>
-                    </a>
-
-                    <a *ngIf="isVideoRemovable()" class="dropdown-item" i18n-title title="Delete this video" href="#" (click)="removeVideo($event)">
-                      <my-global-icon iconName="delete"></my-global-icon> <ng-container i18n>Delete</ng-container>
-                    </a>
-                  </div>
-                </div>
+                <my-video-actions-dropdown
+                  placement="top" buttonDirection="horizontal" [buttonStyled]="true" [video]="video" (videoRemoved)="onVideoRemoved()"
+                ></my-video-actions-dropdown>
               </div>
 
               <div
@@ -253,7 +202,7 @@
     <my-recommended-videos [inputRecommendation]="{ uuid: video.uuid, tags: video.tags }" [user]="user"></my-recommended-videos>
   </div>
 
-  <div class="privacy-concerns" *ngIf="hasAlreadyAcceptedPrivacyConcern === false">
+  <div class="row privacy-concerns" *ngIf="hasAlreadyAcceptedPrivacyConcern === false">
     <div class="privacy-concerns-text">
       <strong i18n>Friendly Reminder: </strong>
       <ng-container i18n>
@@ -266,11 +215,9 @@
       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>
+  <my-video-share #videoShareModal [video]="video" [videoCaptions]="videoCaptions"></my-video-share>
 </ng-template>