]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/blobdiff - client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
Live streaming implementation first step
[github/Chocobozzz/PeerTube.git] / client / src / app / +admin / config / edit-custom-config / edit-custom-config.component.html
index 915d60090c3b8ab8cbd7c4dec3209d59a3c1a225..8000f471fe80e96dee4718f2ba07608c315013f9 100644 (file)
+<h1 class="sr-only" i18n>Configuration</h1>
 <form role="form" [formGroup]="form">
 
-  <ngb-tabset class="root-tabset bootstrap">
+  <div ngbNav #nav="ngbNav" class="nav-tabs">
 
-    <ngb-tab i18n-title title="Instance information">
-      <ng-template ngbTabContent>
+    <ng-container ngbNavItem="instance-information">
+      <a ngbNavLink i18n>Instance information</a>
+
+      <ng-template ngbNavContent>
 
         <ng-container formGroupName="instance">
 
-          <div i18n class="inner-form-title">Instance</div>
+          <div class="form-row mt-5"> <!-- instance grid -->
+            <div class="form-group col-12 col-lg-4 col-xl-3">
+              <div i18n class="inner-form-title">INSTANCE</div>
+            </div>
 
-          <div class="form-group">
-            <label i18n for="instanceName">Name</label>
-            <input
-              type="text" id="instanceName"
-              formControlName="name" [ngClass]="{ 'input-error': formErrors.instance.name }"
-            >
-            <div *ngIf="formErrors.instance.name" class="form-error">{{ formErrors.instance.name }}</div>
-          </div>
+            <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-          <div class="form-group">
-            <label i18n for="instanceShortDescription">Short description</label>
-            <textarea
-              id="instanceShortDescription" formControlName="shortDescription" class="small"
-              [ngClass]="{ 'input-error': formErrors['instance.shortDescription'] }"
-            ></textarea>
-            <div *ngIf="formErrors.instance.shortDescription" class="form-error">{{ formErrors.instance.shortDescription }}</div>
-          </div>
+              <div class="form-group">
+                <label i18n for="instanceName">Name</label>
+                <input
+                  type="text" id="instanceName" class="form-control"
+                  formControlName="name" [ngClass]="{ 'input-error': formErrors.instance.name }"
+                >
+                <div *ngIf="formErrors.instance.name" class="form-error">{{ formErrors.instance.name }}</div>
+              </div>
 
-          <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"
-              [classes]="{ 'input-error': formErrors['instance.description'] }"
-            ></my-markdown-textarea>
-            <div *ngIf="formErrors.instance.description" class="form-error">{{ formErrors.instance.description }}</div>
-          </div>
+              <div class="form-group">
+                <label i18n for="instanceShortDescription">Short description</label>
+                <textarea
+                  id="instanceShortDescription" formControlName="shortDescription" class="form-control small"
+                  [ngClass]="{ 'input-error': formErrors['instance.shortDescription'] }"
+                ></textarea>
+                <div *ngIf="formErrors.instance.shortDescription" class="form-error">{{ formErrors.instance.shortDescription }}</div>
+              </div>
 
-          <div class="form-group">
-            <label i18n for="instanceCategories">Main instance categories</label>
+              <div class="form-group">
+                <label i18n for="instanceDescription">Description</label><my-help helpType="markdownText"></my-help>
+                <my-markdown-textarea
+                  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>
+              </div>
 
-            <div>
-              <p-multiSelect
-                inputId="instanceCategories" [options]="categoryItems" formControlName="categories" showToggleAll="false"
-                [defaultLabel]="getDefaultCategoryLabel()" [selectedItemsLabel]="getSelectedCategoryLabel()"
-                emptyFilterMessage="No results found" i18n-emptyFilterMessage
-              ></p-multiSelect>
-            </div>
-          </div>
+              <div class="form-group">
+                <label i18n for="instanceCategories">Main instance categories</label>
+
+                <div>
+                  <my-select-checkbox
+                    id="instanceCategories"
+                    formControlName="categories" [availableItems]="categoryItems"
+                    [selectableGroup]="false"
+                    i18n-placeholder placeholder="Add a new category"
+                  >
+                  </my-select-checkbox>
+                </div>
+              </div>
 
-          <div class="form-group">
-            <label i18n for="instanceLanguages">Main languages you/your moderators speak</label>
+              <div class="form-group">
+                <label i18n for="instanceLanguages">Main languages you/your moderators speak</label>
+
+                <div>
+                  <my-select-checkbox
+                    id="instanceLanguages"
+                    formControlName="languages" [availableItems]="languageItems"
+                    [selectableGroup]="false"
+                    i18n-placeholder placeholder="Add a new language"
+                  >
+                  </my-select-checkbox>
+                </div>
+              </div>
 
-            <div>
-              <p-multiSelect
-                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 class="form-row mt-4"> <!-- moderation & nsfw grid -->
+            <div class="form-group col-12 col-lg-4 col-xl-3">
+              <div i18n class="inner-form-title">MODERATION & NSFW</div>
+              <div i18n class="inner-for-description">
+                Manage <a routerLink="/admin/users">users</a> to build a moderation team.
+              </div>
+            </div>
 
-          <div class="form-group">
-            <my-peertube-checkbox inputName="instanceIsNSFW" formControlName="isNSFW">
-              <ng-template ptTemplate="label">
-                <ng-container i18n>This instance is dedicated to sensitive or NSFW content</ng-container>
-              </ng-template>
+            <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-              <ng-template ptTemplate="help">
-                <ng-container i18n>
-                  Enabling it will allow other administrators to know that you are mainly federating sensitive content.<br /><br />
-                  Moreover, the NSFW checkbox on video upload will be automatically checked by default.
-                </ng-container>
-              </ng-template>
-            </my-peertube-checkbox>
-          </div>
+              <div class="form-group">
+                <my-peertube-checkbox inputName="instanceIsNSFW" formControlName="isNSFW">
+                  <ng-template ptTemplate="label">
+                    <ng-container i18n>This instance is dedicated to sensitive or NSFW content</ng-container>
+                  </ng-template>
 
