Better view counter

[github/Chocobozzz/PeerTube.git] / client / src / app / videos / +video-watch / video-watch.component.html

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 5d582734462c0ef9d48cc90b2b6fd4fe83dd18e8..f528d73c31b0a7b7a5f9d8660baf5d3946cac3a3 100644 (file)
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -2,7 +2,7 @@
   <div class="alert alert-danger">
     The video load seems to be abnormally long.
     <ul>
-      <li>Maybe the server {{ video.podHost }} is down :(</li>
+      <li>Maybe the server {{ video.serverHost }} is down :(</li>
       <li>
         If not, you can report an issue on
         <a href="https://github.com/Chocobozzz/PeerTube/issues" title="Report an issue">
@@ -22,14 +22,14 @@
   <div *ngIf="videoNotFound" id="video-not-found">Video not found :'(</div>
 </div>
 
-<!-- P2P informations -->
+<!-- P2P information -->
 <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 -->
+<!-- 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">
@@ -42,8 +42,8 @@
   </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 }]">
+    <div class="col-xs-5 col-xs-3 col-md-3 video-small-block video-small-block-account">
+      <a class="option" title="Access to all videos of this user" [routerLink]="['/videos/list', { field: 'account', search: video.account }]">
         <span class="glyphicon glyphicon-user"></span>
         <span class="video-small-block-text">{{ video.by }}</span>
       </a>
@@ -52,7 +52,7 @@
     <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>
+        <span class="hidden-xs video-small-block-text">Share</span>
       </a>
     </div>
 
@@ -60,7 +60,7 @@
       <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>
+          <span class="hidden-xs video-small-block-text">More</span>
         </a>
 
         <ul *dropdownMenu class="dropdown-menu" id="more-menu" role="menu" aria-labelledby="single-button">
@@ -128,12 +128,30 @@
         Published on {{ video.createdAt | date:'short' }}
       </div>
 
-      <div class="video-details-description">
-        {{ video.description }}
+      <div class="video-details-description" [innerHTML]="videoHTMLDescription"></div>
+
+      <div class="video-details-description-more" *ngIf="completeDescriptionShown === false && video.description.length === 250" (click)="showMoreDescription()">
+        Show more
+        <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-details-description-more">
+        Show less
+        <span *ngIf="descriptionLoading === false" class="glyphicon glyphicon-menu-up"></span>
       </div>
     </div>
 
     <div class="video-details-attributes col-xs-4 col-md-3">
+      <div class="video-details-attribute">
+        <span class="video-details-attribute-label">
+          Privacy:
+        </span>
+        <span class="video-details-attribute-value">
+          {{ video.privacyLabel }}
+        </span>
+      </div>
+
       <div class="video-details-attribute">
         <span class="video-details-attribute-label">
           Category: