1 files changed, 28 insertions, 17 deletions

diff --git a/client/src/app/videos/+video-watch/video-download.component.html b/client/src/app/videos/+video-watch/video-download.component.html
index 7efc79e93..f8f17a471 100644
--- a/client/src/app/videos/+video-watch/video-download.component.html
+++ b/client/src/app/videos/+video-watch/video-download.component.html
@@ -1,29 +1,40 @@
 <div bsModal #modal="bs-modal" class="modal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content modal-lg">
+    <div class="modal-content">
 
       <div class="modal-header">
-        <button type="button" class="close" aria-label="Close" (click)="hide()">
-          <span aria-hidden="true">&times;</span>
-        </button>
-        <h4 class="title-page title-page-single">Download</h4>
+        <span class="close" aria-hidden="true" (click)="hide()"></span>
+        <h4 class="modal-title">Download video</h4>
       </div>
 
       <div class="modal-body">
-        <div *ngFor="let file of video.files" class="resolution-block">
-          <label>{{ file.resolutionLabel }}</label>
+        <div class="peertube-select-container">
+          <select [(ngModel)]="resolution">
+            <option *ngFor="let file of video.files" [value]="file.resolution">{{ file.resolutionLabel }}</option>
+          </select>
+        </div>
+
+        <div class="download-type">
+          <div class="peertube-radio-container">
+            <input type="radio" name="download" id="download-torrent" [(ngModel)]="downloadType" value="torrent">
+            <label for="download-torrent">Torrent</label>
+          </div>
+
+          <div class="peertube-radio-container">
+            <input type="radio" name="download" id="download-direct" [(ngModel)]="downloadType" value="direct">
+            <label for="download-direct">Direct download</label>
+          </div>
+        </div>
 
-          <a class="orange-button-link " target="_blank" [href]="file.torrentUrl">
-            <span class="icon icon-download"></span>
-            Torrent file
-          </a>
-          <a class="orange-button-link" target="_blank" [href]="file.fileUrl">
-            <span class="icon icon-download"></span>
-            Download
-          </a>
+        <div class="form-group inputs">
+          <span class="action-button action-button-cancel" (click)="hide()">
+            Cancel
+          </span>
 
-          <!-- Don't display magnet URI for now, this is not compatible with most torrent clients -->
-          <!--<input #magnetUriInput (click)="magnetUriInput.select()" type="text" class="form-control input-sm readonly" readonly [value]="file.magnetUri" />-->
+          <input
+            type="submit" value="Download" class="action-button-submit"
+            (click)="download()"
+          >
         </div>
       </div>
     </div>