X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fvideo-watch.component.html;h=615b88bd66d20d84710c78ed57a36a17ed4f2553;hb=f0a3988066f72a28bb44520af072f18d91d77dde;hp=71f986ccdbcd59849a94f914571765e122dbb5ed;hpb=2de96f4d6b800076743ed2073f9529816cfd5c8a;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 71f986ccd..615b88bd6 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -1,192 +1,246 @@
-<div *ngIf="error" class="row">
-  <div class="alert alert-danger">
-    The video load seems to be abnormally long.
-    <ul>
-      <li>Maybe the server {{ video.podHost }} is down :(</li>
-      <li>
-        If not, you can report an issue on
-        <a href="https://github.com/Chocobozzz/PeerTube/issues" title="Report an issue">
-          https://github.com/Chocobozzz/PeerTube/issues
-        </a>
-      </li>
-    </ul>
-  </div>
-</div>
-
-<div class="row">
+<div class="root-row row">
   <!-- We need the video container for videojs so we just hide it -->
-  <div [hidden]="videoNotFound" class="embed-responsive embed-responsive-19by9">
-     <video id="video-container" class="video-js vjs-sublime-skin"></video>
-  </div>
-
-  <div *ngIf="videoNotFound" id="video-not-found">Video not found :'(</div>
-</div>
-
-<!-- P2P informations -->
-<div id="torrent-info" class="row">
-  <div id="torrent-info-download" class="col-md-4 col-sm-4 col-xs-4">Download: {{ downloadSpeed | bytes }}/s</div>
-  <div id="torrent-info-upload" class="col-md-4 col-sm-4 col-xs-4">Upload: {{ uploadSpeed | bytes }}/s</div>
-  <div id="torrent-info-peers" class="col-md-4 col-sm-4 col-xs-4">Number of peers: {{ numPeers }}</div>
-</div>
-
-<!-- Video information -->
-<div *ngIf="video !== null" id="video-info">
-  <div class="row video-name-views">
-    <div class="col-xs-8 col-md-8 video-name">
-      {{ video.name }}
-    </div>
-
-    <div class="col-xs-4 col-md-4 pull-right video-views">
-      {{ video.views}} views
+  <div id="video-element-wrapper">
+    <div *ngIf="remoteServerDown" class="remote-server-down">
+      Sorry, but this video is not available because the remote instance is not responding.
+      <br />
+      Please try again later.
     </div>
   </div>
 
-  <div class="row video-small-blocks">
-    <div class="col-xs-5 col-xs-3 col-md-3 video-small-block video-small-block-author">
-      <a class="option" title="Access to all videos of this user" [routerLink]="['/videos/list', { field: 'author', search: video.author }]">
-        <span class="glyphicon glyphicon-user"></span>
-        <span class="video-small-block-text">{{ video.by }}</span>
-      </a>
-    </div>
-
-    <div class="col-xs-2 col-md-3 video-small-block video-small-block-share">
-      <a class="option" (click)="showShareModal()" title="Share the video">
-        <span class="glyphicon glyphicon-share"></span>
-        <span class="video-small-block-text">Share</span>
-      </a>
-    </div>
-
-    <div class="col-xs-2 col-md-3 video-small-block video-small-block-more">
-      <div class="video-small-block-dropdown" dropdown dropup="true" placement="right">
-        <a class="option" title="Access to more options" dropdownToggle>
-          <span class="glyphicon glyphicon-option-horizontal"></span>
-          <span class="video-small-block-text">More</span>
-        </a>
-
-        <ul *dropdownMenu class="dropdown-menu" id="more-menu" role="menu" aria-labelledby="single-button">
-          <li *ngIf="canUserUpdateVideo()" role="menuitem">
-            <a class="dropdown-item" title="Update this video" href="#" [routerLink]="[ '/videos/edit', video.uuid ]">
-              <span class="glyphicon glyphicon-pencil"></span> Update
-            </a>
-          </li>
-
-          <li role="menuitem">
-            <a class="dropdown-item" title="Download the video" href="#" (click)="showDownloadModal($event)">
-              <span class="glyphicon glyphicon-download-alt"></span> Download
-            </a>
-          </li>
-
-          <li *ngIf="isUserLoggedIn()" role="menuitem">
-            <a class="dropdown-item" title="Report this video" href="#" (click)="showReportModal($event)">
-              <span class="glyphicon glyphicon-alert"></span> Report
-            </a>
-          </li>
-
-          <li *ngIf="isVideoRemovable()" role="menuitem">
-            <a class="dropdown-item" title="Delete this video" href="#" (click)="removeVideo($event)">
-              <span class="glyphicon glyphicon-remove"></span> Delete
-            </a>
-          </li>
-
-          <li *ngIf="isVideoBlacklistable()" role="menuitem">
-            <a class="dropdown-item" title="Blacklist this video" href="#" (click)="blacklistVideo($event)">
-              <span class="glyphicon glyphicon-eye-close"></span> Blacklist
-            </a>
-          </li>
-        </ul>
-      </div>
-    </div>
-
-    <div class="col-xs-3 col-md-3 video-small-block video-small-block-rating">
-      <div class="video-small-block-like">
-        <span
-          class="glyphicon glyphicon-thumbs-up" title="Like this video"
-          [ngClass]="{ 'interactive': isUserLoggedIn(), 'activated': userRating === 'like' }" (click)="setLike()"
-        ></span>
+  <div i18n class="alert alert-warning" *ngIf="isVideoToImport()">
+    The video is being imported, it will be available when the import is finished.
+  </div>
 
-        <span class="video-small-block-text">
-          {{ video.likes }}
-        </span>
-      </div>
+  <div i18n class="alert alert-warning" *ngIf="isVideoToTranscode()">
+    The video is being transcoded, it may not work properly.
+  </div>
 
-      <div class="video-small-block-dislike">
-        <span
-          class="glyphicon glyphicon-thumbs-down" title="Dislike this video"
-          [ngClass]="{ 'interactive': isUserLoggedIn(), 'activated': userRating === 'dislike' }" (click)="setDislike()"
-        ></span>
+  <div i18n class="alert alert-info" *ngIf="hasVideoScheduledPublication()">
+    This video will be published on {{ video.scheduledUpdate.updateAt | date: 'full' }}.
+  </div>
 
-        <span class="video-small-block-text">
-          {{ video.dislikes }}
-        </span>
-      </div>
-    </div>
+  <div class="alert alert-danger" *ngIf="video?.blacklisted">
+    <div class="blacklisted-label" i18n>This video is blacklisted.</div>
+    {{ video.blacklistedReason }}
   </div>
 
-  <div class="row video-details">
-    <div class="video-details-date-description col-xs-8 col-md-9">
-      <div class="video-details-date">
-        Published on {{ video.createdAt | date:'short' }}
-      </div>
+  <!-- Video information -->
+  <div *ngIf="video" class="margin-content video-bottom">
+    <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 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 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 *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 (click)="showShareModal()" class="action-button" role="button">
+                    <my-global-icon iconName="share"></my-global-icon>
+                    <span class="icon-text" i18n>Share</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>
+
+                    <div ngbDropdownMenu>
+                      <my-video-add-to-playlist #addContent [video]="video"></my-video-add-to-playlist>
+                    </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"></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>
+                </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="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>
+
+              <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 class="video-details-description" [innerHTML]="videoHTMLDescription"></div>
+        </div>
 
-      <div *ngIf="completeDescriptionShown === false && video.description.length === 250" (click)="showMoreDescription()" class="video-details-description-more">
-        Show more
-        <span class="glyphicon glyphicon-menu-down"></span>
-      </div>
+        <div class="video-info-description">
+          <div class="video-info-description-html" [innerHTML]="videoHTMLDescription"></div>
 
-      <div *ngIf="completeDescriptionShown === true" (click)="showLessDescription()" class="video-details-description-more">
-        Show less
-        <span class="glyphicon glyphicon-menu-up"></span>
-      </div>
-    </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-small-loader class="description-loading" [loading]="descriptionLoading"></my-small-loader>
+          </div>
 
-    <div class="video-details-attributes col-xs-4 col-md-3">
-      <div class="video-details-attribute">
-        <span class="video-details-attribute-label">
-          Category:
-        </span>
-        <span class="video-details-attribute-value">
-          {{ video.categoryLabel }}
-        </span>
-      </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-details-attribute">
-        <span class="video-details-attribute-label">
-          Licence:
-        </span>
-        <span class="video-details-attribute-value">
-          {{ video.licenceLabel }}
-        </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 *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>
+          </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">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>
+        </div>
 
-      <div class="video-details-attribute">
-        <span class="video-details-attribute-label">
-          Language:
-        </span>
-        <span class="video-details-attribute-value">
-          {{ video.languageLabel }}
-        </span>
+        <my-video-comments [video]="video" [user]="user"></my-video-comments>
       </div>
 
-      <div class="video-details-attribute">
-        <span class="video-details-attribute-label">
-          Tags:
-        </span>
+      <my-recommended-videos [inputRecommendation]="{ uuid: video.uuid, tags: video.tags }" [user]="user"></my-recommended-videos>
+    </div>
+  </div>
 
-        <div class="video-details-tags">
-          <a *ngFor="let tag of video.tags" [routerLink]="['/videos/list', { field: 'tags', search: tag }]" class="label label-primary">
-            {{ tag }}
-          </a>
-        </div>
-      </div>
+  <div class="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>
+    </div>
 
+    <div i18n class="privacy-concerns-okay" (click)="acceptedPrivacyConcern()">
+      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>