X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fapp%2F%2Badmin%2Fconfig%2Fedit-custom-config%2Fedit-custom-config.component.html;h=2cf0e5fd9fe549346fd315088ae58840339043f2;hb=14571f1995e3a1868a3280b7aad5005cff051c7d;hp=47e3e5a52605eacd923bb3ae993d57705e197e47;hpb=e771dbe0aa6ccc005472001230ef0ef4b3ad1a56;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
index 47e3e5a52..2cf0e5fd9 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
@@ -7,7 +7,7 @@
 
         <ng-container formGroupName="instance">
 
-          <div i18n class="inner-form-title">Instance</div>
+          <div i18n class="inner-form-title">INSTANCE</div>
 
           <div class="form-group">
             <label i18n for="instanceName">Name</label>
@@ -30,7 +30,7 @@
           <div class="form-group">
             <label i18n for="instanceDescription">Description</label><my-help helpType="markdownText"></my-help>
             <my-markdown-textarea
-              id="instanceDescription" formControlName="description" textareaWidth="500px" [previewColumn]="true"
+              name="instanceDescription" formControlName="description" textareaWidth="500px" [previewColumn]="true"
               [classes]="{ 'input-error': formErrors['instance.description'] }"
             ></my-markdown-textarea>
             <div *ngIf="formErrors.instance.description" class="form-error">{{ formErrors.instance.description }}</div>
@@ -41,7 +41,7 @@
 
             <div>
               <p-multiSelect
-                inputId="instanceCategories" [options]="categoryItems" formControlName="categories" showToggleAll="false"
+                inputId="instanceCategories" [options]="categoryItems" formControlName="categories" [showToggleAll]="false"
                 [defaultLabel]="getDefaultCategoryLabel()" [selectedItemsLabel]="getSelectedCategoryLabel()"
                 emptyFilterMessage="No results found" i18n-emptyFilterMessage
               ></p-multiSelect>
@@ -53,14 +53,14 @@
 
             <div>
               <p-multiSelect
-                inputId="instanceLanguages" [options]="languageItems" formControlName="languages" showToggleAll="false"
+                inputId="instanceLanguages" [options]="languageItems" formControlName="languages" [showToggleAll]="false"
                 [defaultLabel]="getDefaultLanguageLabel()" [selectedItemsLabel]="getSelectedLanguageLabel()"
                 emptyFilterMessage="No results found" i18n-emptyFilterMessage
               ></p-multiSelect>
             </div>
           </div>
 
-          <div i18n class="inner-form-title">Moderation & NSFW</div>
+          <div i18n class="inner-form-title">MODERATION & NSFW</div>
 
           <div class="form-group">
             <my-peertube-checkbox inputName="instanceIsNSFW" formControlName="isNSFW">
@@ -101,7 +101,7 @@
           <div class="form-group">
             <label i18n for="instanceTerms">Terms</label><my-help helpType="markdownText"></my-help>
             <my-markdown-textarea
-              id="instanceTerms" formControlName="terms" textareaWidth="500px" [previewColumn]="true"
+              name="instanceTerms" formControlName="terms" textareaWidth="500px" [previewColumn]="true"
               [ngClass]="{ 'input-error': formErrors['instance.terms'] }"
             ></my-markdown-textarea>
             <div *ngIf="formErrors.instance.terms" class="form-error">{{ formErrors.instance.terms }}</div>
@@ -110,7 +110,7 @@
           <div class="form-group">
             <label i18n for="instanceCodeOfConduct">Code of conduct</label><my-help helpType="markdownText"></my-help>
             <my-markdown-textarea
-              id="instanceCodeOfConduct" formControlName="codeOfConduct" textareaWidth="500px" [previewColumn]="true"
+              name="instanceCodeOfConduct" formControlName="codeOfConduct" textareaWidth="500px" [previewColumn]="true"
               [ngClass]="{ 'input-error': formErrors['instance.codeOfConduct'] }"
             ></my-markdown-textarea>
             <div *ngIf="formErrors.instance.codeOfConduct" class="form-error">{{ formErrors.instance.codeOfConduct }}</div>
