-
Enabled strategies stats
+
Enabled strategies stats
diff --git a/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts b/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts
index 2f87c6743..c862cd250 100644
--- a/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts
+++ b/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts
@@ -10,7 +10,7 @@ import { VideosRedundancyStats } from '@shared/models/server'
@Component({
selector: 'my-video-redundancies-list',
templateUrl: './video-redundancies-list.component.html',
- styleUrls: [ '../follows.component.scss', './video-redundancies-list.component.scss' ]
+ styleUrls: [ './video-redundancies-list.component.scss' ]
})
export class VideoRedundanciesListComponent extends RestTable implements OnInit {
private static LOCAL_STORAGE_DISPLAY_TYPE = 'video-redundancies-list-display-type'
diff --git a/client/src/app/+admin/moderation/index.ts b/client/src/app/+admin/moderation/index.ts
index 53e4bc991..9dab270cc 100644
--- a/client/src/app/+admin/moderation/index.ts
+++ b/client/src/app/+admin/moderation/index.ts
@@ -1,5 +1,4 @@
export * from './abuse-list'
export * from './instance-blocklist'
export * from './video-block-list'
-export * from './moderation.component'
export * from './moderation.routes'
diff --git a/client/src/app/+admin/moderation/moderation.component.html b/client/src/app/+admin/moderation/moderation.component.html
deleted file mode 100644
index 90c6b6463..000000000
--- a/client/src/app/+admin/moderation/moderation.component.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/client/src/app/+admin/moderation/moderation.component.ts b/client/src/app/+admin/moderation/moderation.component.ts
deleted file mode 100644
index 44dd11c47..000000000
--- a/client/src/app/+admin/moderation/moderation.component.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Component, OnInit } from '@angular/core'
-import { ServerService } from '@app/core'
-
-@Component({
- templateUrl: './moderation.component.html',
- styleUrls: [ ]
-})
-export class ModerationComponent implements OnInit {
- autoBlockVideosEnabled = false
-
- constructor (
- private serverService: ServerService
- ) { }
-
- ngOnInit (): void {
- const serverConfig = this.serverService.getHTMLConfig()
-
- this.autoBlockVideosEnabled = serverConfig.autoBlacklist.videos.ofUsers.enabled
- }
-}
diff --git a/client/src/app/+admin/moderation/moderation.routes.ts b/client/src/app/+admin/moderation/moderation.routes.ts
index 2e28f0911..5c39ff366 100644
--- a/client/src/app/+admin/moderation/moderation.routes.ts
+++ b/client/src/app/+admin/moderation/moderation.routes.ts
@@ -1,7 +1,6 @@
import { Routes } from '@angular/router'
import { AbuseListComponent } from '@app/+admin/moderation/abuse-list'
import { InstanceAccountBlocklistComponent, InstanceServerBlocklistComponent } from '@app/+admin/moderation/instance-blocklist'
-import { ModerationComponent } from '@app/+admin/moderation/moderation.component'
import { VideoBlockListComponent } from '@app/+admin/moderation/video-block-list'
import { VideoCommentListComponent } from './video-comment-list'
import { UserRightGuard } from '@app/core'
@@ -10,7 +9,6 @@ import { UserRight } from '@shared/models'
export const ModerationRoutes: Routes = [
{
path: 'moderation',
- component: ModerationComponent,
children: [
{
path: '',
diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss
index 6152d9651..9cae08e85 100644
--- a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss
+++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss
@@ -5,7 +5,3 @@ my-global-icon {
width: 24px;
height: 24px;
}
-
-.badge {
- @include table-badge;
-}
diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.scss b/client/src/app/+admin/overview/users/user-list/user-list.component.scss
index e425306b5..335bd2995 100644
--- a/client/src/app/+admin/overview/users/user-list/user-list.component.scss
+++ b/client/src/app/+admin/overview/users/user-list/user-list.component.scss
@@ -43,10 +43,6 @@ my-global-icon {
@include chip;
}
-.badge {
- @include table-badge;
-}
-
.progress {
@include progressbar($small: true);
diff --git a/client/src/app/+admin/system/index.ts b/client/src/app/+admin/system/index.ts
index 8cced0cdb..b398832cc 100644
--- a/client/src/app/+admin/system/index.ts
+++ b/client/src/app/+admin/system/index.ts
@@ -1,5 +1,4 @@
export * from './debug'
export * from './jobs'
export * from './logs'
-export * from './system.component'
export * from './system.routes'
diff --git a/client/src/app/+admin/system/jobs/jobs.component.scss b/client/src/app/+admin/system/jobs/jobs.component.scss
index 4d564f4b7..eadaf7904 100644
--- a/client/src/app/+admin/system/jobs/jobs.component.scss
+++ b/client/src/app/+admin/system/jobs/jobs.component.scss
@@ -55,7 +55,3 @@ pre {
.job-error {
color: #ff0000;
}
-
-.badge {
- @include table-badge;
-}
diff --git a/client/src/app/+admin/system/system.component.html b/client/src/app/+admin/system/system.component.html
deleted file mode 100644
index 0680b43f9..000000000
--- a/client/src/app/+admin/system/system.component.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/client/src/app/+admin/system/system.component.ts b/client/src/app/+admin/system/system.component.ts
deleted file mode 100644
index b63160b86..000000000
--- a/client/src/app/+admin/system/system.component.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Component } from '@angular/core'
-
-@Component({
- templateUrl: './system.component.html',
- styleUrls: []
-})
-export class SystemComponent {
-}
diff --git a/client/src/app/+admin/system/system.routes.ts b/client/src/app/+admin/system/system.routes.ts
index 72ab6705a..d180aa3b9 100644
--- a/client/src/app/+admin/system/system.routes.ts
+++ b/client/src/app/+admin/system/system.routes.ts
@@ -4,12 +4,10 @@ import { UserRight } from '@shared/models'
import { DebugComponent } from './debug'
import { JobsComponent } from './jobs/jobs.component'
import { LogsComponent } from './logs'
-import { SystemComponent } from './system.component'
export const SystemRoutes: Routes = [
{
path: 'system',
- component: SystemComponent,
children: [
{
path: '',
diff --git a/client/src/app/+my-library/my-ownership/my-ownership.component.scss b/client/src/app/+my-library/my-ownership/my-ownership.component.scss
index 296659ea0..d32477270 100644
--- a/client/src/app/+my-library/my-ownership/my-ownership.component.scss
+++ b/client/src/app/+my-library/my-ownership/my-ownership.component.scss
@@ -6,10 +6,6 @@
@include chip;
}
-.badge {
- @include table-badge;
-}
-
.video-table-video {
display: inline-flex;
diff --git a/client/src/app/+my-library/my-video-imports/my-video-imports.component.scss b/client/src/app/+my-library/my-video-imports/my-video-imports.component.scss
index 2fc94e23a..7acacd47f 100644
--- a/client/src/app/+my-library/my-video-imports/my-video-imports.component.scss
+++ b/client/src/app/+my-library/my-video-imports/my-video-imports.component.scss
@@ -8,7 +8,3 @@ pre {
.video-import-error {
color: #ff0000;
}
-
-.badge {
- @include table-badge;
-}
diff --git a/client/src/app/+videos/videos-routing.module.ts b/client/src/app/+videos/videos-routing.module.ts
index 7db519615..8c777fbb6 100644
--- a/client/src/app/+videos/videos-routing.module.ts
+++ b/client/src/app/+videos/videos-routing.module.ts
@@ -4,12 +4,10 @@ import { LoginGuard } from '@app/core'
import { VideosListCommonPageComponent } from './video-list'
import { VideoOverviewComponent } from './video-list/overview/video-overview.component'
import { VideoUserSubscriptionsComponent } from './video-list/video-user-subscriptions.component'
-import { VideosComponent } from './videos.component'
const videosRoutes: Routes = [
{
path: '',
- component: VideosComponent,
children: [
{
path: 'overview',
diff --git a/client/src/app/+videos/videos.component.ts b/client/src/app/+videos/videos.component.ts
deleted file mode 100644
index 585a3ad9a..000000000
--- a/client/src/app/+videos/videos.component.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Component } from '@angular/core'
-
-@Component({
- template: ''
-})
-export class VideosComponent {}
diff --git a/client/src/app/+videos/videos.module.ts b/client/src/app/+videos/videos.module.ts
index 523533c11..f06f4be2b 100644
--- a/client/src/app/+videos/videos.module.ts
+++ b/client/src/app/+videos/videos.module.ts
@@ -9,7 +9,6 @@ import { OverviewService, VideosListCommonPageComponent } from './video-list'
import { VideoOverviewComponent } from './video-list/overview/video-overview.component'
import { VideoUserSubscriptionsComponent } from './video-list/video-user-subscriptions.component'
import { VideosRoutingModule } from './videos-routing.module'
-import { VideosComponent } from './videos.component'
@NgModule({
imports: [
@@ -24,16 +23,12 @@ import { VideosComponent } from './videos.component'
],
declarations: [
- VideosComponent,
-
VideoUserSubscriptionsComponent,
VideoOverviewComponent,
VideosListCommonPageComponent
],
- exports: [
- VideosComponent
- ],
+ exports: [],
providers: [
OverviewService
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index e0e8fc828..1f8166d8a 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -262,10 +262,6 @@ my-input-toggle-hidden ::ng-deep input {
align-items: center;
margin-bottom: 30px;
- .form-sub-title {
- flex-grow: 1;
- }
-
.admin-sub-nav a {
@include disable-default-a-behaviour;
@@ -289,11 +285,6 @@ my-input-toggle-hidden ::ng-deep input {
}
}
-.form-sub-title {
- font-size: 20px;
- font-weight: bold;
-}
-
// In tables, don't have a hover different background
table {
.action-button-edit,
@@ -412,13 +403,6 @@ ngx-loading-bar {
.admin-sub-header {
flex-direction: column;
- .form-sub-title {
- @include margin-right(0 !important);
-
- margin-bottom: 10px;
- text-align: center;
- }
-
.admin-sub-nav {
display: block;
overflow-x: auto;
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss
index 7aba69e4a..66b4056cb 100644
--- a/client/src/sass/primeng-custom.scss
+++ b/client/src/sass/primeng-custom.scss
@@ -495,7 +495,7 @@ body p-selectbutton.ng-dirty.ng-invalid .p-button {
border: 1px solid #a80000;
}
-//
+// data table customizations
@mixin glyphicon-light {
font-family: 'Glyphicons Halflings';
@@ -504,7 +504,6 @@ body p-selectbutton.ng-dirty.ng-invalid .p-button {
font-display: swap;
}
-// data table customizations
p-table {
.p-datatable-header {
border: none !important;
@@ -759,6 +758,10 @@ p-table {
}
}
}
+
+ .badge {
+ @include table-badge;
+ }
}
// overflow data table