aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2020-05-02 22:38:18 +0200
committerRigel Kent <par@rigelk.eu>2020-05-04 15:01:44 +0200
commit0d3a2982a9b29bd66a05e4b36e606518d4c09959 (patch)
tree13bdc0886216a3bcf1cbaaf63d2c030237f871ca /client
parentc2a89b70ce75c4955cbdb1ced6fd20a5010a8c9b (diff)
downloadPeerTube-0d3a2982a9b29bd66a05e4b36e606518d4c09959.tar.gz
PeerTube-0d3a2982a9b29bd66a05e4b36e606518d4c09959.tar.zst
PeerTube-0d3a2982a9b29bd66a05e4b36e606518d4c09959.zip
Switching to a named filters/single input on video-abuse
Diffstat (limited to 'client')
-rw-r--r--client/src/app/+admin/moderation/moderation.component.scss1
-rw-r--r--client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html40
-rw-r--r--client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.scss8
-rw-r--r--client/src/app/+admin/users/user-edit/user-password.component.scss4
-rw-r--r--client/src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.scss4
-rw-r--r--client/src/app/+signup/+register/register.component.scss4
-rw-r--r--client/src/app/shared/user-subscription/subscribe-button.component.scss4
-rw-r--r--client/src/sass/bootstrap.scss20
-rw-r--r--client/src/sass/primeng-custom.scss4
9 files changed, 62 insertions, 27 deletions
diff --git a/client/src/app/+admin/moderation/moderation.component.scss b/client/src/app/+admin/moderation/moderation.component.scss
index cf06401cf..26c2a30d4 100644
--- a/client/src/app/+admin/moderation/moderation.component.scss
+++ b/client/src/app/+admin/moderation/moderation.component.scss
@@ -12,6 +12,7 @@
12 12
13 input { 13 input {
14 @include peertube-input-text(250px); 14 @include peertube-input-text(250px);
15 flex-grow: 1;
15 } 16 }
16} 17}
17 18
diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html
index 2f6e12d1c..b55b18333 100644
--- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html
+++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html
@@ -7,10 +7,32 @@
7 <ng-template pTemplate="caption"> 7 <ng-template pTemplate="caption">
8 <div class="caption"> 8 <div class="caption">
9 <div class="ml-auto"> 9 <div class="ml-auto">
10 <input 10 <div class="input-group">
11 type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..." 11 <div class="input-group-prepend c-hand" ngbDropdown placement="bottom-left auto" container="body">
12 (keyup)="onSearch($event)" 12 <div class="input-group-text" ngbDropdownToggle>
13 > 13 <span class="caret" aria-haspopup="menu" role="button"></span>
14 </div>
15
16 <div role="menu" ngbDropdownMenu>
17 <h6 class="dropdown-header" i18n>Filter reports</h6>
18
19 <!-- TODO:
20 <div class="dropdown-item" i18n>Reports opened by admins</div>
21 <div class="dropdown-item" i18n>Reports on videos with multiple reports</div>
22 <div class="dropdown-item" i18n>Unassigned reports</div>
23 -->
24 <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'state:pending' }" class="dropdown-item" i18n>Unsolved reports</a>
25 <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'state:accepted' }" class="dropdown-item" i18n>Accepted reports</a>
26 <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'state:rejected' }" class="dropdown-item" i18n>Refused reports</a>
27 <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'is:blocked' }" class="dropdown-item" i18n>Reports with blocked videos</a>
28 <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'is:deleted' }" class="dropdown-item" i18n>Reports with deleted videos</a>
29 </div>
30 </div>
31 <input
32 type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..."
33 (keyup)="onSearch($event)"
34 >
35 </div>
14 </div> 36 </div>
15 </div> 37 </div>
16 </ng-template> 38 </ng-template>
@@ -100,7 +122,7 @@
100 122
101 <td class="action-cell"> 123 <td class="action-cell">
102 <my-action-dropdown 124 <my-action-dropdown
103 [ngClass]="{ 'show': expanded }" placement="bottom-right auto" container="body" 125 [ngClass]="{ 'show': expanded }" placement="bottom-right top-right left auto" container="body"
104 i18n-label label="Actions" [actions]="videoAbuseActions" [entry]="videoAbuse" 126 i18n-label label="Actions" [actions]="videoAbuseActions" [entry]="videoAbuse"
105 ></my-action-dropdown> 127 ></my-action-dropdown>
106 </td> 128 </td>
@@ -118,7 +140,7 @@
118 <div class="d-flex"> 140 <div class="d-flex">
119 <span class="col-3 moderation-expanded-label" i18n>Reporter</span> 141 <span class="col-3 moderation-expanded-label" i18n>Reporter</span>
120 <span class="col-9 moderation-expanded-text"> 142 <span class="col-9 moderation-expanded-text">
121 <div class="chip"> 143 <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'reporter:&quot;' + videoAbuse.reporterAccount.displayName + '&quot;' }" class="chip">
122 <img 144 <img
123 class="avatar" 145 class="avatar"
124 [src]="videoAbuse.reporterAccount.avatar.path" 146 [src]="videoAbuse.reporterAccount.avatar.path"
@@ -128,8 +150,8 @@
128 <div> 150 <div>
129 <span class="text-muted">{{ createByString(videoAbuse.reporterAccount) }}</span> 151 <span class="text-muted">{{ createByString(videoAbuse.reporterAccount) }}</span>
130 </div> 152 </div>
131 </div> 153 </a>
132 <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': videoAbuse.reporterAccount.displayName }" class="ml-auto text-muted video-details-links" i18n> 154 <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'reportee:&quot;' + videoAbuse.reporterAccount.displayName + '&quot;' }" class="ml-auto text-muted video-details-links" i18n>
133 {videoAbuse.countReportsForReporter, plural, =1 {1 report} other {{{ videoAbuse.countReportsForReporter }} reports}}<span class="ml-1 glyphicon glyphicon-flag"></span> 155 {videoAbuse.countReportsForReporter, plural, =1 {1 report} other {{{ videoAbuse.countReportsForReporter }} reports}}<span class="ml-1 glyphicon glyphicon-flag"></span>
134 </a> 156 </a>
135 </span> 157 </span>
@@ -149,7 +171,7 @@
149 <span class="text-muted">{{ videoAbuse.video.channel.ownerAccount ? createByString(videoAbuse.video.channel.ownerAccount) : '' }}</span> 171 <span class="text-muted">{{ videoAbuse.video.channel.ownerAccount ? createByString(videoAbuse.video.channel.ownerAccount) : '' }}</span>
150 </div> 172 </div>
151 </div> 173 </div>
152 <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': videoAbuse.video.channel.ownerAccount.displayName }" class="ml-auto text-muted video-details-links" i18n> 174 <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'reportee:&quot;' +videoAbuse.video.channel.ownerAccount.displayName + '&quot;' }" class="ml-auto text-muted video-details-links" i18n>
153 {videoAbuse.countReportsForReportee, plural, =1 {1 report} other {{{ videoAbuse.countReportsForReportee }} reports}}<span class="ml-1 glyphicon glyphicon-flag"></span> 175 {videoAbuse.countReportsForReportee, plural, =1 {1 report} other {{{ videoAbuse.countReportsForReportee }} reports}}<span class="ml-1 glyphicon glyphicon-flag"></span>
154 </a> 176 </a>
155 </span> 177 </span>
diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.scss b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.scss
index d6bc34935..8eee15b64 100644
--- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.scss
+++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.scss
@@ -13,3 +13,11 @@
13.video-abuse-states .glyphicon-comment { 13.video-abuse-states .glyphicon-comment {
14 margin-left: 0.5rem; 14 margin-left: 0.5rem;
15} 15}
16
17.input-group {
18 @include peertube-input-group(300px);
19
20 .dropdown-toggle::after {
21 margin-left: 0;
22 }
23}
diff --git a/client/src/app/+admin/users/user-edit/user-password.component.scss b/client/src/app/+admin/users/user-edit/user-password.component.scss
index 217d585af..5cd93f6af 100644
--- a/client/src/app/+admin/users/user-edit/user-password.component.scss
+++ b/client/src/app/+admin/users/user-edit/user-password.component.scss
@@ -16,7 +16,3 @@ input[type=submit] {
16 16
17 margin-top: 10px; 17 margin-top: 10px;
18} 18}
19
20.input-group-append {
21 height: 30px;
22}
diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.scss b/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.scss
index 8f8af655c..ba27ee7ff 100644
--- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.scss
+++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.scss
@@ -19,10 +19,6 @@ my-actor-avatar-info {
19 @include peertube-input-group(fit-content); 19 @include peertube-input-group(fit-content);
20} 20}
21 21
22.input-group-append {
23 height: 30px;
24}
25
26input { 22input {
27 &[type=text] { 23 &[type=text] {
28 @include peertube-input-text(340px); 24 @include peertube-input-text(340px);
diff --git a/client/src/app/+signup/+register/register.component.scss b/client/src/app/+signup/+register/register.component.scss
index e135b5cb4..cc60ef524 100644
--- a/client/src/app/+signup/+register/register.component.scss
+++ b/client/src/app/+signup/+register/register.component.scss
@@ -58,10 +58,6 @@
58 @include peertube-input-group(400px); 58 @include peertube-input-group(400px);
59} 59}
60 60
61.input-group-append {
62 height: 30px;
63}
64
65input:not([type=submit]) { 61input:not([type=submit]) {
66 @include peertube-input-text(400px); 62 @include peertube-input-text(400px);
67 63
diff --git a/client/src/app/shared/user-subscription/subscribe-button.component.scss b/client/src/app/shared/user-subscription/subscribe-button.component.scss
index 5283a6cc3..b739c5ae2 100644
--- a/client/src/app/shared/user-subscription/subscribe-button.component.scss
+++ b/client/src/app/shared/user-subscription/subscribe-button.component.scss
@@ -88,10 +88,6 @@
88 } 88 }
89 } 89 }
90 90
91 .dropdown-header {
92 padding-left: 1rem;
93 }
94
95 ::ng-deep form { 91 ::ng-deep form {
96 padding: 0.25rem 1rem; 92 padding: 0.25rem 1rem;
97 } 93 }
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
index 377c85070..50f1dafed 100644
--- a/client/src/sass/bootstrap.scss
+++ b/client/src/sass/bootstrap.scss
@@ -41,6 +41,10 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
41 box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2); 41 box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
42 font-size: 15px; 42 font-size: 15px;
43 43
44 .dropdown-header {
45 padding-left: 1rem;
46 }
47
44 .dropdown-item { 48 .dropdown-item {
45 padding: 3px 15px; 49 padding: 3px 15px;
46 50
@@ -262,6 +266,18 @@ ngb-tooltip-window {
262 } 266 }
263} 267}
264 268
265.input-group > .form-control { 269.input-group {
266 flex: initial; 270 & > .form-control {
271 flex: initial;
272 }
273
274 .input-group-prepend,
275 .input-group-append {
276 height: 30px;
277 }
278
279 .input-group-prepend + input {
280 border-top-left-radius: 0 !important;
281 border-bottom-left-radius: 0 !important;
282 }
267} 283}
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss
index b3cd7cf51..eab2b2dfd 100644
--- a/client/src/sass/primeng-custom.scss
+++ b/client/src/sass/primeng-custom.scss
@@ -32,6 +32,10 @@ p-table {
32 height: 40px; 32 height: 40px;
33 display: flex; 33 display: flex;
34 align-items: center; 34 align-items: center;
35
36 .input-group-text {
37 background-color: transparent;
38 }
35 } 39 }
36 } 40 }
37 41