@@ -118,23 +118,23 @@
 
           <div class="form-group">
             <label i18n for="instanceModerationInformation">Moderation information</label><my-help helpType="markdownText"></my-help>
-            <div class="label-small-info">Who moderates the instance? What is the policy regarding NSFW videos? Political videos? etc</div>
+            <div i18n class="label-small-info">Who moderates the instance? What is the policy regarding NSFW videos? Political videos? etc</div>
 
             <my-markdown-textarea
-              id="instanceModerationInformation" formControlName="moderationInformation" textareaWidth="500px" [previewColumn]="true"
+              name="instanceModerationInformation" formControlName="moderationInformation" textareaWidth="500px" [previewColumn]="true"
               [ngClass]="{ 'input-error': formErrors['instance.moderationInformation'] }"
             ></my-markdown-textarea>
             <div *ngIf="formErrors.instance.moderationInformation" class="form-error">{{ formErrors.instance.moderationInformation }}</div>
           </div>
 
-          <div i18n class="inner-form-title">You and your instance</div>
+          <div i18n class="inner-form-title">YOU AND YOUR INSTANCE</div>
 
           <div class="form-group">
             <label i18n for="instanceAdministrator">Who is behind the instance?</label>
-            <div class="label-small-info">A single person? A non profit? A company?</div>
+            <div i18n class="label-small-info">A single person? A non-profit? A company?</div>
 
             <my-markdown-textarea
-              id="instanceAdministrator" formControlName="administrator" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true"
+              name="instanceAdministrator" formControlName="administrator" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true"
               [classes]="{ 'input-error': formErrors['instance.administrator'] }"
             ></my-markdown-textarea>
 
@@ -143,7 +143,7 @@
 
           <div class="form-group">
             <label i18n for="instanceCreationReason">Why did you create this instance?</label>
-            <div class="label-small-info">To share your personal videos? To open registrations and allow people to upload what they want?</div>
+            <div i18n class="label-small-info">To share your personal videos? To open registrations and allow people to upload what they want?</div>
 
             <textarea
               id="instanceCreationReason" formControlName="creationReason" class="small"
@@ -154,7 +154,7 @@
 
           <div class="form-group">
             <label i18n for="instanceMaintenanceLifetime">How long do you plan to maintain this instance?</label>
-            <div class="label-small-info">It's important to know for users who want to register on your instance</div>
+            <div i18n class="label-small-info">It's important to know for users who want to register on your instance</div>
 
             <textarea
               id="instanceMaintenanceLifetime" formControlName="maintenanceLifetime" class="small"
@@ -164,8 +164,8 @@
           </div>
 
           <div class="form-group">
-            <label i18n for="instanceBusinessModel">How will you pay the PeerTube instance server?</label>
-            <div class="label-small-info">With you own funds? With users donations? Advertising?</div>
+            <label i18n for="instanceBusinessModel">How will you finance the PeerTube server?</label>
+            <div i18n class="label-small-info">With your own funds? With users donations? Advertising?</div>
 
             <textarea
               id="instanceBusinessModel" formControlName="businessModel" class="small"
@@ -174,14 +174,14 @@
             <div *ngIf="formErrors.instance.businessModel" class="form-error">{{ formErrors.instance.businessModel }}</div>
           </div>
 
-          <div i18n class="inner-form-title">Other information</div>
+          <div i18n class="inner-form-title">OTHER INFORMATION</div>
 
           <div class="form-group">
-            <label i18n for="instanceHardwareInformation">On what server/hardware the instance runs?</label>
-            <div class="label-small-info">2vCore 2GB RAM/or directly the link to the server you rent etc</div>
+            <label i18n for="instanceHardwareInformation">What server/hardware does the instance run on?</label>
+            <div i18n class="label-small-info">2vCore 2GB RAM/or directly the link to the server you rent etc</div>
 
             <my-markdown-textarea
