Merge branch 'release/3.2.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / +videos / +video-edit / video-add-components / video-import-torrent.component.html

diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html
index 5678f548f1e36b359d0c65cddcf33d9f69faec12..20a7538db01002d5e40fcb70062c9f79b792e6b2 100644 (file)
--- a/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html
@@ -4,7 +4,10 @@
 
     <div class="button-file form-control" [ngbTooltip]="'(extensions: .torrent)'">
       <span i18n>Select the torrent to import</span>
-      <input #torrentfileInput type="file" name="torrentfile" id="torrentfile" accept=".torrent" (change)="fileChange()" />
+      <input
+        aria-label="Select the torrent to import" i18n-aria-label
+        #torrentfileInput type="file" name="torrentfile" id="torrentfile" accept=".torrent" (change)="fileChange()"
+      />
     </div>
 
     <div class="torrent-or-magnet" i18n-data-content data-content="OR"></div>
@@ -14,7 +17,7 @@
       <my-help>
         <ng-template ptTemplate="customHtml">
           <ng-container i18n>
-            You can import any torrent file that points to a mp4 file.
+            You can import any torrent file that points to a media file.
             You should make sure you have diffusion rights over the content it points to, otherwise it could cause legal trouble to yourself and your instance.
           </ng-container>
         </ng-template>
@@ -25,20 +28,16 @@
 
     <div class="form-group">
       <label i18n for="first-step-channel">Channel</label>
-      <div class="peertube-select-container">
-        <select id="first-step-channel" [(ngModel)]="firstStepChannelId" class="form-control">
-          <option *ngFor="let channel of userVideoChannels" [value]="channel.id">{{ channel.label }}</option>
-        </select>
-      </div>
+      <my-select-channel
+        labelForId="first-step-channel" [items]="userVideoChannels" [(ngModel)]="firstStepChannelId"
+      ></my-select-channel>
     </div>
 
     <div class="form-group">
       <label i18n for="first-step-privacy">Privacy</label>
-      <div class="peertube-select-container">
-        <select id="first-step-privacy" [(ngModel)]="firstStepPrivacyId" class="form-control">
-          <option *ngFor="let privacy of videoPrivacies" [value]="privacy.id">{{ privacy.label }}</option>
-        </select>
-      </div>
+      <my-select-options
+        labelForId="first-step-privacy" [items]="videoPrivacies" [(ngModel)]="firstStepPrivacyId"
+      ></my-select-options>
     </div>
 
     <input
@@ -62,15 +61,13 @@
   <my-video-edit
     [form]="form" [formErrors]="formErrors" [videoCaptions]="videoCaptions" [schedulePublicationPossible]="false"
     [validationMessages]="validationMessages" [userVideoChannels]="userVideoChannels"
+    type="import-torrent"
   ></my-video-edit>
 
   <div class="submit-container">
-    <div class="submit-button"
-       (click)="updateSecondStep()"
-       [ngClass]="{ disabled: !form.valid || isUpdatingVideo === true }"
-    >
-      <my-global-icon iconName="circle-tick" aria-hidden="true"></my-global-icon>
-      <input type="button" i18n-value value="Update" />
-    </div>
+    <my-button className="orange-button" i18n-label label="Update" icon="circle-tick"
+      (click)="updateSecondStep()"
+      [disabled]="!form.valid || isUpdatingVideo === true"
+    ></my-button>
   </div>
 </form>