X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2Fvideo-watch%2Fvideo-watch.component.html;h=62f27ba48dd17652ec9d0066e7eee4a58aebf328;hb=8635a2c70cc24a4c52558162ac058de95750271f;hp=897561c1436a6a9cf85591ecd82a39d5d51a2b87;hpb=d07137b90b2b2b0c1e93a6f0e7bf8719b133027c;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 897561c14..62f27ba48 100644
--- a/client/src/app/videos/video-watch/video-watch.component.html
+++ b/client/src/app/videos/video-watch/video-watch.component.html
@@ -14,74 +14,64 @@
 </div>
 
 <div class="row">
-  <div class="col-md-12">
-    <!-- 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-default-skin vjs-big-play-centered"></video>
-    </div>
-
-    <div *ngIf="videoNotFound" id="video-not-found">Video not found :'(</div>
+  <!-- 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-default-skin vjs-big-play-centered"></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 informations -->
 <div *ngIf="video !== null" id="video-info">
-  <div class="row" id="video-name-actions">
-    <div class="col-md-6">
-      <div class="row">
-        <div id="video-name" class="col-md-12">
-          {{ video.name }}
-        </div>
-      </div>
+  <div class="row video-name-views">
+    <div class="col-xs-8 col-md-8 video-name">
+      {{ video.name }}
+    </div>
 
-      <div class="row">
-        <div class="col-md-12" id="video-by-date">
-          <span id="video-by">
-              from
-              <a [routerLink]="['/videos/list', { field: 'author', search: video.author }]" class="video-miniature-author">
-                {{ video.by }}
-              </a>
-            </span>
-          <span id="video-date">on {{ video.createdAt | date:'short' }}</span>
-        </div>
-      </div>
+    <div class="col-xs-4 col-md-4 pull-right video-views">
+      {{ video.views}} views
     </div>
+  </div>
 
-    <div id="video-actions" class="col-md-6 text-right">
-      <div id="rates">
-        <button
-          id="likes" class="btn btn-default"
-          [ngClass]="{ 'not-interactive-btn': !isUserLoggedIn(), 'activated-btn': userRating === 'like' }" (click)="setLike()"
-        >
-          <span class="glyphicon glyphicon-thumbs-up"></span> {{ video.likes }}
-        </button>
-
-        <button
-          id="dislikes" class="btn btn-default"
-          [ngClass]="{ 'not-interactive-btn': !isUserLoggedIn(), 'activated-btn': userRating === 'dislike' }" (click)="setDislike()"
-        >
-          <span class=" glyphicon glyphicon-thumbs-down"></span> {{ video.dislikes }}
-        </button>
-      </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 title="Access to all videos of this user" [routerLink]="['/videos/list', { field: 'author', search: video.author }]">
+        {{ video.by }}
+      </a>
+    </div>
 
-      <button id="share" class="btn btn-default" (click)="showShareModal()">
-        <span class="glyphicon glyphicon-share"></span> Share
-      </button>
+    <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>
 
-      <div class="btn-group" dropdown>
-        <button id="single-button" type="button" id="more" class="btn btn-default" dropdownToggle>
-          <span class="glyphicon glyphicon-option-horizontal"></span> More
-        </button>
+        <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.id ]">
+              <span class="glyphicon glyphicon-pencil"></span> Update
+            </a>
+          </li>
 
-        <ul dropdownMenu id="more-menu" role="menu" aria-labelledby="single-button">
           <li role="menuitem">
             <a class="dropdown-item" title="Get magnet URI" href="#" (click)="showMagnetUriModal($event)">
-               <span class="glyphicon glyphicon-magnet"></span> Magnet
+              <span class="glyphicon glyphicon-magnet"></span> Magnet
             </a>
           </li>
 
@@ -90,47 +80,104 @@
               <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>
 
-  <div id="video-tags-views" class="row">
-    <div class="col-md-8">
-      <a *ngFor="let tag of video.tags" [routerLink]="['/videos/list', { field: 'tags', search: tag }]" class="label label-primary">
-        {{ tag }}
-      </a>
-    </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 id="video-views" class="col-md-4 text-right">
-      {{ video.views }} views
-    </div>
-  </div>
+        <span class="video-small-block-text">
+          {{ video.likes }}
+        </span>
+      </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 id="video-category" class="row">
-    <div class="col-md-12">
-      <span id="category-label">Category:</span>
-      {{ video.categoryLabel }}
+        <span class="video-small-block-text">
+          {{ video.dislikes }}
+        </span>
+      </div>
     </div>
   </div>
 
-  <div id="video-licence" class="row">
-    <div class="col-md-12">
-      <span id="licence-label">Licence:</span>
-      {{ video.licenceLabel }}
+  <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>
+
+      <div class="video-details-description">
+        {{ video.description }}
+      </div>
     </div>
-  </div>
 
-  <div id="video-description" class="row">
-    <div class="col-md-12">
-      <div id="description-label">Description</div>
-      {{ video.description }}
+    <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 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-details-attribute">
+        <span class="video-details-attribute-label">
+          Language:
+        </span>
+        <span class="video-details-attribute-value">
+          {{ video.languageLabel }}
+        </span>
+      </div>
+
+      <div class="video-details-attribute">
+        <span class="video-details-attribute-label">
+          Tags:
+        </span>
+
+        <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>
   </div>
 </div>
 
-<template [ngIf]="video !== null">
+<ng-template [ngIf]="video !== null">
   <my-video-share #videoShareModal [video]="video"></my-video-share>
   <my-video-magnet #videoMagnetModal [video]="video"></my-video-magnet>
   <my-video-report #videoReportModal [video]="video"></my-video-report>
-</template>
+</ng-template>