diff options
Diffstat (limited to 'client/src/app')
9 files changed, 17 insertions, 19 deletions
diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.html b/client/src/app/+admin/follows/followers-list/followers-list.component.html index a24039fc6..9499a0433 100644 --- a/client/src/app/+admin/follows/followers-list/followers-list.component.html +++ b/client/src/app/+admin/follows/followers-list/followers-list.component.html | |||
@@ -2,7 +2,7 @@ | |||
2 | [value]="followers" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" | 2 | [value]="followers" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" |
3 | sortField="createdAt" (onLazyLoad)="loadLazy($event)" | 3 | sortField="createdAt" (onLazyLoad)="loadLazy($event)" |
4 | > | 4 | > |
5 | <p-column field="id" header="ID"></p-column> | 5 | <p-column field="id" header="ID" [style]="{ width: '60px' }"></p-column> |
6 | <p-column field="follower.host" header="Host"></p-column> | 6 | <p-column field="follower.host" header="Host"></p-column> |
7 | <p-column field="follower.score" header="Score"></p-column> | 7 | <p-column field="follower.score" header="Score"></p-column> |
8 | <p-column field="state" header="State"></p-column> | 8 | <p-column field="state" header="State"></p-column> |
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.html b/client/src/app/+admin/follows/following-list/following-list.component.html index 2b6cc9113..fc1cf0dc4 100644 --- a/client/src/app/+admin/follows/following-list/following-list.component.html +++ b/client/src/app/+admin/follows/following-list/following-list.component.html | |||
@@ -2,7 +2,7 @@ | |||
2 | [value]="following" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" | 2 | [value]="following" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" |
3 | sortField="createdAt" (onLazyLoad)="loadLazy($event)" | 3 | sortField="createdAt" (onLazyLoad)="loadLazy($event)" |
4 | > | 4 | > |
5 | <p-column field="id" header="ID"></p-column> | 5 | <p-column field="id" header="ID" [style]="{ width: '60px' }"></p-column> |
6 | <p-column field="following.host" header="Host"></p-column> | 6 | <p-column field="following.host" header="Host"></p-column> |
7 | <p-column field="state" header="State"></p-column> | 7 | <p-column field="state" header="State"></p-column> |
8 | <p-column field="createdAt" header="Created date" [sortable]="true"></p-column> | 8 | <p-column field="createdAt" header="Created date" [sortable]="true"></p-column> |
diff --git a/client/src/app/+admin/jobs/jobs-list/jobs-list.component.html b/client/src/app/+admin/jobs/jobs-list/jobs-list.component.html index 7aa5f4254..809155338 100644 --- a/client/src/app/+admin/jobs/jobs-list/jobs-list.component.html +++ b/client/src/app/+admin/jobs/jobs-list/jobs-list.component.html | |||
@@ -6,9 +6,9 @@ | |||
6 | [value]="jobs" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" | 6 | [value]="jobs" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" |
7 | sortField="createdAt" (onLazyLoad)="loadLazy($event)" [scrollable]="true" [virtualScroll]="true" [scrollHeight]="scrollHeight" | 7 | sortField="createdAt" (onLazyLoad)="loadLazy($event)" [scrollable]="true" [virtualScroll]="true" [scrollHeight]="scrollHeight" |
8 | > | 8 | > |
9 | <p-column field="id" header="ID" [style]="{ width: '40px' }"></p-column> | 9 | <p-column field="id" header="ID" [style]="{ width: '60px' }"></p-column> |
10 | <p-column field="category" header="Category" [style]="{ width: '100px' }"></p-column> | 10 | <p-column field="category" header="Category" [style]="{ width: '130px' }"></p-column> |
11 | <p-column field="handlerName" header="Handler name" [style]="{ width: '200px' }"></p-column> | 11 | <p-column field="handlerName" header="Handler name" [style]="{ width: '210px' }"></p-column> |
12 | <p-column header="Input data"> | 12 | <p-column header="Input data"> |
13 | <ng-template pTemplate="body" let-job="rowData"> | 13 | <ng-template pTemplate="body" let-job="rowData"> |
14 | <pre>{{ job.handlerInputData }}</pre> | 14 | <pre>{{ job.handlerInputData }}</pre> |
diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html index b3d90ba1e..08f4caeb9 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.html +++ b/client/src/app/+admin/users/user-list/user-list.component.html | |||
@@ -11,7 +11,7 @@ | |||
11 | [value]="users" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" | 11 | [value]="users" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" |
12 | sortField="id" (onLazyLoad)="loadLazy($event)" | 12 | sortField="id" (onLazyLoad)="loadLazy($event)" |
13 | > | 13 | > |
14 | <p-column field="id" header="ID" [sortable]="true"></p-column> | 14 | <p-column field="id" header="ID" [sortable]="true" [style]="{ width: '60px' }"></p-column> |
15 | <p-column field="username" header="Username" [sortable]="true"></p-column> | 15 | <p-column field="username" header="Username" [sortable]="true"></p-column> |
16 | <p-column field="email" header="Email"></p-column> | 16 | <p-column field="email" header="Email"></p-column> |
17 | <p-column field="videoQuota" header="Video quota"></p-column> | 17 | <p-column field="videoQuota" header="Video quota"></p-column> |
diff --git a/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html b/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html index d655a5e9b..65d061246 100644 --- a/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html +++ b/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html | |||
@@ -6,7 +6,7 @@ | |||
6 | [value]="videoAbuses" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" | 6 | [value]="videoAbuses" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" |
7 | sortField="id" (onLazyLoad)="loadLazy($event)" | 7 | sortField="id" (onLazyLoad)="loadLazy($event)" |
8 | > | 8 | > |
9 | <p-column field="id" header="ID" [sortable]="true"></p-column> | 9 | <p-column field="id" header="ID" [sortable]="true" [style]="{ width: '60px' }"></p-column> |
10 | <p-column field="reason" header="Reason"></p-column> | 10 | <p-column field="reason" header="Reason"></p-column> |
11 | <p-column field="reporterServerHost" header="Reporter server host"></p-column> | 11 | <p-column field="reporterServerHost" header="Reporter server host"></p-column> |
12 | <p-column field="reporterUsername" header="Reporter username"></p-column> | 12 | <p-column field="reporterUsername" header="Reporter username"></p-column> |
diff --git a/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.html b/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.html index 1d813fa07..942f7c9f1 100644 --- a/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.html +++ b/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.html | |||
@@ -9,10 +9,7 @@ | |||
9 | <p-column field="id" header="ID" [sortable]="true"></p-column> | 9 | <p-column field="id" header="ID" [sortable]="true"></p-column> |
10 | <p-column field="name" header="Name" [sortable]="true"></p-column> | 10 | <p-column field="name" header="Name" [sortable]="true"></p-column> |
11 | <p-column field="description" header="Description"></p-column> | 11 | <p-column field="description" header="Description"></p-column> |
12 | <p-column field="duration" header="Duration" [sortable]="true"></p-column> | ||
13 | <p-column field="views" header="Views" [sortable]="true"></p-column> | 12 | <p-column field="views" header="Views" [sortable]="true"></p-column> |
14 | <p-column field="likes" header="Likes" [sortable]="true"></p-column> | ||
15 | <p-column field="dislikes" header="Dislikes" [sortable]="true"></p-column> | ||
16 | <p-column field="nsfw" header="NSFW"></p-column> | 13 | <p-column field="nsfw" header="NSFW"></p-column> |
17 | <p-column field="uuid" header="UUID" [sortable]="true"></p-column> | 14 | <p-column field="uuid" header="UUID" [sortable]="true"></p-column> |
18 | <p-column field="createdAt" header="Created date" [sortable]="true"></p-column> | 15 | <p-column field="createdAt" header="Created date" [sortable]="true"></p-column> |
diff --git a/client/src/app/shared/misc/edit-button.component.html b/client/src/app/shared/misc/edit-button.component.html index 6e9564bd7..58012a8b8 100644 --- a/client/src/app/shared/misc/edit-button.component.html +++ b/client/src/app/shared/misc/edit-button.component.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <a class="action-button" [routerLink]="routerLink"> | 1 | <a class="action-button action-button-edit" [routerLink]="routerLink"> |
2 | <span class="icon icon-edit"></span> | 2 | <span class="icon icon-edit"></span> |
3 | Edit | 3 | Edit |
4 | </a> | 4 | </a> |
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss index 02b44bda1..b37fa3d61 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss | |||
@@ -27,7 +27,8 @@ | |||
27 | line-height: 300px; | 27 | line-height: 300px; |
28 | margin-top: 50px; | 28 | margin-top: 50px; |
29 | text-align: center; | 29 | text-align: center; |
30 | font-weight: bold; | 30 | font-weight: $font-semibold; |
31 | font-size: 15px; | ||
31 | } | 32 | } |
32 | 33 | ||
33 | .video-bottom { | 34 | .video-bottom { |
diff --git a/client/src/app/videos/+video-watch/video-watch.module.ts b/client/src/app/videos/+video-watch/video-watch.module.ts index d0ed29d06..e77883472 100644 --- a/client/src/app/videos/+video-watch/video-watch.module.ts +++ b/client/src/app/videos/+video-watch/video-watch.module.ts | |||
@@ -1,15 +1,15 @@ | |||
1 | import { NgModule } from '@angular/core' | 1 | import { NgModule } from '@angular/core' |
2 | import { TooltipModule } from 'ngx-bootstrap/tooltip' | ||
3 | import { ClipboardModule } from 'ngx-clipboard' | ||
4 | import { SharedModule } from '../../shared' | ||
5 | import { MarkdownService } from '../shared' | ||
6 | import { VideoDownloadComponent } from './video-download.component' | ||
7 | import { VideoReportComponent } from './video-report.component' | ||
8 | import { VideoShareComponent } from './video-share.component' | ||
2 | 9 | ||
3 | import { VideoWatchRoutingModule } from './video-watch-routing.module' | 10 | import { VideoWatchRoutingModule } from './video-watch-routing.module' |
4 | import { MarkdownService } from '../shared' | ||
5 | import { SharedModule } from '../../shared' | ||
6 | import { ClipboardModule } from 'ngx-clipboard' | ||
7 | import { TooltipModule } from 'ngx-bootstrap/tooltip'; | ||
8 | 11 | ||
9 | import { VideoWatchComponent } from './video-watch.component' | 12 | import { VideoWatchComponent } from './video-watch.component' |
10 | import { VideoReportComponent } from './video-report.component' | ||
11 | import { VideoShareComponent } from './video-share.component' | ||
12 | import { VideoDownloadComponent } from './video-download.component' | ||
13 | 13 | ||
14 | @NgModule({ | 14 | @NgModule({ |
15 | imports: [ | 15 | imports: [ |