aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+admin
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/+admin')
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html16
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss4
2 files changed, 12 insertions, 8 deletions
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 e2f3a196e..bba7365f6 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
@@ -756,7 +756,7 @@
756 </ng-container> 756 </ng-container>
757 </my-peertube-checkbox> 757 </my-peertube-checkbox>
758 </div> 758 </div>
759 759
760 <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }"> 760 <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
761 <my-peertube-checkbox 761 <my-peertube-checkbox
762 inputName="transcodingAllowAudioFiles" formControlName="allowAudioFiles" 762 inputName="transcodingAllowAudioFiles" formControlName="allowAudioFiles"
@@ -782,16 +782,16 @@
782 <ng-template ptTemplate="help"> 782 <ng-template ptTemplate="help">
783 <ng-container i18n> 783 <ng-container i18n>
784 <p>If you also enabled HLS support, it will multiply videos storage by 2</p> 784 <p>If you also enabled HLS support, it will multiply videos storage by 2</p>
785 785
786 <br /> 786 <br />
787 787
788 <strong>If disabled, breaks federation with PeerTube instances < 2.1</strong> 788 <strong>If disabled, breaks federation with PeerTube instances < 2.1</strong>
789 </ng-container> 789 </ng-container>
790 </ng-template> 790 </ng-template>
791 </my-peertube-checkbox> 791 </my-peertube-checkbox>
792 </div> 792 </div>
793 </ng-container> 793 </ng-container>
794 794
795 <ng-container formGroupName="hls"> 795 <ng-container formGroupName="hls">
796 <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }"> 796 <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
797 <my-peertube-checkbox 797 <my-peertube-checkbox
@@ -802,14 +802,14 @@
802 <ng-template ptTemplate="help"> 802 <ng-template ptTemplate="help">
803 <ng-container i18n> 803 <ng-container i18n>
804 <strong>Requires ffmpeg >= 4.1</strong> 804 <strong>Requires ffmpeg >= 4.1</strong>
805 805
806 <p>Generate HLS playlists and fragmented MP4 files resulting in a better playback than with plain WebTorrent:</p> 806 <p>Generate HLS playlists and fragmented MP4 files resulting in a better playback than with plain WebTorrent:</p>
807 <ul> 807 <ul>
808 <li>Resolution change is smoother</li> 808 <li>Resolution change is smoother</li>
809 <li>Faster playback especially with long videos</li> 809 <li>Faster playback especially with long videos</li>
810 <li>More stable playback (less bugs/infinite loading)</li> 810 <li>More stable playback (less bugs/infinite loading)</li>
811 </ul> 811 </ul>
812 812
813 <p>If you also enabled WebTorrent support, it will multiply videos storage by 2</p> 813 <p>If you also enabled WebTorrent support, it will multiply videos storage by 2</p>
814 </ng-container> 814 </ng-container>
815 </ng-template> 815 </ng-template>
@@ -819,7 +819,7 @@
819 819
820 <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }"> 820 <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
821 <label i18n>Resolutions to generate per enabled format</label> 821 <label i18n>Resolutions to generate per enabled format</label>
822 822
823 <div class="ml-2 mt-2 d-flex flex-column"> 823 <div class="ml-2 mt-2 d-flex flex-column">
824 <ng-container formGroupName="resolutions"> 824 <ng-container formGroupName="resolutions">
825 <div class="form-group" *ngFor="let resolution of resolutions"> 825 <div class="form-group" *ngFor="let resolution of resolutions">
@@ -924,7 +924,7 @@
924 924
925 <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() }"> 925 <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() }">
926 <label i18n for="liveMaxDuration">Max live duration</label> 926 <label i18n for="liveMaxDuration">Max live duration</label>
927 <div class="peertube-select-container"> 927 <div>
928 <ng-select 928 <ng-select
929 labelForId="liveMaxDuration" [items]="liveMaxDurationOptions" formControlName="maxDuration" 929 labelForId="liveMaxDuration" [items]="liveMaxDurationOptions" formControlName="maxDuration"
930 bindLabel="label" bindValue="value" 930 bindLabel="label" bindValue="value"
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
index 6743879e7..3d570f571 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
@@ -41,6 +41,10 @@ input[type=checkbox] {
41 @include peertube-select-container($form-base-input-width); 41 @include peertube-select-container($form-base-input-width);
42} 42}
43 43
44ng-select {
45 @include ng-select($form-base-input-width);
46}
47
44my-select-checkbox { 48my-select-checkbox {
45 @include ng-select($form-base-input-width); 49 @include ng-select($form-base-input-width);
46} 50}