-              id="instanceHardwareInformation" formControlName="hardwareInformation" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true"
+              name="instanceHardwareInformation" formControlName="hardwareInformation" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true"
               [classes]="{ 'input-error': formErrors['instance.hardwareInformation'] }"
             ></my-markdown-textarea>
 
@@ -195,7 +195,7 @@
     <ngb-tab i18n-title title="Basic configuration">
       <ng-template ngbTabContent>
 
-        <div i18n class="inner-form-title">Theme & Default route</div>
+        <div i18n class="inner-form-title">THEME AND DEFAULT ROUTE</div>
 
         <ng-container formGroupName="theme">
           <div class="form-group">
@@ -216,49 +216,53 @@
           <label i18n for="instanceDefaultClientRoute">Default client route</label>
           <div class="peertube-select-container">
             <select id="instanceDefaultClientRoute" formControlName="defaultClientRoute">
-              <option i18n value="/videos/overview">Videos Discover</option>
-              <option i18n value="/videos/trending">Videos Trending</option>
-              <option i18n value="/videos/most-liked">Most Liked Videos</option>
-              <option i18n value="/videos/recently-added">Videos Recently Added</option>
+              <option i18n value="/videos/overview">Discover videos</option>
+              <option i18n value="/videos/trending">Trending videos</option>
+              <option i18n value="/videos/most-liked">Most liked videos</option>
+              <option i18n value="/videos/recently-added">Recently added videos</option>
               <option i18n value="/videos/local">Local videos</option>
             </select>
           </div>
           <div *ngIf="formErrors.instance.defaultClientRoute" class="form-error">{{ formErrors.instance.defaultClientRoute }}</div>
         </div>
 
-        <div i18n class="inner-form-title">Signup</div>
+        <div i18n class="inner-form-title">SIGNUP</div>
 
         <ng-container formGroupName="signup">
           <div class="form-group">
             <my-peertube-checkbox
               inputName="signupEnabled" formControlName="enabled"
               i18n-labelText labelText="Signup enabled"
-            ></my-peertube-checkbox>
-          </div>
-
-          <div class="form-group">
-            <my-peertube-checkbox *ngIf="isSignupEnabled()"
-              inputName="signupRequiresEmailVerification" formControlName="requiresEmailVerification"
-              i18n-labelText labelText="Signup requires email verification"
-            ></my-peertube-checkbox>
-          </div>
-
-          <div *ngIf="isSignupEnabled()" class="form-group">
-            <label i18n for="signupLimit">Signup limit</label>
-            <input
-              type="text" id="signupLimit"
-              formControlName="limit" [ngClass]="{ 'input-error': formErrors['signup.limit'] }"
             >
-            <div *ngIf="formErrors.signup.limit" class="form-error">{{ formErrors.signup.limit }}</div>
+              <ng-container ngProjectAs="description">
+                <span i18n>⚠️ This functionality requires a lot of attention and extra moderation.</span>
+              </ng-container>
+              <ng-container ngProjectAs="extra">
+                <my-peertube-checkbox [ngClass]="{ 'disabled-checkbox-extra': !isSignupEnabled() }"
+                  inputName="signupRequiresEmailVerification" formControlName="requiresEmailVerification"
+                  i18n-labelText labelText="Signup requires email verification"
+                ></my-peertube-checkbox>
+
+                <div [ngClass]="{ 'disabled-checkbox-extra': !isSignupEnabled() }" class="mt-3">
+                  <label i18n for="signupLimit">Signup limit</label>
+                  <input
+                    type="number" min="-1" id="signupLimit"
+                    formControlName="limit" [ngClass]="{ 'input-error': formErrors['signup.limit'] }"
+                  >
+                  <div *ngIf="formErrors.signup.limit" class="form-error">{{ formErrors.signup.limit }}</div>
+                  <small *ngIf="form.value['signup']['limit'] === -1" class="text-muted">Signup won't be limited to a fixed number of users.</small>
+                </div>
+              </ng-container>
+            </my-peertube-checkbox>
           </div>
         </ng-container>
 
 
-        <div i18n class="inner-form-title">Users</div>
+        <div i18n class="inner-form-title">USERS</div>
 
         <ng-container formGroupName="user">
           <div class="form-group">
