-
-
Blacklisted videos
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ | Name |
+ Description |
+ Views |
+ NSFW |
+ UUID |
+ Created |
+ |
+
+
+
+
+
+ | {{ videoBlacklist.name }} |
+ {{ videoBlacklist.description }} |
+ {{ videoBlacklist.views }} |
+ {{ videoBlacklist.nsfw }} |
+ {{ videoBlacklist.uuid }} |
+ {{ videoBlacklist.createdAt }} |
+
+
+ |
+
+
+
+
diff --git a/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.ts b/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.ts
index f4cf21259..7210e677c 100644
--- a/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.ts
+++ b/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.ts
@@ -16,7 +16,7 @@ export class VideoBlacklistListComponent extends RestTable implements OnInit {
blacklist: BlacklistedVideo[] = []
totalRecords = 0
rowsPerPage = 10
- sort: SortMeta = { field: 'id', order: 1 }
+ sort: SortMeta = { field: 'createdAt', order: 1 }
pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
constructor (
@@ -28,13 +28,13 @@ export class VideoBlacklistListComponent extends RestTable implements OnInit {
}
ngOnInit () {
- this.loadData()
+ this.loadSort()
}
async removeVideoFromBlacklist (entry: BlacklistedVideo) {
- const confirmMessage = 'Do you really want to remove this video from the blacklist ? It will be available again in the video list.'
+ const confirmMessage = 'Do you really want to remove this video from the blacklist ? It will be available again in the videos list.'
- const res = await this.confirmService.confirm(confirmMessage, 'Remove')
+ const res = await this.confirmService.confirm(confirmMessage, 'Unblacklist')
if (res === false) return
this.videoBlacklistService.removeVideoFromBlacklist(entry.videoId).subscribe(
diff --git a/client/src/app/shared/misc/delete-button.component.html b/client/src/app/shared/misc/delete-button.component.html
index 3db483882..d49de294a 100644
--- a/client/src/app/shared/misc/delete-button.component.html
+++ b/client/src/app/shared/misc/delete-button.component.html
@@ -1,4 +1,4 @@
- Delete
+ {{ label }}
diff --git a/client/src/app/shared/misc/delete-button.component.ts b/client/src/app/shared/misc/delete-button.component.ts
index e04039f69..2ffd98212 100644
--- a/client/src/app/shared/misc/delete-button.component.ts
+++ b/client/src/app/shared/misc/delete-button.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core'
+import { Component, Input } from '@angular/core'
@Component({
selector: 'my-delete-button',
@@ -7,4 +7,5 @@ import { Component } from '@angular/core'
})
export class DeleteButtonComponent {
+ @Input() label = 'Delete'
}
diff --git a/client/src/app/shared/rest/rest-table.ts b/client/src/app/shared/rest/rest-table.ts
index d04d91c68..165fc4e45 100644
--- a/client/src/app/shared/rest/rest-table.ts
+++ b/client/src/app/shared/rest/rest-table.ts
@@ -4,13 +4,28 @@ import { SortMeta } from 'primeng/components/common/sortmeta'
import { RestPagination } from './rest-pagination'
export abstract class RestTable {
+
abstract totalRecords: number
abstract rowsPerPage: number
abstract sort: SortMeta
abstract pagination: RestPagination
+ private sortLocalStorageKey = 'rest-table-sort-' + this.constructor.name
+
protected abstract loadData (): void
+ loadSort () {
+ const result = localStorage.getItem(this.sortLocalStorageKey)
+
+ if (result) {
+ try {
+ this.sort = JSON.parse(result)
+ } catch (err) {
+ console.error('Cannot load sort of local storage key ' + this.sortLocalStorageKey, err)
+ }
+ }
+ }
+
loadLazy (event: LazyLoadEvent) {
this.sort = {
order: event.sortOrder,
@@ -23,6 +38,11 @@ export abstract class RestTable {
}
this.loadData()
+ this.saveSort()
+ }
+
+ saveSort () {
+ localStorage.setItem(this.sortLocalStorageKey, JSON.stringify(this.sort))
}
}
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index f998096ae..438990a40 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -131,21 +131,9 @@ label {
}
// ngprime data table customizations
-p-datatable {
+p-table {
font-size: 15px !important;
- .ui-datatable-scrollable-header {
- background-color: #fff !important;
- }
-
- .ui-widget-content {
- border: none !important;
- }
-
- .ui-datatable-virtual-table {
- border-top: none !important;
- }
-
td {
border: 1px solid #E5E5E5 !important;
padding-left: 15px !important;
@@ -157,23 +145,33 @@ p-datatable {
tr {
background-color: #fff !important;
height: 46px;
+ }
- &:hover {
- background-color: #f0f0f0 !important;
- }
+ .ui-table-tbody {
+ tr {
+ &:hover {
+ background-color: #f0f0f0 !important;
+ }
- &:not(:hover) {
- .action-cell * {
- display: none !important;
+ &:not(:hover) {
+ .action-cell * {
+ display: none !important;
+ }
+ }
+
+ &:first-child td {
+ border-top: none !important;
+ }
+
+ &:last-child td {
+ border-bottom: none !important;
}
}
- &:first-child td {
- border-top: none !important;
- }
-
- &:last-child td {
- border-bottom: none !important;
+ .expander {
+ cursor: pointer;
+ position: relative;
+ top: 1px;
}
}
@@ -195,7 +193,7 @@ p-datatable {
}
}
- &.ui-state-active {
+ &.ui-state-highlight {
background-color: #fff !important;
.fa {