-          <div class="form-group">
-            <label i18n for="instanceDefaultNSFWPolicy">Policy on videos containing sensitive content</label>
+                  <ng-template ptTemplate="help">
+                    <ng-container i18n>
+                      Enabling it will allow other administrators to know that you are mainly federating sensitive content.<br /><br />
+                      Moreover, the NSFW checkbox on video upload will be automatically checked by default.
+                    </ng-container>
+                  </ng-template>
+                </my-peertube-checkbox>
+              </div>
 
-            <my-help>
-              <ng-template ptTemplate="customHtml">
-                <ng-container i18n>
-                  With <strong>Do not list</strong> or <strong>Blur thumbnails</strong>, a confirmation will be requested to watch the video.
-                </ng-container>
-              </ng-template>
-            </my-help>
-
-            <div class="peertube-select-container">
-              <select id="instanceDefaultNSFWPolicy" formControlName="defaultNSFWPolicy">
-                <option i18n value="do_not_list">Do not list</option>
-                <option i18n value="blur">Blur thumbnails</option>
-                <option i18n value="display">Display</option>
-              </select>
-            </div>
-            <div *ngIf="formErrors.instance.defaultNSFWPolicy" class="form-error">{{ formErrors.instance.defaultNSFWPolicy }}</div>
-          </div>
+              <div class="form-group">
+                <label i18n for="instanceDefaultNSFWPolicy">Policy on videos containing sensitive content</label>
 
-          <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"
-              [ngClass]="{ 'input-error': formErrors['instance.terms'] }"
-            ></my-markdown-textarea>
-            <div *ngIf="formErrors.instance.terms" class="form-error">{{ formErrors.instance.terms }}</div>
-          </div>
+                <my-help>
+                  <ng-template ptTemplate="customHtml">
+                    <ng-container i18n>
+                      With <strong>Do not list</strong> or <strong>Blur thumbnails</strong>, a confirmation will be requested to watch the video.
+                    </ng-container>
+                  </ng-template>
+                </my-help>
+
+                <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>
+                  </select>
+                </div>
+                <div *ngIf="formErrors.instance.defaultNSFWPolicy" class="form-error">{{ formErrors.instance.defaultNSFWPolicy }}</div>
+              </div>
 
-          <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"
-              [ngClass]="{ 'input-error': formErrors['instance.codeOfConduct'] }"
-            ></my-markdown-textarea>
-            <div *ngIf="formErrors.instance.codeOfConduct" class="form-error">{{ formErrors.instance.codeOfConduct }}</div>
-          </div>
+              <div class="form-group">
+                <label i18n for="instanceTerms">Terms</label><my-help helpType="markdownText"></my-help>
+                <my-markdown-textarea
+                  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>
+              </div>
 
-          <div class="form-group">
-            <label i18n for="instanceModerationInformation">Moderation information</label><my-help helpType="markdownText"></my-help>
-            <div i18n class="label-small-info">Who moderates the instance? What is the policy regarding NSFW videos? Political videos? etc</div>
+              <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" textareaMaxWidth="500px"
+                  [ngClass]="{ 'input-error': formErrors['instance.codeOfConduct'] }"
+                ></my-markdown-textarea>
+                <div *ngIf="formErrors.instance.codeOfConduct" class="form-error">{{ formErrors.instance.codeOfConduct }}</div>
+              </div>
 
-            <my-markdown-textarea
-              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 class="form-group">
+                <label i18n for="instanceModerationInformation">Moderation information</label><my-help helpType="markdownText"></my-help>
+                <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" textareaMaxWidth="500px"
+                  [ngClass]="{ 'input-error': formErrors['instance.moderationInformation'] }"
+                ></my-markdown-textarea>
+                <div *ngIf="formErrors.instance.moderationInformation" class="form-error">{{ formErrors.instance.moderationInformation }}</div>
+              </div>
+
+            </div>
           </div>
 
-          <div i18n class="inner-form-title">You and your instance</div>
+          <div class="form-row mt-4"> <!-- you and your instance grid -->
+            <div class="form-group col-12 col-lg-4 col-xl-3">
+              <div i18n class="inner-form-title">YOU AND YOUR INSTANCE</div>
+            </div>
+
+            <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-          <div class="form-group">
-            <label i18n for="instanceAdministrator">Who is behind the instance?</label>
-            <div i18n class="label-small-info">A single person? A non-profit? A company?</div>
+              <div class="form-group">
+                <label i18n for="instanceAdministrator">Who is behind the instance?</label>
+                <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"
-              [classes]="{ 'input-error': formErrors['instance.administrator'] }"
-            ></my-markdown-textarea>
+                <my-markdown-textarea
+                  name="instanceAdministrator" formControlName="administrator" textareaMaxWidth="500px" textareaHeight="75px"
+                  [classes]="{ 'input-error': formErrors['instance.administrator'] }"
+                ></my-markdown-textarea>
 
-            <div *ngIf="formErrors.instance.administrator" class="form-error">{{ formErrors.instance.administrator }}</div>
-          </div>
+                <div *ngIf="formErrors.instance.administrator" class="form-error">{{ formErrors.instance.administrator }}</div>
+              </div>
 
-          <div class="form-group">
-            <label i18n for="instanceCreationReason">Why did you create this instance?</label>
-            <div i18n class="label-small-info">To share your personal videos? To open registrations and allow people to upload what they want?</div>
+              <div class="form-group">
+                <label i18n for="instanceCreationReason">Why did you create this instance?</label>
+                <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" class="form-control"
+                  [ngClass]="{ 'input-error': formErrors['instance.creationReason'] }"
+                ></textarea>
+                <div *ngIf="formErrors.instance.creationReason" class="form-error">{{ formErrors.instance.creationReason }}</div>
+              </div>
 
