X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Fconfig%2Fedit-custom-config%2Fedit-custom-config.component.html;h=8fdced1c7c710d46777d29f6394d6ceabfabb4a5;hb=fccbbc1a77d6e215eb299b569e9a4e5c79c7b719;hp=4ce4c18fc886a4133b3ed30fe6a42a39cd03a7ec;hpb=a6d5ff7604a3c2a94ff8814e2df7ca7bb2b48634;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 4ce4c18fc..8fdced1c7 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
@@ -1,3 +1,4 @@
+<h1 class="sr-only" i18n>Configuration</h1>
 <form role="form" [formGroup]="form">
 
   <div ngbNav #nav="ngbNav" class="nav-tabs">
@@ -37,7 +38,7 @@
               <div class="form-group">
                 <label i18n for="instanceDescription">Description</label><my-help helpType="markdownText"></my-help>
                 <my-markdown-textarea
-                  name="instanceDescription" formControlName="description" textareaWidth="500px" [previewColumn]="true"
+                  name="instanceDescription" formControlName="description" textareaMaxWidth="500px"
                   [classes]="{ 'input-error': formErrors['instance.description'] }"
                 ></my-markdown-textarea>
                 <div *ngIf="formErrors.instance.description" class="form-error">{{ formErrors.instance.description }}</div>
@@ -108,6 +109,7 @@
 
                 <div class="peertube-select-container">
                   <select id="instanceDefaultNSFWPolicy" formControlName="defaultNSFWPolicy" class="form-control">
+                    <option i18n value="undefined" disabled>Policy for sensitive videos</option>
                     <option i18n value="do_not_list">Do not list</option>
                     <option i18n value="blur">Blur thumbnails</option>
                     <option i18n value="display">Display</option>
@@ -119,7 +121,7 @@
               <div class="form-group">
                 <label i18n for="instanceTerms">Terms</label><my-help helpType="markdownText"></my-help>
                 <my-markdown-textarea
-                  name="instanceTerms" formControlName="terms" textareaWidth="500px" [previewColumn]="true"
+                  name="instanceTerms" formControlName="terms" textareaMaxWidth="500px"
                   [ngClass]="{ 'input-error': formErrors['instance.terms'] }"
                 ></my-markdown-textarea>
                 <div *ngIf="formErrors.instance.terms" class="form-error">{{ formErrors.instance.terms }}</div>
@@ -128,7 +130,7 @@
               <div class="form-group">
                 <label i18n for="instanceCodeOfConduct">Code of conduct</label><my-help helpType="markdownText"></my-help>
                 <my-markdown-textarea
-                  name="instanceCodeOfConduct" formControlName="codeOfConduct" textareaWidth="500px" [previewColumn]="true"
+                  name="instanceCodeOfConduct" formControlName="codeOfConduct" textareaMaxWidth="500px"
                   [ngClass]="{ 'input-error': formErrors['instance.codeOfConduct'] }"
                 ></my-markdown-textarea>
                 <div *ngIf="formErrors.instance.codeOfConduct" class="form-error">{{ formErrors.instance.codeOfConduct }}</div>
@@ -139,7 +141,7 @@
                 <div i18n class="label-small-info">Who moderates the instance? What is the policy regarding NSFW videos? Political videos? etc</div>
 
                 <my-markdown-textarea
-                  name="instanceModerationInformation" formControlName="moderationInformation" textareaWidth="500px" [previewColumn]="true"
+                  name="instanceModerationInformation" formControlName="moderationInformation" textareaMaxWidth="500px"
                   [ngClass]="{ 'input-error': formErrors['instance.moderationInformation'] }"
                 ></my-markdown-textarea>
                 <div *ngIf="formErrors.instance.moderationInformation" class="form-error">{{ formErrors.instance.moderationInformation }}</div>
@@ -160,7 +162,7 @@
                 <div i18n class="label-small-info">A single person? A non-profit? A company?</div>
 
                 <my-markdown-textarea
-                  name="instanceAdministrator" formControlName="administrator" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true"
+                  name="instanceAdministrator" formControlName="administrator" textareaMaxWidth="500px" textareaHeight="75px"
                   [classes]="{ 'input-error': formErrors['instance.administrator'] }"
                 ></my-markdown-textarea>
 
@@ -215,7 +217,7 @@
                 <div i18n class="label-small-info">i.e. 2vCore 2GB RAM, a direct the link to the server you rent, etc.</div>
 
                 <my-markdown-textarea
