aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2017-12-20 15:36:29 +0100
committerChocobozzz <me@florianbigard.com>2017-12-20 15:37:03 +0100
commitcb9244de975909bac2922c4412fd948646ff3ba7 (patch)
treea5bf6735e4ee986f58f7a63349b944b7f6b09156
parenta0d69908239718ca3bd03097fbd9eb7e2a13ff75 (diff)
downloadPeerTube-cb9244de975909bac2922c4412fd948646ff3ba7.tar.gz
PeerTube-cb9244de975909bac2922c4412fd948646ff3ba7.tar.zst
PeerTube-cb9244de975909bac2922c4412fd948646ff3ba7.zip
Improve video tag in edit form
-rw-r--r--client/src/app/videos/+video-edit/shared/video-edit.component.html2
-rw-r--r--client/src/app/videos/+video-edit/shared/video-edit.component.scss14
-rw-r--r--server/lib/activitypub/process/process-announce.ts2
3 files changed, 16 insertions, 2 deletions
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.html b/client/src/app/videos/+video-edit/shared/video-edit.component.html
index 4f92b4908..9acbafcb6 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.html
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.html
@@ -10,7 +10,7 @@
10 </div> 10 </div>
11 11
12 <div class="form-group"> 12 <div class="form-group">
13 <label class="label-tags">Tags</label> <span class="little-information">(press enter to add the tag)</span> 13 <label class="label-tags">Tags</label> <span>(press Enter to add)</span>
14 <tag-input 14 <tag-input
15 [ngModel]="tags" [validators]="tagValidators" [errorMessages]="tagValidatorsMessages" 15 [ngModel]="tags" [validators]="tagValidators" [errorMessages]="tagValidatorsMessages"
16 formControlName="tags" maxItems="5" modelAsStrings="true" 16 formControlName="tags" maxItems="5" modelAsStrings="true"
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.scss b/client/src/app/videos/+video-edit/shared/video-edit.component.scss
index 4f8f031cf..81e3a0d19 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.scss
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.scss
@@ -43,6 +43,10 @@
43 margin-right: 10px; 43 margin-right: 10px;
44 } 44 }
45 } 45 }
46
47 .label-tags + span {
48 font-size: 15px;
49 }
46} 50}
47 51
48.submit-container { 52.submit-container {
@@ -95,6 +99,14 @@
95 border: 1px solid #C6C6C6; 99 border: 1px solid #C6C6C6;
96 border-radius: 3px; 100 border-radius: 3px;
97 padding: 5px !important; 101 padding: 5px !important;
102 height: 40px;
103 }
104
105 tag-input-form {
106 input {
107 height: 30px !important;
108 background-color: #fff !important;
109 }
98 } 110 }
99 111
100 tag { 112 tag {
@@ -120,6 +132,8 @@
120 padding-left: 6px !important; 132 padding-left: 6px !important;
121 133
122 svg { 134 svg {
135 position: relative;
136 top: -1px;
123 height: auto !important; 137 height: auto !important;
124 vertical-align: middle !important; 138 vertical-align: middle !important;
125 fill: #585858 !important; 139 fill: #585858 !important;
diff --git a/server/lib/activitypub/process/process-announce.ts b/server/lib/activitypub/process/process-announce.ts
index c9738f926..55f8a62d2 100644
--- a/server/lib/activitypub/process/process-announce.ts
+++ b/server/lib/activitypub/process/process-announce.ts
@@ -1,4 +1,4 @@
1import { ActivityAnnounce, ActivityCreate } from '../../../../shared/models/activitypub' 1import { ActivityAnnounce } from '../../../../shared/models/activitypub'
2import { logger, retryTransactionWrapper } from '../../../helpers' 2import { logger, retryTransactionWrapper } from '../../../helpers'
3import { sequelizeTypescript } from '../../../initializers' 3import { sequelizeTypescript } from '../../../initializers'
4import { ActorModel } from '../../../models/activitypub/actor' 4import { ActorModel } from '../../../models/activitypub/actor'