-            <label i18n for="userVideoQuota">User default video quota</label>
+            <label i18n for="userVideoQuota">Default video quota per user</label>
             <div class="peertube-select-container">
               <select id="userVideoQuota" formControlName="videoQuota">
                 <option *ngFor="let videoQuotaOption of videoQuotaOptions" [value]="videoQuotaOption.value">
@@ -270,7 +274,7 @@
           </div>
 
           <div class="form-group">
-            <label i18n for="userVideoQuotaDaily">User default daily upload limit</label>
+            <label i18n for="userVideoQuotaDaily">Default daily upload limit per user</label>
             <div class="peertube-select-container">
               <select id="userVideoQuotaDaily" formControlName="videoQuotaDaily">
                 <option *ngFor="let videoQuotaDailyOption of videoQuotaDailyOptions" [value]="videoQuotaDailyOption.value">
@@ -283,7 +287,7 @@
         </ng-container>
 
 
-        <div i18n class="inner-form-title">Import</div>
+        <div i18n class="inner-form-title">IMPORT</div>
 
         <ng-container formGroupName="import">
           <ng-container formGroupName="videos">
@@ -291,14 +295,14 @@
             <div class="form-group" formGroupName="http">
               <my-peertube-checkbox
                 inputName="importVideosHttpEnabled" formControlName="enabled"
-                i18n-labelText labelText="Video import with HTTP URL (i.e. YouTube) enabled"
+                i18n-labelText labelText="Allow import with HTTP URL (i.e. YouTube)"
               ></my-peertube-checkbox>
             </div>
 
             <div class="form-group" formGroupName="torrent">
               <my-peertube-checkbox
                 inputName="importVideosTorrentEnabled" formControlName="enabled"
-                i18n-labelText labelText="Video import with a torrent file or a magnet URI enabled"
+                i18n-labelText labelText="Allow import with a torrent file or a magnet URI"
               ></my-peertube-checkbox>
             </div>
 
@@ -306,7 +310,7 @@
         </ng-container>
 
 
-        <div i18n class="inner-form-title">Auto-blacklist</div>
+        <div i18n class="inner-form-title">AUTO-BLACKLIST</div>
 
         <ng-container formGroupName="autoBlacklist">
           <ng-container formGroupName="videos">
@@ -315,8 +319,12 @@
               <div class="form-group">
                 <my-peertube-checkbox
                   inputName="autoBlacklistVideosOfUsersEnabled" formControlName="enabled"
-                  i18n-labelText labelText="New videos of users automatically blacklisted enabled"
-                ></my-peertube-checkbox>
+                  i18n-labelText labelText="Blacklist new videos automatically"
+                >
+                <ng-container ngProjectAs="description">
+                  <span i18n>Unless a user is marked as trusted, their videos will stay private until a moderator reviews them.</span>
+                </ng-container>
+              </my-peertube-checkbox>
               </div>
 
             </ng-container>
@@ -324,7 +332,7 @@
         </ng-container>
 
 
-        <div i18n class="inner-form-title">Instance followers</div>
+        <div i18n class="inner-form-title">INSTANCE FOLLOWERS</div>
 
         <ng-container formGroupName="followers">
           <ng-container formGroupName="instance">
@@ -339,13 +347,13 @@
             <div class="form-group">
               <my-peertube-checkbox
                 inputName="followersInstanceManualApproval" formControlName="manualApproval"
-                i18n-labelText labelText="Manually approve new instance follower"
+                i18n-labelText labelText="Manually approve new instance followers"
               ></my-peertube-checkbox>
             </div>
           </ng-container>
         </ng-container>
 
-        <div i18n class="inner-form-title">Instance followings</div>
+        <div i18n class="inner-form-title">INSTANCE FOLLOWINGS</div>
 
         <ng-container formGroupName="followings">
           <ng-container formGroupName="instance">
@@ -355,7 +363,11 @@
                 <my-peertube-checkbox
                   inputName="followingsInstanceAutoFollowBackEnabled" formControlName="enabled"
                   i18n-labelText labelText="Automatically follow other instances that follow you"