-            <textarea
-              id="instanceCreationReason" formControlName="creationReason" class="small"
-              [ngClass]="{ 'input-error': formErrors['instance.creationReason'] }"
-            ></textarea>
-            <div *ngIf="formErrors.instance.creationReason" class="form-error">{{ formErrors.instance.creationReason }}</div>
-          </div>
+              <div class="form-group">
+                <label i18n for="instanceMaintenanceLifetime">How long do you plan to maintain this instance?</label>
+                <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="form-control small"
+                  [ngClass]="{ 'input-error': formErrors['instance.maintenanceLifetime'] }"
+                ></textarea>
+                <div *ngIf="formErrors.instance.maintenanceLifetime" class="form-error">{{ formErrors.instance.maintenanceLifetime }}</div>
+              </div>
 
-          <div class="form-group">
-            <label i18n for="instanceMaintenanceLifetime">How long do you plan to maintain this instance?</label>
-            <div i18n class="label-small-info">It's important to know for users who want to register on your instance</div>
+              <div class="form-group">
+                <label i18n for="instanceBusinessModel">How will you finance the PeerTube server?</label>
+                <div i18n class="label-small-info">With your own funds? With user donations? Advertising?</div>
+
+                <textarea
+                  id="instanceBusinessModel" formControlName="businessModel" class="form-control small"
+                  [ngClass]="{ 'input-error': formErrors['instance.businessModel'] }"
+                ></textarea>
+                <div *ngIf="formErrors.instance.businessModel" class="form-error">{{ formErrors.instance.businessModel }}</div>
+              </div>
 
-            <textarea
-              id="instanceMaintenanceLifetime" formControlName="maintenanceLifetime" class="small"
-              [ngClass]="{ 'input-error': formErrors['instance.maintenanceLifetime'] }"
-            ></textarea>
-            <div *ngIf="formErrors.instance.maintenanceLifetime" class="form-error">{{ formErrors.instance.maintenanceLifetime }}</div>
+            </div>
           </div>
 
-          <div class="form-group">
-            <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>
+          <div class="form-row mt-4"> <!-- other information grid -->
+            <div class="form-group col-12 col-lg-4 col-xl-3">
+              <div i18n class="inner-form-title">OTHER INFORMATION</div>
+            </div>
 
-            <textarea
-              id="instanceBusinessModel" formControlName="businessModel" class="small"
-              [ngClass]="{ 'input-error': formErrors['instance.businessModel'] }"
-            ></textarea>
-            <div *ngIf="formErrors.instance.businessModel" class="form-error">{{ formErrors.instance.businessModel }}</div>
-          </div>
+            <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-          <div i18n class="inner-form-title">Other information</div>
+              <div class="form-group">
+                <label i18n for="instanceHardwareInformation">What server/hardware does the instance run on?</label>
+                <div i18n class="label-small-info">i.e. 2vCore 2GB RAM, a direct the link to the server you rent, etc.</div>
 
-          <div class="form-group">
-            <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
+                  name="instanceHardwareInformation" formControlName="hardwareInformation" textareaMaxWidth="500px" textareaHeight="75px"
+                  [classes]="{ 'input-error': formErrors['instance.hardwareInformation'] }"
+                ></my-markdown-textarea>
 
-            <my-markdown-textarea
-              name="instanceHardwareInformation" formControlName="hardwareInformation" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true"
-              [classes]="{ 'input-error': formErrors['instance.hardwareInformation'] }"
-            ></my-markdown-textarea>
+                <div *ngIf="formErrors.instance.hardwareInformation" class="form-error">{{ formErrors.instance.hardwareInformation }}</div>
+              </div>
 
-            <div *ngIf="formErrors.instance.hardwareInformation" class="form-error">{{ formErrors.instance.hardwareInformation }}</div>
+            </div>
           </div>
 
         </ng-container>
       </ng-template>
-    </ngb-tab>
+    </ng-container>
 
-    <ngb-tab i18n-title title="Basic configuration">
-      <ng-template ngbTabContent>
+    <ng-container ngbNavItem="basic-configuration">
+      <a ngbNavLink i18n>Basic configuration</a>
 
-        <div i18n class="inner-form-title">Theme & Default route</div>
+      <ng-template ngbNavContent>
 
-        <ng-container formGroupName="theme">
-          <div class="form-group">
-            <label i18n for="themeDefault">Global theme</label>
-
-            <div class="peertube-select-container">
-              <select formControlName="default" id="themeDefault">
-                <option i18n value="default">default</option>
-
-                <option *ngFor="let theme of availableThemes" [value]="theme">{{ theme }}</option>
-              </select>
+        <div class="form-row mt-5"> <!-- appearance grid -->
+          <div class="form-group col-12 col-lg-4 col-xl-3">
+            <div i18n class="inner-form-title">APPEARANCE</div>
+            <div i18n class="inner-for-description">
+              Use <a routerLink="/admin/plugins">plugins & themes</a> for more involved changes, or <a routerLink="/admin/config/edit-custom" fragment="customizations" (click)="gotoAnchor()">add slight customizations</a>.
             </div>
           </div>
-        </ng-container>
 
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-        <div class="form-group" formGroupName="instance">
-          <label i18n for="instanceDefaultClientRoute">Default client route</label>
-          <div class="peertube-select-container">
-            <select id="instanceDefaultClientRoute" formControlName="defaultClientRoute">
-              <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>
+            <ng-container formGroupName="theme">
+              <div class="form-group">
+                <label i18n for="themeDefault">Theme</label>
 
-        <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"
-            >
-              <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 class="peertube-select-container">
+                  <select formControlName="default" id="themeDefault" class="form-control">
+                    <option i18n value="default">default</option>
 
-                <div [ngClass]="{ 'disabled-checkbox-extra': !isSignupEnabled() }" class="mt-3">
-                  <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>
+                    <option *ngFor="let theme of availableThemes" [value]="theme">{{ theme }}</option>
+                  </select>
                 </div>
-              </ng-container>
-            </my-peertube-checkbox>
-          </div>
-        </ng-container>
-
-
-        <div i18n class="inner-form-title">Users</div>
+              </div>
+            </ng-container>
 
