aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html69
-rw-r--r--client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html20
2 files changed, 52 insertions, 37 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 dfbbfbb29..fd4d3d9c9 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
@@ -87,15 +87,19 @@
87 87
88 <div i18n class="inner-form-title">Signup</div> 88 <div i18n class="inner-form-title">Signup</div>
89 89
90 <my-peertube-checkbox 90 <div class="form-group">
91 inputName="signupEnabled" formControlName="signupEnabled" 91 <my-peertube-checkbox
92 i18n-labelText labelText="Signup enabled" 92 inputName="signupEnabled" formControlName="signupEnabled"
93 ></my-peertube-checkbox> 93 i18n-labelText labelText="Signup enabled"
94 ></my-peertube-checkbox>
95 </div>
94 96
95 <my-peertube-checkbox *ngIf="isSignupEnabled()" 97 <div class="form-group">
96 inputName="signupRequiresEmailVerification" formControlName="signupRequiresEmailVerification" 98 <my-peertube-checkbox *ngIf="isSignupEnabled()"
97 i18n-labelText labelText="Signup requires email verification" 99 inputName="signupRequiresEmailVerification" formControlName="signupRequiresEmailVerification"
98 ></my-peertube-checkbox> 100 i18n-labelText labelText="Signup requires email verification"
101 ></my-peertube-checkbox>
102 </div>
99 103
100 <div *ngIf="isSignupEnabled()" class="form-group"> 104 <div *ngIf="isSignupEnabled()" class="form-group">
101 <label i18n for="signupLimit">Signup limit</label> 105 <label i18n for="signupLimit">Signup limit</label>
@@ -110,15 +114,19 @@
110 114
111 <div i18n class="inner-form-title">Import</div> 115 <div i18n class="inner-form-title">Import</div>
112 116
113 <my-peertube-checkbox 117 <div class="form-group">
114 inputName="importVideosHttpEnabled" formControlName="importVideosHttpEnabled" 118 <my-peertube-checkbox
115 i18n-labelText labelText="Video import with HTTP URL (i.e. YouTube) enabled" 119 inputName="importVideosHttpEnabled" formControlName="importVideosHttpEnabled"
116 ></my-peertube-checkbox> 120 i18n-labelText labelText="Video import with HTTP URL (i.e. YouTube) enabled"
121 ></my-peertube-checkbox>
122 </div>
117 123
118 <my-peertube-checkbox 124 <div class="form-group">
119 inputName="importVideosTorrentEnabled" formControlName="importVideosTorrentEnabled" 125 <my-peertube-checkbox
120 i18n-labelText labelText="Video import with a torrent file or a magnet URI enabled" 126 inputName="importVideosTorrentEnabled" formControlName="importVideosTorrentEnabled"
121 ></my-peertube-checkbox> 127 i18n-labelText labelText="Video import with a torrent file or a magnet URI enabled"
128 ></my-peertube-checkbox>
129 </div>
122 130
123 <div i18n class="inner-form-title">Administrator</div> 131 <div i18n class="inner-form-title">Administrator</div>
124 132
@@ -184,13 +192,15 @@
184 </div> 192 </div>
185 </div> 193 </div>
186 194
187 <my-peertube-checkbox 195 <div class="form-group">
188 inputName="servicesTwitterWhitelisted" formControlName="servicesTwitterWhitelisted" 196 <my-peertube-checkbox
189 i18n-labelText labelText="Instance whitelisted by Twitter" 197 inputName="servicesTwitterWhitelisted" formControlName="servicesTwitterWhitelisted"
190 i18n-helpHtml helpHtml="If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br /> 198 i18n-labelText labelText="Instance whitelisted by Twitter"
191 If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<br /><br /> 199 i18n-helpHtml helpHtml="If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br />
192 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." 200 If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<br /><br />
193 ></my-peertube-checkbox> 201 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."
202 ></my-peertube-checkbox>
203 </div>
194 </ng-template> 204 </ng-template>
195 </ngb-tab> 205 </ngb-tab>
196 206
@@ -199,11 +209,13 @@
199 209
200 <div i18n class="inner-form-title">Transcoding</div> 210 <div i18n class="inner-form-title">Transcoding</div>
201 211
202 <my-peertube-checkbox 212 <div class="form-group">
203 inputName="transcodingEnabled" formControlName="transcodingEnabled" 213 <my-peertube-checkbox
204 i18n-labelText labelText="Transcoding enabled" 214 inputName="transcodingEnabled" formControlName="transcodingEnabled"
205 i18n-helpHtml helpHtml="If you disable transcoding, many videos from your users will not work!" 215 i18n-labelText labelText="Transcoding enabled"
206 ></my-peertube-checkbox> 216 i18n-helpHtml helpHtml="If you disable transcoding, many videos from your users will not work!"
217 ></my-peertube-checkbox>
218 </div>
207 219
208 <ng-template [ngIf]="isTranscodingEnabled()"> 220 <ng-template [ngIf]="isTranscodingEnabled()">
209 221
@@ -226,7 +238,6 @@
226 [inputName]="getResolutionKey(resolution)" [formControlName]="getResolutionKey(resolution)" 238 [inputName]="getResolutionKey(resolution)" [formControlName]="getResolutionKey(resolution)"
227 i18n-labelText labelText="Resolution {{resolution}} enabled" 239 i18n-labelText labelText="Resolution {{resolution}} enabled"
228 ></my-peertube-checkbox> 240 ></my-peertube-checkbox>
229
230 </div> 241 </div>
231 </ng-template> 242 </ng-template>
232 243
diff --git a/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html b/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html
index 8be8a66cc..049119fa8 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html
+++ b/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html
@@ -15,15 +15,19 @@
15 </div> 15 </div>
16 </div> 16 </div>
17 17
18 <my-peertube-checkbox 18 <div class="form-group">
19 inputName="webTorrentEnabled" formControlName="webTorrentEnabled" 19 <my-peertube-checkbox
20 i18n-labelText labelText="Use WebTorrent to exchange parts of the video with others" 20 inputName="webTorrentEnabled" formControlName="webTorrentEnabled"
21 ></my-peertube-checkbox> 21 i18n-labelText labelText="Use WebTorrent to exchange parts of the video with others"
22 ></my-peertube-checkbox>
23 </div>
22 24
23 <my-peertube-checkbox 25 <div class="form-group">
24 inputName="autoPlayVideo" formControlName="autoPlayVideo" 26 <my-peertube-checkbox
25 i18n-labelText labelText="Automatically plays video" 27 inputName="autoPlayVideo" formControlName="autoPlayVideo"
26 ></my-peertube-checkbox> 28 i18n-labelText labelText="Automatically plays video"
29 ></my-peertube-checkbox>
30 </div>
27 31
28 <input type="submit" i18n-value value="Save" [disabled]="!form.valid"> 32 <input type="submit" i18n-value value="Save" [disabled]="!form.valid">
29</form> 33</form>