-                  name="instanceHardwareInformation" formControlName="hardwareInformation" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true"
+                  name="instanceHardwareInformation" formControlName="hardwareInformation" textareaMaxWidth="500px" textareaHeight="75px"
                   [classes]="{ 'input-error': formErrors['instance.hardwareInformation'] }"
                 ></my-markdown-textarea>
 
@@ -275,6 +277,58 @@
           </div>
         </div>
 
+        <div class="form-row mt-4"> <!-- broadcast grid -->
+          <div class="form-group col-12 col-lg-4 col-xl-3">
+            <div i18n class="inner-form-title">BROADCAST MESSAGE</div>
+            <div i18n class="inner-for-description">
+              Display a message on your instance
+            </div>
+          </div>
+
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
+
+            <ng-container formGroupName="broadcastMessage">
+
+              <div class="form-group">
+                <my-peertube-checkbox
+                  inputName="broadcastMessageEnabled" formControlName="enabled"
+                  i18n-labelText labelText="Enable broadcast message"
+                ></my-peertube-checkbox>
+              </div>
+
+              <div class="form-group">
+                <my-peertube-checkbox
+                  inputName="broadcastMessageDismissable" formControlName="dismissable"
+                  i18n-labelText labelText="Allow users to dismiss the broadcast message "
+                ></my-peertube-checkbox>
+              </div>
+
+              <div class="form-group">
+                <label i18n for="broadcastMessageLevel">Broadcast message level</label>
+                <div class="peertube-select-container">
+                  <select id="broadcastMessageLevel" formControlName="level" class="form-control">
+                    <option value="info">info</option>
+                    <option value="warning">warning</option>
+                    <option value="error">error</option>
+                  </select>
+                </div>
+                <div *ngIf="formErrors.broadcastMessage.level" class="form-error">{{ formErrors.broadcastMessage.level }}</div>
+              </div>
+
+              <div class="form-group">
+                <label i18n for="broadcastMessageMessage">Message</label><my-help helpType="markdownText"></my-help>
+                <my-markdown-textarea
+                  name="broadcastMessageMessage" formControlName="message" textareaMaxWidth="500px"
+                  [classes]="{ 'input-error': formErrors['broadcastMessage.message'] }"
+                ></my-markdown-textarea>
+                <div *ngIf="formErrors.broadcastMessage.message" class="form-error">{{ formErrors.broadcastMessage.message }}</div>
+              </div>
+
+            </ng-container>
+
+          </div>
+        </div>
+
         <div class="form-row mt-4"> <!-- new users grid -->
           <div class="form-group col-12 col-lg-4 col-xl-3">
             <div i18n class="inner-form-title">NEW USERS</div>
@@ -289,7 +343,7 @@
               <div class="form-group">
                 <my-peertube-checkbox
                   inputName="signupEnabled" formControlName="enabled"
-                  i18n-labelText labelText="Signup enabled"
+                  i18n-labelText labelText="Enable Signup"
                 >
                   <ng-container ngProjectAs="description">
                     <span i18n>⚠️ This functionality requires a lot of attention and extra moderation.</span>
@@ -319,7 +373,7 @@
                 <label i18n for="userVideoQuota">Default video quota per user</label>
                 <div class="peertube-select-container">
                   <select id="userVideoQuota" formControlName="videoQuota" class="form-control">
-                    <option *ngFor="let videoQuotaOption of videoQuotaOptions" [value]="videoQuotaOption.value">
+                    <option *ngFor="let videoQuotaOption of videoQuotaOptions" [value]="videoQuotaOption.value" [disabled]="videoQuotaOption.disabled">
                       {{ videoQuotaOption.label }}
                     </option>
                   </select>
@@ -331,7 +385,7 @@
                 <label i18n for="userVideoQuotaDaily">Default daily upload limit per user</label>
                 <div class="peertube-select-container">
                   <select id="userVideoQuotaDaily" formControlName="videoQuotaDaily" class="form-control">
-                    <option *ngFor="let videoQuotaDailyOption of videoQuotaDailyOptions" [value]="videoQuotaDailyOption.value">
+                    <option *ngFor="let videoQuotaDailyOption of videoQuotaDailyOptions" [value]="videoQuotaDailyOption.value" [disabled]="videoQuotaDailyOption.disabled">
                       {{ videoQuotaDailyOption.label }}
                     </option>
                   </select>
@@ -343,9 +397,9 @@
           </div>
         </div>
 