-        <ng-container formGroupName="user">
-          <div class="form-group">
-            <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">
-                  {{ videoQuotaOption.label }}
-                </option>
-              </select>
+            <div class="form-group" formGroupName="instance">
+              <label i18n for="instanceDefaultClientRoute">Landing page</label>
+              <div class="peertube-select-container">
+                <select id="instanceDefaultClientRoute" formControlName="defaultClientRoute" class="form-control">
+                  <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 *ngIf="formErrors.user.videoQuota" class="form-error">{{ formErrors.user.videoQuota }}</div>
-          </div>
 
-          <div class="form-group">
-            <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">
-                  {{ videoQuotaDailyOption.label }}
-                </option>
-              </select>
-            </div>
-            <div *ngIf="formErrors.user.videoQuotaDaily" class="form-error">{{ formErrors.user.videoQuotaDaily }}</div>
           </div>
-        </ng-container>
-
-
-        <div i18n class="inner-form-title">Import</div>
-
-        <ng-container formGroupName="import">
-          <ng-container formGroupName="videos">
-
-            <div class="form-group" formGroupName="http">
-              <my-peertube-checkbox
-                inputName="importVideosHttpEnabled" formControlName="enabled"
-                i18n-labelText labelText="Allow import with HTTP URL (i.e. YouTube)"
-              ></my-peertube-checkbox>
-            </div>
+        </div>
 
-            <div class="form-group" formGroupName="torrent">
-              <my-peertube-checkbox
-                inputName="importVideosTorrentEnabled" formControlName="enabled"
-                i18n-labelText labelText="Allow import with a torrent file or a magnet URI"
-              ></my-peertube-checkbox>
+        <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>
 
-          </ng-container>
-        </ng-container>
-
-
-        <div i18n class="inner-form-title">Auto-blacklist</div>
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-        <ng-container formGroupName="autoBlacklist">
-          <ng-container formGroupName="videos">
-            <ng-container formGroupName="ofUsers">
+            <ng-container formGroupName="broadcastMessage">
 
               <div class="form-group">
                 <my-peertube-checkbox
-                  inputName="autoBlacklistVideosOfUsersEnabled" formControlName="enabled"
-                  i18n-labelText labelText="Blacklist new videos automatically"
-                >
-                <ng-container ngProjectAs="description">
-                  <span i18n>Videos of regular users will stay private until a moderator reviews them. Can be overriden per user.</span>
-                </ng-container>
-              </my-peertube-checkbox>
+                  inputName="broadcastMessageEnabled" formControlName="enabled"
+                  i18n-labelText labelText="Enable broadcast message"
+                ></my-peertube-checkbox>
               </div>
 
-            </ng-container>
-          </ng-container>
-        </ng-container>
+              <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 i18n class="inner-form-title">Instance followers</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 formGroupName="followers">
-          <ng-container formGroupName="instance">
+            </ng-container>
 
-            <div class="form-group">
-              <my-peertube-checkbox
-                inputName="followersInstanceEnabled" formControlName="enabled"
-                i18n-labelText labelText="Other instances can follow your instance"
-              ></my-peertube-checkbox>
-            </div>
+          </div>
+        </div>
 
-            <div class="form-group">
-              <my-peertube-checkbox
-                inputName="followersInstanceManualApproval" formControlName="manualApproval"
-                i18n-labelText labelText="Manually approve new instance followers"
-              ></my-peertube-checkbox>
+        <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>
+            <div i18n class="inner-for-description">
+              Manage <a routerLink="/admin/users">users</a> to set their quota individually.
             </div>
-          </ng-container>
-        </ng-container>
-
-        <div i18n class="inner-form-title">Instance followings</div>
+          </div>
 
-        <ng-container formGroupName="followings">
-          <ng-container formGroupName="instance">
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-            <ng-container formGroupName="autoFollowBack">
+            <ng-container formGroupName="signup">
               <div class="form-group">
                 <my-peertube-checkbox
-                  inputName="followingsInstanceAutoFollowBackEnabled" formControlName="enabled"
-                  i18n-labelText labelText="Automatically follow other instances that follow you"
+                  inputName="signupEnabled" formControlName="enabled"
+                  i18n-labelText labelText="Enable Signup"
                 >
                   <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>
-
-            <ng-container formGroupName="autoFollowIndex">
-              <div class="form-group">
-                <my-peertube-checkbox
-                  inputName="followingsInstanceAutoFollowIndexEnabled" formControlName="enabled"
-                  i18n-labelText labelText="Automatically follow instances of the public index"
-                >
-                  <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>
+                    <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="text" id="followingsInstanceAutoFollowIndexUrl"
-                        formControlName="indexUrl" [ngClass]="{ 'input-error': formErrors['followings.instance.autoFollowIndex.indexUrl'] }"
+                        type="number" min="-1" id="signupLimit" class="form-control"
+                        formControlName="limit" [ngClass]="{ 'input-error': formErrors['signup.limit'] }"
                       >
-                      <div *ngIf="formErrors.followings.instance.autoFollowIndex.indexUrl" class="form-error">{{ formErrors.followings.instance.autoFollowIndex.indexUrl }}</div>
+                      <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>
+
+            <ng-container formGroupName="user">
+              <div class="form-group">
+                <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" [disabled]="videoQuotaOption.disabled">
+                      {{ videoQuotaOption.label }}
+                    </option>
+                  </select>
+                </div>
+                <div *ngIf="formErrors.user.videoQuota" class="form-error">{{ formErrors.user.videoQuota }}</div>
+              </div>
+
+              <div class="form-group">
+                <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" [disabled]="videoQuotaDailyOption.disabled">
+                      {{ videoQuotaDailyOption.label }}
+                    </option>
+                  </select>
+                </div>
+                <div *ngIf="formErrors.user.videoQuotaDaily" class="form-error">{{ formErrors.user.videoQuotaDaily }}</div>
+              </div>
+            </ng-container>
+
+          </div>
+        </div>
+
+        <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">VIDEOS</div>
+          </div>
+
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
+
+            <ng-container formGroupName="import">
+              <ng-container formGroupName="videos">
 
