aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-01-08 11:30:48 +0100
committerChocobozzz <me@florianbigard.com>2018-01-08 11:30:58 +0100
commit108af66140713c4beec681a71d360ab788226528 (patch)
treecbc59800ee72a158ac5adfe6984470175a02d66c
parent2cfe649635088de8582b3808b320dab598cb95c9 (diff)
downloadPeerTube-108af66140713c4beec681a71d360ab788226528.tar.gz
PeerTube-108af66140713c4beec681a71d360ab788226528.tar.zst
PeerTube-108af66140713c4beec681a71d360ab788226528.zip
Fix overflow in select inputs
-rw-r--r--client/src/app/videos/+video-edit/video-add.component.html6
-rw-r--r--client/src/app/videos/+video-edit/video-add.component.ts4
-rw-r--r--client/src/sass/include/_mixins.scss3
-rw-r--r--server/controllers/activitypub/client.ts2
4 files changed, 10 insertions, 5 deletions
diff --git a/client/src/app/videos/+video-edit/video-add.component.html b/client/src/app/videos/+video-edit/video-add.component.html
index 20277423c..193cc55ee 100644
--- a/client/src/app/videos/+video-edit/video-add.component.html
+++ b/client/src/app/videos/+video-edit/video-add.component.html
@@ -11,7 +11,7 @@
11 11
12 <div class="button-file"> 12 <div class="button-file">
13 <span>Select the file to upload</span> 13 <span>Select the file to upload</span>
14 <input #videofileInput type="file" name="videofile" id="videofile" (change)="fileChange()" /> 14 <input #videofileInput type="file" name="videofile" id="videofile" [accept]="videoExtensions" (change)="fileChange()" />
15 </div> 15 </div>
16 16
17 <div class="form-group form-group-channel"> 17 <div class="form-group form-group-channel">
@@ -42,8 +42,8 @@
42 <!-- Hidden because we need to load the component --> 42 <!-- Hidden because we need to load the component -->
43 <form [hidden]="!isUploadingVideo" novalidate [formGroup]="form"> 43 <form [hidden]="!isUploadingVideo" novalidate [formGroup]="form">
44 <my-video-edit 44 <my-video-edit
45 [form]="form" [formErrors]="formErrors" 45 [form]="form" [formErrors]="formErrors"
46 [validationMessages]="validationMessages" [videoPrivacies]="videoPrivacies" [userVideoChannels]="userVideoChannels" 46 [validationMessages]="validationMessages" [videoPrivacies]="videoPrivacies" [userVideoChannels]="userVideoChannels"
47 ></my-video-edit> 47 ></my-video-edit>
48 48
49 49
diff --git a/client/src/app/videos/+video-edit/video-add.component.ts b/client/src/app/videos/+video-edit/video-add.component.ts
index 843475647..066f945fc 100644
--- a/client/src/app/videos/+video-edit/video-add.component.ts
+++ b/client/src/app/videos/+video-edit/video-add.component.ts
@@ -52,6 +52,10 @@ export class VideoAddComponent extends FormReactive implements OnInit {
52 super() 52 super()
53 } 53 }
54 54
55 get videoExtensions () {
56 return this.serverService.getConfig().video.file.extensions.join(',')
57 }
58
55 buildForm () { 59 buildForm () {
56 this.form = this.formBuilder.group({}) 60 this.form = this.formBuilder.group({})
57 this.form.valueChanges.subscribe(data => this.onValueChanged(data)) 61 this.form.valueChanges.subscribe(data => this.onValueChanged(data))
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 7bfc93f08..1237e675d 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -146,7 +146,7 @@
146 } 146 }
147 147
148 select { 148 select {
149 padding: 0 12px; 149 padding: 0 35px 0 12px;
150 width: calc(100% + 2px); 150 width: calc(100% + 2px);
151 position: relative; 151 position: relative;
152 left: 1px; 152 left: 1px;
@@ -156,6 +156,7 @@
156 appearance: none; 156 appearance: none;
157 cursor: pointer; 157 cursor: pointer;
158 height: $button-height; 158 height: $button-height;
159 text-overflow: ellipsis;
159 160
160 &:focus { 161 &:focus {
161 outline: none; 162 outline: none;
diff --git a/server/controllers/activitypub/client.ts b/server/controllers/activitypub/client.ts
index 717473912..d1a761724 100644
--- a/server/controllers/activitypub/client.ts
+++ b/server/controllers/activitypub/client.ts
@@ -16,7 +16,7 @@ import { VideoShareModel } from '../../models/video/video-share'
16 16
17const activityPubClientRouter = express.Router() 17const activityPubClientRouter = express.Router()
18 18
19activityPubClientRouter.get('/accounts/:name', 19activityPubClientRouter.get('/accounts?/:name',
20 executeIfActivityPub(asyncMiddleware(localAccountValidator)), 20 executeIfActivityPub(asyncMiddleware(localAccountValidator)),
21 executeIfActivityPub(accountController) 21 executeIfActivityPub(accountController)
22) 22)