-        <div class="form-row mt-4"> <!-- new videos grid -->
+        <div class="form-row mt-4"> <!-- videos grid -->
           <div class="form-group col-12 col-lg-4 col-xl-3">
-            <div i18n class="inner-form-title">NEW VIDEOS</div>
+            <div i18n class="inner-form-title">VIDEOS</div>
           </div>
 
           <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
@@ -377,7 +431,7 @@
                   <div class="form-group">
                     <my-peertube-checkbox
                       inputName="autoBlacklistVideosOfUsersEnabled" formControlName="enabled"
-                      i18n-labelText labelText="Blacklist new videos automatically"
+                      i18n-labelText labelText="Block 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>
@@ -392,6 +446,93 @@
           </div>
         </div>
 
+        <div class="form-row mt-4"> <!-- search grid -->
+          <div class="form-group col-12 col-lg-4 col-xl-3">
+            <div i18n class="inner-form-title">SEARCH</div>
+          </div>
+
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
+
+            <ng-container formGroupName="search">
+              <ng-container formGroupName="remoteUri">
+
+                <div class="form-group">
+                  <my-peertube-checkbox
+                    inputName="searchRemoteUriUsers" formControlName="users"
+                    i18n-labelText labelText="Allow users to do remote URI/handle search"
+                  >
+                    <ng-container ngProjectAs="description">
+                      <span i18n>Allow <strong>your users</strong> to look up remote videos/actors by their URI, that may not be federated with your instance</span>
+                    </ng-container>
+                  </my-peertube-checkbox>
+                </div>
+
+                <div class="form-group">
+                  <my-peertube-checkbox
+                    inputName="searchRemoteUriAnonymous" formControlName="anonymous"
+                    i18n-labelText labelText="Allow anonymous to do remote URI/handle search"
+                  >
+                    <ng-container ngProjectAs="description">
+                      <span i18n>Allow <strong>anonymous users</strong> to look up remote videos/actors by their URI, that may not be federated with your instance</span>
+                    </ng-container>
+                  </my-peertube-checkbox>
+                </div>
+
+              </ng-container>
+
+              <ng-container formGroupName="searchIndex">
+                <div class="form-group">
+                  <my-peertube-checkbox
+                    inputName="searchIndexEnabled" formControlName="enabled"
+                    i18n-labelText labelText="Enable global search"
+                  >
+                    <ng-container ngProjectAs="description">
+                      <p i18n>⚠️ This functionality depends heavily on the moderation of instances followed by the search index you select.</p>
+
+                      <span i18n>
+                        You should only use moderated search indexes in production, or <a href="https://framagit.org/framasoft/peertube/search-index">host your own</a>.
+                      </span>
+                    </ng-container>
+
+                    <ng-container ngProjectAs="extra">
+                      <div [ngClass]="{ 'disabled-checkbox-extra': !isSearchIndexEnabled() }">
+                        <label i18n for="searchIndexUrl">Search index URL</label>
+                        <input
+                          type="text"  id="searchIndexUrl" class="form-control"
+                          formControlName="url" [ngClass]="{ 'input-error': formErrors['search.searchIndex.url'] }"
+                        >
+                        <div *ngIf="formErrors.search.searchIndex.url" class="form-error">{{ formErrors.search.searchIndex.url }}</div>
+                      </div>
+
+                      <div class="mt-3">
+                        <my-peertube-checkbox [ngClass]="{ 'disabled-checkbox-extra': !isSearchIndexEnabled() }"
+                          inputName="searchIndexDisableLocalSearch" formControlName="disableLocalSearch"
+                          i18n-labelText labelText="Disable local search in search bar"
+                        ></my-peertube-checkbox>
+                      </div>
+
+                      <div class="mt-3">
+                        <my-peertube-checkbox [ngClass]="{ 'disabled-checkbox-extra': !isSearchIndexEnabled() }"
+                          inputName="searchIndexIsDefaultSearch" formControlName="isDefaultSearch"
+                          i18n-labelText labelText="Search bar uses the global search index by default"
+                        >
+                          <ng-container ngProjectAs="description">
+                            <span i18n>Otherwise the local search stays used by default</span>
+                          </ng-container>
+                        </my-peertube-checkbox>
+                      </div>
+
+                    </ng-container>
+                  </my-peertube-checkbox>
+                </div>
+
+              </ng-container>
+
+            </ng-container>
+
+          </div>
+        </div>
+
         <div class="form-row mt-4"> <!-- federation grid -->
           <div class="form-group col-12 col-lg-4 col-xl-3">
             <div i18n class="inner-form-title">FEDERATION</div>