+                <div class="form-group" formGroupName="http">
+                  <my-peertube-checkbox
+                    inputName="importVideosHttpEnabled" formControlName="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="Allow import with a torrent file or a magnet URI"
+                  ></my-peertube-checkbox>
+                </div>
+
+              </ng-container>
             </ng-container>
-          </ng-container>
-        </ng-container>
 
+            <ng-container formGroupName="autoBlacklist">
+              <ng-container formGroupName="videos">
+                <ng-container formGroupName="ofUsers">
+
+                  <div class="form-group">
+                    <my-peertube-checkbox
+                      inputName="autoBlacklistVideosOfUsersEnabled" formControlName="enabled"
+                      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>
+                    </ng-container>
+                  </my-peertube-checkbox>
+                  </div>
 
-        <div i18n class="inner-form-title">Administrator</div>
+                </ng-container>
+              </ng-container>
+            </ng-container>
 
-        <div class="form-group" formGroupName="admin">
-          <label i18n for="adminEmail">Admin email</label>
-          <input
-            type="text" id="adminEmail"
-            formControlName="email" [ngClass]="{ 'input-error': formErrors['admin.email'] }"
-          >
-          <div *ngIf="formErrors.admin.email" class="form-error">{{ formErrors.admin.email }}</div>
+          </div>
         </div>
 
-        <div class="form-group" formGroupName="contactForm">
-          <my-peertube-checkbox
-            inputName="enableContactForm" formControlName="enabled"
-            i18n-labelText labelText="Enable contact form"
-          ></my-peertube-checkbox>
+        <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>
 
-      </ng-template>
-    </ngb-tab>
+        <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>
+            <div i18n class="inner-form-description">
+              Manage <a routerLink="/admin/follows">relations</a> with other instances.
+            </div>
+          </div>
+
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
+
+            <ng-container formGroupName="followers">
+              <ng-container formGroupName="instance">
 
-    <ngb-tab i18n-title title="Services">
-      <ng-template ngbTabContent>
-        <div i18n class="inner-form-title">Twitter</div>
+                <div class="form-group">
+                  <my-peertube-checkbox
+                    inputName="followersInstanceEnabled" formControlName="enabled"
+                    i18n-labelText labelText="Other instances can follow yours"
+                  ></my-peertube-checkbox>
+                </div>
+
+                <div class="form-group">
+                  <my-peertube-checkbox
+                    inputName="followersInstanceManualApproval" formControlName="manualApproval"
+                    i18n-labelText labelText="Manually approve new instance followers"
+                  ></my-peertube-checkbox>
+                </div>
+              </ng-container>
+            </ng-container>
+
+            <ng-container formGroupName="followings">
+              <ng-container formGroupName="instance">
+
+                <ng-container formGroupName="autoFollowBack">
+                  <div class="form-group">
+                    <my-peertube-checkbox
+                      inputName="followingsInstanceAutoFollowBackEnabled" formControlName="enabled"
+                      i18n-labelText labelText="Automatically follow back instances"
+                    >
+                      <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>
+
+                <ng-container formGroupName="autoFollowIndex">
+                  <div class="form-group">
+                    <my-peertube-checkbox
+                      inputName="followingsInstanceAutoFollowIndexEnabled" formControlName="enabled"
+                      i18n-labelText labelText="Automatically follow instances of a public index"
+                    >
+                      <ng-container ngProjectAs="description">
+                        <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">
+                        <div [ngClass]="{ 'disabled-checkbox-extra': !isAutoFollowIndexEnabled() }">
+                          <label i18n for="followingsInstanceAutoFollowIndexUrl">Index URL</label>
+                          <input
+                            type="text" id="followingsInstanceAutoFollowIndexUrl" class="form-control"
+                            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>
+              </ng-container>
+            </ng-container>
 
-        <ng-container formGroupName="services">
-          <ng-container formGroupName="twitter">
+          </div>
+        </div>
 
-            <div class="form-group">
-              <label i18n for="signupLimit">Your Twitter username</label>
+        <div class="form-row mt-4"> <!-- administrators grid -->
+          <div class="form-group col-12 col-lg-4 col-xl-3">
+            <div i18n class="inner-form-title">ADMINISTRATORS</div>
+          </div>
 
-              <my-help>
-                <ng-template ptTemplate="customHtml">
-                  <ng-container i18n>Indicates the Twitter account for the website or platform on which the content was published.</ng-container>
-                </ng-template>
-              </my-help>
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
+            <div class="form-group" formGroupName="admin">
+              <label i18n for="adminEmail">Admin email</label>
               <input
-                type="text" id="servicesTwitterUsername"
-                formControlName="username" [ngClass]="{ 'input-error': formErrors['services.twitter.username'] }"
+                type="text" id="adminEmail" class="form-control"
+                formControlName="email" [ngClass]="{ 'input-error': formErrors['admin.email'] }"
               >
-              <div *ngIf="formErrors.services.twitter.username" class="form-error">{{ formErrors.services.twitter.username }}</div>
+              <div *ngIf="formErrors.admin.email" class="form-error">{{ formErrors.admin.email }}</div>
             </div>
 
-            <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-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 />
-                    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.
-                  </ng-container>
-                </ng-template>
-              </my-peertube-checkbox>
+            <div class="form-group" formGroupName="contactForm">
+              <my-peertube-checkbox
+                inputName="enableContactForm" formControlName="enabled"
+                i18n-labelText labelText="Enable contact form"
+              ></my-peertube-checkbox>
             </div>
 
-          </ng-container>
-        </ng-container>
+          </div>
+        </div>
 
