interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix ng select in admin

This commit is contained in:
Chocobozzz 2020-12-15 08:57:49 +01:00
parent 728a1236ae
commit d1742ede65
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
View File

@ -756,7 +756,7 @@
</ng-container> </ng-container>
</my-peertube-checkbox> </my-peertube-checkbox>
</div> </div>
<div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }"> <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
<my-peertube-checkbox <my-peertube-checkbox
inputName="transcodingAllowAudioFiles" formControlName="allowAudioFiles" inputName="transcodingAllowAudioFiles" formControlName="allowAudioFiles"
@ -782,16 +782,16 @@
<ng-template ptTemplate="help"> <ng-template ptTemplate="help">
<ng-container i18n> <ng-container i18n>
<p>If you also enabled HLS support, it will multiply videos storage by 2</p> <p>If you also enabled HLS support, it will multiply videos storage by 2</p>
<br /> <br />
<strong>If disabled, breaks federation with PeerTube instances < 2.1</strong> <strong>If disabled, breaks federation with PeerTube instances < 2.1</strong>
</ng-container> </ng-container>
</ng-template> </ng-template>
</my-peertube-checkbox> </my-peertube-checkbox>
</div> </div>
</ng-container> </ng-container>
<ng-container formGroupName="hls"> <ng-container formGroupName="hls">
<div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }"> <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
<my-peertube-checkbox <my-peertube-checkbox
@ -802,14 +802,14 @@
<ng-template ptTemplate="help"> <ng-template ptTemplate="help">
<ng-container i18n> <ng-container i18n>
<strong>Requires ffmpeg >= 4.1</strong> <strong>Requires ffmpeg >= 4.1</strong>
<p>Generate HLS playlists and fragmented MP4 files resulting in a better playback than with plain WebTorrent:</p> <p>Generate HLS playlists and fragmented MP4 files resulting in a better playback than with plain WebTorrent:</p>
<ul> <ul>
<li>Resolution change is smoother</li> <li>Resolution change is smoother</li>
<li>Faster playback especially with long videos</li> <li>Faster playback especially with long videos</li>
<li>More stable playback (less bugs/infinite loading)</li> <li>More stable playback (less bugs/infinite loading)</li>
</ul> </ul>
<p>If you also enabled WebTorrent support, it will multiply videos storage by 2</p> <p>If you also enabled WebTorrent support, it will multiply videos storage by 2</p>
</ng-container> </ng-container>
</ng-template> </ng-template>
@ -819,7 +819,7 @@
<div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }"> <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
<label i18n>Resolutions to generate per enabled format</label> <label i18n>Resolutions to generate per enabled format</label>
<div class="ml-2 mt-2 d-flex flex-column"> <div class="ml-2 mt-2 d-flex flex-column">
<ng-container formGroupName="resolutions"> <ng-container formGroupName="resolutions">
<div class="form-group" *ngFor="let resolution of resolutions"> <div class="form-group" *ngFor="let resolution of resolutions">
@ -924,7 +924,7 @@
<div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() }"> <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() }">
<label i18n for="liveMaxDuration">Max live duration</label> <label i18n for="liveMaxDuration">Max live duration</label>
<div class="peertube-select-container"> <div>
<ng-select <ng-select
labelForId="liveMaxDuration" [items]="liveMaxDurationOptions" formControlName="maxDuration" labelForId="liveMaxDuration" [items]="liveMaxDurationOptions" formControlName="maxDuration"
bindLabel="label" bindValue="value" bindLabel="label" bindValue="value"

4
client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
View File

@ -41,6 +41,10 @@ input[type=checkbox] {
@include peertube-select-container($form-base-input-width); @include peertube-select-container($form-base-input-width);
} }
ng-select {
@include ng-select($form-base-input-width);
}
my-select-checkbox { my-select-checkbox {
@include ng-select($form-base-input-width); @include ng-select($form-base-input-width);
} }