-                ></my-peertube-checkbox>
+                >
+                  <ng-container ngProjectAs="description">
+                    <span i18n>⚠️ This functionality requires a lot of attention and extra moderation.</span>
+                  </ng-container>
+                </my-peertube-checkbox>
               </div>
             </ng-container>
 
@@ -363,17 +375,23 @@
               <div class="form-group">
                 <my-peertube-checkbox
                   inputName="followingsInstanceAutoFollowIndexEnabled" formControlName="enabled"
-                  i18n-labelText labelText="Automatically follow instance of the public index (below)"
-                ></my-peertube-checkbox>
-              </div>
-
-              <div class="form-group">
-                <label i18n for="followingsInstanceAutoFollowIndexUrl">Index URL</label>
-                <input
-                  type="text" id="followingsInstanceAutoFollowIndexUrl"
-                  formControlName="indexUrl" [ngClass]="{ 'input-error': formErrors['followings.instance.autoFollowIndex.indexUrl'] }"
+                  i18n-labelText labelText="Automatically follow instances of the public index"
                 >
-                <div *ngIf="formErrors.followings.instance.autoFollowIndex.indexUrl" class="form-error">{{ formErrors.followings.instance.autoFollowIndex.indexUrl }}</div>
+                  <ng-container ngProjectAs="description">
+                    <span i18n>⚠️ This functionality requires a lot of attention and extra moderation.</span>
+                  </ng-container>
+
+                  <ng-container ngProjectAs="extra">
+                    <div [ngClass]="{ 'disabled-checkbox-extra': !isAutoFollowIndexEnabled() }">
+                      <label i18n for="followingsInstanceAutoFollowIndexUrl">Index URL</label>
+                      <input
+                        type="text" id="followingsInstanceAutoFollowIndexUrl"
+                        formControlName="indexUrl" [ngClass]="{ 'input-error': formErrors['followings.instance.autoFollowIndex.indexUrl'] }"
+                      >
+                      <div *ngIf="formErrors.followings.instance.autoFollowIndex.indexUrl" class="form-error">{{ formErrors.followings.instance.autoFollowIndex.indexUrl }}</div>
+                    </div>
+                  </ng-container>
+                </my-peertube-checkbox>
               </div>
 
             </ng-container>
@@ -381,7 +399,7 @@
         </ng-container>
 
 
-        <div i18n class="inner-form-title">Administrator</div>
+        <div i18n class="inner-form-title">ADMINISTRATORS</div>
 
         <div class="form-group" formGroupName="admin">
           <label i18n for="adminEmail">Admin email</label>
@@ -404,7 +422,7 @@
 
     <ngb-tab i18n-title title="Services">
       <ng-template ngbTabContent>
-        <div i18n class="inner-form-title">Twitter</div>
+        <div i18n class="inner-form-title">TWITTER</div>
 
         <ng-container formGroupName="services">
           <ng-container formGroupName="twitter">
@@ -452,7 +470,7 @@
     <ngb-tab i18n-title title="Advanced configuration">
       <ng-template ngbTabContent>
 
-        <div i18n class="inner-form-title">Transcoding</div>
+        <div i18n class="inner-form-title">TRANSCODING</div>
 
         <ng-container formGroupName="transcoding">
           <div class="form-group">
@@ -475,7 +493,7 @@
                 i18n-labelText labelText="Allow additional extensions"
               >
                 <ng-template ptTemplate="help">
-                  <ng-container i18n>Allow your users to upload .mkv, .mov, .avi, .flv videos</ng-container>
+                  <ng-container i18n>Allow your users to upload .mkv, .mov, .avi and .flv videos</ng-container>
                 </ng-template>
               </my-peertube-checkbox>
             </div>
@@ -491,6 +509,51 @@
               </my-peertube-checkbox>
             </div>
 