-    </ng-template>
-    </ngb-tab>
+      </ng-template>
+    </ng-container>
+
+    <ng-container ngbNavItem="services">
+      <a ngbNavLink i18n>Services</a>
+
+      <ng-template ngbNavContent>
+
+        <div class="form-row mt-5"> <!-- twitter grid -->
+          <div class="form-group col-12 col-lg-4 col-xl-3">
+            <div i18n class="inner-form-title">TWITTER</div>
+            <div i18n class="inner-form-description">
+              Optional. If any, provide the Twitter account representing your instance to improve link previews.
+            </div>
+          </div>
 
-    <ngb-tab i18n-title title="Advanced configuration">
-      <ng-template ngbTabContent>
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-        <div i18n class="inner-form-title">Transcoding</div>
+            <ng-container formGroupName="services">
+              <ng-container formGroupName="twitter">
 
-        <ng-container formGroupName="transcoding">
-          <div class="form-group">
-            <my-peertube-checkbox inputName="transcodingEnabled" formControlName="enabled">
-              <ng-template ptTemplate="label">
-                <ng-container i18n>Transcoding enabled</ng-container>
-              </ng-template>
+                <div class="form-group">
+                  <label i18n for="signupLimit">Your Twitter username</label>
+
+                  <input
+                    type="text" id="servicesTwitterUsername" class="form-control"
+                    formControlName="username" [ngClass]="{ 'input-error': formErrors['services.twitter.username'] }"
+                  >
+                  <div *ngIf="formErrors.services.twitter.username" class="form-error">{{ formErrors.services.twitter.username }}</div>
+                </div>
+
+                <div class="form-group">
+                  <my-peertube-checkbox inputName="servicesTwitterWhitelisted" formControlName="whitelisted">
+                    <ng-template ptTemplate="label">
+                      <ng-container i18n>Instance allowed by Twitter</ng-container>
+                    </ng-template>
+
+                    <ng-template ptTemplate="help">
+                      <ng-container i18n>
+                        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 allowed.
+                      </ng-container>
+                    </ng-template>
+                  </my-peertube-checkbox>
+                </div>
+
+              </ng-container>
+            </ng-container>
 
-              <ng-template ptTemplate="help">
-                <ng-container i18n>If you disable transcoding, many videos from your users will not work!</ng-container>
-              </ng-template>
-            </my-peertube-checkbox>
           </div>
+        </div>
+      </ng-template>
+    </ng-container>
 
-          <ng-container *ngIf="isTranscodingEnabled()">
+    <ng-container ngbNavItem="live">
+      <a ngbNavLink i18n>Live streaming</a>
 
-            <div class="form-group">
-              <my-peertube-checkbox
-                inputName="transcodingAllowAdditionalExtensions" formControlName="allowAdditionalExtensions"
-                i18n-labelText labelText="Allow additional extensions"
-              >
-                <ng-template ptTemplate="help">
-                  <ng-container i18n>Allow your users to upload .mkv, .mov, .avi and .flv videos</ng-container>
-                </ng-template>
-              </my-peertube-checkbox>
-            </div>
+      <ng-template ngbNavContent>
 
-            <div class="form-group">
-              <my-peertube-checkbox
-                inputName="transcodingAllowAudioFiles" formControlName="allowAudioFiles"
-                i18n-labelText labelText="Allow audio files upload"
-              >
-                <ng-template ptTemplate="help">
-                  <ng-container i18n>Allow your users to upload audio files that will be merged with the preview file on upload</ng-container>
-                </ng-template>
-              </my-peertube-checkbox>
+        <div class="form-row mt-5">
+          <div class="form-group col-12 col-lg-4 col-xl-3">
+            <div i18n class="inner-form-title">LIVE</div>
+            <div i18n class="inner-form-description">
+              Add ability for your users to do live streaming on your instance.
             </div>
+          </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>
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-                      <p>If you also enabled HLS support, it will multiply videos storage by 2</p>
+            <ng-container formGroupName="live">
 
-                      <br />
+              <div class="form-group">
+                <my-peertube-checkbox inputName="liveEnabled" formControlName="enabled">
+                  <ng-template ptTemplate="label">
+                    <ng-container i18n>Allow live streaming</ng-container>
+                  </ng-template>
 
-                      <strong>If disabled, breaks federation with PeerTube instances < 2.1</strong>
-                    </ng-container>
+                  <ng-template ptTemplate="help">
+                    <ng-container i18n>Enabling live streaming requires trust in your users and extra moderation work</ng-container>
                   </ng-template>
+
+                  <ng-container ngProjectAs="extra" formGroupName="transcoding">
+
+                    <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() }">
+                      <my-peertube-checkbox
+                        inputName="liveTranscodingEnabled" formControlName="enabled"
+                        i18n-labelText labelText="Enable live transcoding"
+                      >
+                        <ng-container ngProjectAs="description">
+                          Requires a lot of CPU!
+                        </ng-container>
+                      </my-peertube-checkbox>
+                    </div>
+
+                    <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() || !isLiveTranscodingEnabled() }">
+                      <label i18n for="liveTranscodingThreads">Live transcoding threads</label>
+                      <div class="peertube-select-container">
+                        <select id="liveTranscodingThreads" formControlName="threads" class="form-control">
+                          <option *ngFor="let transcodingThreadOption of transcodingThreadOptions" [value]="transcodingThreadOption.value">
+                            {{ transcodingThreadOption.label }}
+                          </option>
+                        </select>
+                      </div>
+                      <div *ngIf="formErrors.live.transcoding.threads" class="form-error">{{ formErrors.live.transcoding.threads }}</div>
+                    </div>
+
+                    <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() || !isLiveTranscodingEnabled() }">
+
+                      <label i18n for="liveTranscodingThreads">Live resolutions to generate</label>
+
+                      <div class="ml-2 mt-2 d-flex flex-column">
+                        <ng-container formGroupName="resolutions">
+                          <div class="form-group" *ngFor="let resolution of liveResolutions">
+                            <my-peertube-checkbox
+                              [inputName]="getResolutionKey(resolution.id)" [formControlName]="resolution.id"
+                              labelText="{{resolution.label}}"
+                            >
+                              <ng-template *ngIf="resolution.description" ptTemplate="help">
+                                <div [innerHTML]="resolution.description"></div>
+                              </ng-template>
+                            </my-peertube-checkbox>
+                          </div>
+                        </ng-container>
+                      </div>
+                    </div>
+                  </ng-container>
                 </my-peertube-checkbox>
               </div>
             </ng-container>