@@ -441,10 +582,14 @@
                   <div class="form-group">
                     <my-peertube-checkbox
                       inputName="followingsInstanceAutoFollowIndexEnabled" formControlName="enabled"
-                      i18n-labelText labelText="Automatically follow instances of the public index"
+                      i18n-labelText labelText="Automatically follow instances of a public index"
                     >
                       <ng-container ngProjectAs="description">
-                        <span i18n>⚠️ This functionality requires a lot of attention and extra moderation.</span>
+                        <p i18n>⚠️ This functionality requires a lot of attention and extra moderation.</p>
+
+                        <span i18n>
+                          You should only follow moderated indexes in production, or <a href="https://framagit.org/framasoft/peertube/instances-peertube#peertube-auto-follow">host your own</a>.
+                        </span>
                       </ng-container>
 
                       <ng-container ngProjectAs="extra">
@@ -527,16 +672,16 @@
                 <div class="form-group">
                   <my-peertube-checkbox inputName="servicesTwitterWhitelisted" formControlName="whitelisted">
                     <ng-template ptTemplate="label">
-                      <ng-container i18n>Instance whitelisted by Twitter</ng-container>
+                      <ng-container i18n>Instance allowed by Twitter</ng-container>
                     </ng-template>
 
                     <ng-template ptTemplate="help">
                       <ng-container i18n>
-                        If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br />
-                        If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<br /><br />
+                        If your instance is explicitly allowed by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br />
+                        If the instance is not, we use an image link card that will redirect on your PeerTube instance.<br /><br />
                         Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on
                         <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a>
-                        to see if you instance is whitelisted.
+                        to see if you instance is allowed.
                       </ng-container>
                     </ng-template>
                   </my-peertube-checkbox>
@@ -586,7 +731,7 @@
                         i18n-labelText labelText="Allow additional extensions"
                       >
                         <ng-container ngProjectAs="description">
-                          <span i18n>Allows users to upload .mkv, .mov, .avi and .flv videos.</span>
+                          <span i18n>Allows users to upload .mkv, .mov, .avi, .wmv, .flv, .f4v, .3g2, .3gp, .mts, m2ts, .mxf, .nut videos.</span>
                         </ng-container>
                       </my-peertube-checkbox>
                     </div>
@@ -627,7 +772,7 @@
                       <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
                         <my-peertube-checkbox
                           inputName="transcodingHlsEnabled" formControlName="enabled"
-                          i18n-labelText labelText="HLS support enabled"
+                          i18n-labelText labelText="HLS with P2P support enabled"
                         >
                           <ng-template ptTemplate="help">
                             <ng-container i18n>
@@ -651,20 +796,16 @@
                 </my-peertube-checkbox>
               </div>
 
-              <div class="form-group">
-
-                <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
-                  <label i18n for="transcodingThreads">Transcoding threads</label>
-                  <div class="peertube-select-container">
-                    <select id="transcodingThreads" formControlName="threads" class="form-control">
-                      <option *ngFor="let transcodingThreadOption of transcodingThreadOptions" [value]="transcodingThreadOption.value">
-                        {{ transcodingThreadOption.label }}
-                      </option>
-                    </select>
-                  </div>
-                  <div *ngIf="formErrors.transcoding.threads" class="form-error">{{ formErrors.transcoding.threads }}</div>
+              <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
+                <label i18n for="transcodingThreads">Transcoding threads</label>
+                <div class="peertube-select-container">
+                  <select id="transcodingThreads" formControlName="threads" class="form-control">
+                    <option *ngFor="let transcodingThreadOption of transcodingThreadOptions" [value]="transcodingThreadOption.value">
+                      {{ transcodingThreadOption.label }}
+                    </option>
+                  </select>
                 </div>
-
+                <div *ngIf="formErrors.transcoding.threads" class="form-error">{{ formErrors.transcoding.threads }}</div>
               </div>
 
               <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
@@ -800,8 +941,9 @@
   <div class="form-row mt-4"> <!-- submit placement block -->
     <div class="col-md-7 col-xl-5"></div>
     <div class="col-md-5 col-xl-5">
+      <span class="form-error submit-error" i18n *ngIf="!form.valid">It seems like the configuration is invalid. Please search for potential errors in the different tabs.</span>
+
       <input (click)="formValidated()" type="submit" i18n-value value="Update configuration" [disabled]="!form.valid">
-      <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>
     </div>
   </div>
 </form>