+            <ng-container formGroupName="webtorrent">
+              <div class="form-group" >
+                <my-peertube-checkbox
+                  inputName="transcodingWebTorrentEnabled" formControlName="enabled"
+                  i18n-labelText labelText="WebTorrent support enabled"
+                >
+                  <ng-template ptTemplate="help">
+                    <ng-container i18n>
+                      <strong>Experimental, we suggest you to not disable webtorrent support for now</strong>
+
+                      <p>If you also enabled HLS support, it will multiply videos storage by 2</p>
+
+                      <br />
+
+                      <strong>If disabled, breaks federation with PeerTube instances < 2.1</strong>
+                    </ng-container>
+                  </ng-template>
+                </my-peertube-checkbox>
+              </div>
+            </ng-container>
+
+            <ng-container formGroupName="hls">
+              <div class="form-group" >
+                <my-peertube-checkbox
+                  inputName="transcodingHlsEnabled" formControlName="enabled"
+                  i18n-labelText labelText="HLS support enabled"
+                >
+                  <ng-template ptTemplate="help">
+                    <ng-container i18n>
+                      <strong>Requires ffmpeg >= 4.1</strong>
+
+                      <p>Generate HLS playlists and fragmented MP4 files resulting in a better playback than with the current default player:</p>
+                      <ul>
+                        <li>Resolution change is smoother</li>
+                        <li>Faster playback in particular with long videos</li>
+                        <li>More stable playback (less bugs/infinite loading)</li>
+                      </ul>
+
+                      <p>If you also enabled WebTorrent support, it will multiply videos storage by 2</p>
+                    </ng-container>
+                  </ng-template>
+                </my-peertube-checkbox>
+              </div>
+            </ng-container>
+
             <div class="form-group">
               <label i18n for="transcodingThreads">Transcoding threads</label>
               <div class="peertube-select-container">
@@ -508,7 +571,11 @@
                 <my-peertube-checkbox
                   [inputName]="getResolutionKey(resolution.id)" [formControlName]="resolution.id"
                   i18n-labelText labelText="Resolution {{resolution.label}} enabled"
-                ></my-peertube-checkbox>
+                >
+                  <ng-template *ngIf="resolution.description" ptTemplate="help">
+                    <div [innerHTML]="resolution.description"></div>
+                  </ng-template>
+                </my-peertube-checkbox>
               </div>
             </ng-container>
 
@@ -516,7 +583,7 @@
         </ng-container>
 
         <div class="inner-form-title">
-          <ng-container i18n>Cache</ng-container>
+          <ng-container i18n>CACHE</ng-container>
 
           <my-help>
             <ng-template ptTemplate="customHtml">
@@ -545,7 +612,7 @@
           </div>
         </ng-container>
 
-        <div i18n class="inner-form-title">Customizations</div>
+        <div i18n class="inner-form-title">CUSTOMIZATIONS</div>
 
         <ng-container formGroupName="instance">
           <ng-container formGroupName="customizations">
@@ -554,7 +621,7 @@
               <my-help>
                 <ng-template ptTemplate="customHtml">
                   <ng-container i18n>
-                    Write directly JavaScript code.<br />Example: <pre>console.log('my instance is amazing');</pre>
+                    Write JavaScript code directly.<br />Example: <pre>console.log('my instance is amazing');</pre>
                   </ng-container>
                 </ng-template>
               </my-help>
@@ -573,7 +640,7 @@
               <my-help>
                 <ng-template ptTemplate="customHtml">
                   <ng-container i18n>
-                    Write directly CSS code. Example:<br /><br />
+                    Write CSS code directly. Example:<br /><br />
 <pre>
 #custom-css {{ '{' }}
   color: red;
@@ -604,5 +671,5 @@
   </ngb-tabset>
 
   <input (click)="formValidated()" type="submit" i18n-value value="Update configuration" [disabled]="!form.valid">
-  <span class="form-error" i18n *ngIf="!form.valid">It seems the configuration is invalid. Please search potential errors in the different tabs.</span>
+  <span class="form-error" i18n *ngIf="!form.valid">It seems like the configuration is invalid. Please search for potential errors in the different tabs.</span>
 </form>