+          </div>
+        </div>
+
+      </ng-template>
+    </ng-container>
+
+    <ng-container ngbNavItem="advanced-configuration">
+      <a ngbNavLink i18n>Advanced configuration</a>
+
+      <ng-template ngbNavContent>
+
+        <div class="form-row mt-5"> <!-- transcoding grid -->
+          <div class="form-group col-12 col-lg-4 col-xl-3">
+            <div i18n class="inner-form-title">TRANSCODING</div>
+            <div i18n class="inner-form-description">
+              Process uploaded videos so that they are in a streamable form that any device can play. Though costly in
+              resources, this is a critical part of PeerTube, so tread carefully.
+            </div>
+          </div>
+
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
+
+            <ng-container formGroupName="transcoding">
+
+              <div class="form-group">
+                <my-peertube-checkbox inputName="transcodingEnabled" formControlName="enabled">
+                  <ng-template ptTemplate="label">
+                    <ng-container i18n>Transcoding enabled</ng-container>
+                  </ng-template>
 
-            <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>
+                    <ng-container i18n>If you disable transcoding, many videos from your users will not work!</ng-container>
+                  </ng-template>
+
+                  <ng-container ngProjectAs="extra">
 
-                      <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>
+                    <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
+                      <my-peertube-checkbox
+                        inputName="transcodingAllowAdditionalExtensions" formControlName="allowAdditionalExtensions"
+                        i18n-labelText labelText="Allow additional extensions"
+                      >
+                        <ng-container ngProjectAs="description">
+                          <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>
+
+                    <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
+                      <my-peertube-checkbox
+                        inputName="transcodingAllowAudioFiles" formControlName="allowAudioFiles"
+                        i18n-labelText labelText="Allow audio files upload"
+                      >
+                        <ng-container ngProjectAs="description">
+                          <span i18n>Allows users to upload audio files that will be merged with the preview file on upload.</span>
+                        </ng-container>
+                      </my-peertube-checkbox>
+                    </div>
 
-                      <p>If you also enabled WebTorrent support, it will multiply videos storage by 2</p>
+                    <ng-container formGroupName="webtorrent">
+                      <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
+                        <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-template>
+
+                    <ng-container formGroupName="hls">
+                      <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
+                        <my-peertube-checkbox
+                          inputName="transcodingHlsEnabled" formControlName="enabled"
+                          i18n-labelText labelText="HLS with P2P 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>
+
+                  </ng-container>
                 </my-peertube-checkbox>
               </div>
-            </ng-container>
 
-            <div class="form-group">
-              <label i18n for="transcodingThreads">Transcoding threads</label>
-              <div class="peertube-select-container">
-                <select id="transcodingThreads" formControlName="threads">
-                  <option *ngFor="let transcodingThreadOption of transcodingThreadOptions" [value]="transcodingThreadOption.value">
-                    {{ transcodingThreadOption.label }}
-                  </option>
-                </select>
+              <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 *ngIf="formErrors.transcoding.threads" class="form-error">{{ formErrors.transcoding.threads }}</div>
-            </div>
 
-            <ng-container formGroupName="resolutions">
-              <div class="form-group" *ngFor="let resolution of resolutions">
-                <my-peertube-checkbox
-                  [inputName]="getResolutionKey(resolution.id)" [formControlName]="resolution.id"
-                  i18n-labelText labelText="Resolution {{resolution.label}} enabled"
-                >
-                  <ng-template *ngIf="resolution.description" ptTemplate="help">
-                    <div [innerHTML]="resolution.description"></div>
-                  </ng-template>
-                </my-peertube-checkbox>
-              </div>
-            </ng-container>
+              <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
 
-          </ng-container>
-        </ng-container>
+                <label i18n>Resolutions to generate</label>
 
-        <div class="inner-form-title">
-          <ng-container i18n>Cache</ng-container>
+                <div class="ml-2 mt-2 d-flex flex-column">
+                  <ng-container formGroupName="resolutions">
+                    <div class="form-group" *ngFor="let resolution of resolutions">
+                      <my-peertube-checkbox
+                        [inputName]="getResolutionKey(resolution.id)" [formControlName]="resolution.id"
+                        labelText="{{resolution.label}}"
+                      >
+                        <ng-template *ngIf="resolution.description" ptTemplate="help">
+                          <div [innerHTML]="resolution.description"></div>
+                        </ng-template>
+                      </my-peertube-checkbox>
+                    </div>
+                  </ng-container>
+                </div>
 
-          <my-help>
-            <ng-template ptTemplate="customHtml">
-              <ng-container i18n>Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them.</ng-container>
-            </ng-template>
-          </my-help>
-        </div>
+              </div>
+
+            </ng-container>
 
-        <ng-container formGroupName="cache">
-          <div class="form-group" formGroupName="previews">
-            <label i18n for="cachePreviewsSize">Previews cache size</label>
-            <input
-              type="text" id="cachePreviewsSize"
-              formControlName="size" [ngClass]="{ 'input-error': formErrors['cache.previews.size'] }"
-            >
-            <div *ngIf="formErrors.cache.previews.size" class="form-error">{{ formErrors.cache.previews.size }}</div>
           </div>
+        </div>
 
-          <div class="form-group" formGroupName="captions">
-            <label i18n for="cacheCaptionsSize">Video captions cache size</label>
-            <input
-              type="text" id="cacheCaptionsSize"
-              formControlName="size" [ngClass]="{ 'input-error': formErrors['cache.captions.size'] }"
-            >
-            <div *ngIf="formErrors.cache.captions.size" class="form-error">{{ formErrors.cache.captions.size }}</div>
+        <div class="form-row mt-4"> <!-- cache grid -->
+          <div class="form-group col-12 col-lg-4 col-xl-3">
+            <div i18n class="inner-form-title">CACHE</div>
+            <div i18n class="inner-form-description">
+              Some files are not federated, and fetched when necessary. Define their caching policies.
+            </div>
           </div>
-        </ng-container>
 
-        <div i18n class="inner-form-title">Customizations</div>
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
 
-        <ng-container formGroupName="instance">
-          <ng-container formGroupName="customizations">
-            <div class="form-group">
-              <label i18n for="customizationJavascript">JavaScript</label>
-              <my-help>
-                <ng-template ptTemplate="customHtml">
-                  <ng-container i18n>
-                    Write JavaScript code directly.<br />Example: <pre>console.log('my instance is amazing');</pre>
-                  </ng-container>
-                </ng-template>
-              </my-help>
+            <ng-container formGroupName="cache">
+              <div class="form-group" formGroupName="previews">
+                <label i18n for="cachePreviewsSize">Number of previews to keep in cache</label>
+                <input
+                  type="number" min="0" id="cachePreviewsSize" class="form-control"
+                  formControlName="size" [ngClass]="{ 'input-error': formErrors['cache.previews.size'] }"
+                >
+                <div *ngIf="formErrors.cache.previews.size" class="form-error">{{ formErrors.cache.previews.size }}</div>
+              </div>
 
-              <textarea
-                id="customizationJavascript" formControlName="javascript"
-                [ngClass]="{ 'input-error': formErrors['instance.customizations.javascript'] }"
-              ></textarea>
+              <div class="form-group" formGroupName="captions">
+                <label i18n for="cacheCaptionsSize">Number of video captions to keep in cache</label>
+                <input
+                  type="number" min="0" id="cacheCaptionsSize" class="form-control"
+                  formControlName="size" [ngClass]="{ 'input-error': formErrors['cache.captions.size'] }"
+                >
+                <div *ngIf="formErrors.cache.captions.size" class="form-error">{{ formErrors.cache.captions.size }}</div>
+              </div>
+            </ng-container>
 
-              <div *ngIf="formErrors.instance.customizations.javascript" class="form-error">{{ formErrors.instance.customizations.javascript }}</div>
-            </div>
+          </div>
+        </div>
 
-            <div class="form-group">
-              <label for="customizationCSS">CSS</label>
-
-              <my-help>
-                <ng-template ptTemplate="customHtml">
-                  <ng-container i18n>
-                    Write CSS code directly. Example:<br /><br />
-<pre>
-#custom-css {{ '{' }}
-  color: red;
-{{ '}' }}
-</pre>
-
-                    Prepend with <em>#custom-css</em> to override styles. Example:<br /><br />
-<pre>
-#custom-css .logged-in-email {{ '{' }}
-  color: red;
-{{ '}' }}
-</pre>
-                  </ng-container>
-                </ng-template>
-              </my-help>
-
-              <textarea
-                id="customizationCSS" formControlName="css"
-                [ngClass]="{ 'input-error': formErrors['instance.customizations.css'] }"
-              ></textarea>
-              <div *ngIf="formErrors.instance.customizations.css" class="form-error">{{ formErrors.instance.customizations.css }}</div>
+        <div class="form-row mt-4"> <!-- cache grid -->
+          <div class="form-group col-12 col-lg-4 col-xl-3">
+            <div class="anchor" id="customizations"></div> <!-- customizations anchor -->
+            <div i18n class="inner-form-title">CUSTOMIZATIONS</div>
+            <div i18n class="inner-form-description">
+              Slight modifications to your PeerTube instance for when creating a plugin or theme is overkill.
             </div>
-          </ng-container>
-        </ng-container>
+          </div>
+
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
+
+            <ng-container formGroupName="instance">
+              <ng-container formGroupName="customizations">
+                <div class="form-group">
+                  <label i18n for="customizationJavascript">JavaScript</label>
+                  <my-help>
+                    <ng-template ptTemplate="customHtml">
+                      <ng-container i18n>
+                        Write JavaScript code directly.<br />Example: <pre>console.log('my instance is amazing');</pre>
+                      </ng-container>
+                    </ng-template>
+                  </my-help>
+
+                  <textarea
+                    id="customizationJavascript" formControlName="javascript" class="form-control"
+                    [ngClass]="{ 'input-error': formErrors['instance.customizations.javascript'] }"
+                  ></textarea>
+
+                  <div *ngIf="formErrors.instance.customizations.javascript" class="form-error">{{ formErrors.instance.customizations.javascript }}</div>
+                </div>
+
+                <div class="form-group">
+                  <label for="customizationCSS">CSS</label>
+
+                  <my-help>
+                    <ng-template ptTemplate="customHtml">
+                      <ng-container i18n>
+                        Write CSS code directly. Example:<br /><br />
+    <pre>
+    #custom-css {{ '{' }}
+      color: red;
+    {{ '}' }}
+    </pre>
+                        Prepend with <em>#custom-css</em> to override styles. Example:<br /><br />
+    <pre>
+    #custom-css .logged-in-email {{ '{' }}
+      color: red;
+    {{ '}' }}
+    </pre>
+                      </ng-container>
+                    </ng-template>
+                  </my-help>
+
+                  <textarea
+                    id="customizationCSS" formControlName="css" class="form-control"
+                    [ngClass]="{ 'input-error': formErrors['instance.customizations.css'] }"
+                  ></textarea>
+                  <div *ngIf="formErrors.instance.customizations.css" class="form-error">{{ formErrors.instance.customizations.css }}</div>
+                </div>
+              </ng-container>
+            </ng-container>
+
+          </div>
+        </div>
 
       </ng-template>
-    </ngb-tab>
-  </ngb-tabset>
+    </ng-container>
+  </div>
+
+  <div [ngbNavOutlet]="nav"></div>
+
+  <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>
+      <input (click)="formValidated()" type="submit" i18n-value value="Update configuration" [disabled]="!form.valid">
+    </div>
+  </div>
 </form>