diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 4477da332..68cf88a75 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,6 @@
-
-
-
+
+
+
**What happened?**
@@ -16,9 +16,9 @@
**Additional information**
-* PeerTube version or URL:
-* Browser name/version:
+* PeerTube version and URL:
+* Browser name and version:
* NodeJS version:
* Link to browser console log if useful:
-* Link to server log if useful (journalctl or /var/www/peertube/storage/logs/):
+* Link to server log if useful (`journalctl` or `/var/www/peertube/storage/logs/`):
diff --git a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html b/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html
index f461ef31b..128f4962d 100644
--- a/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html
+++ b/client/src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html
@@ -20,7 +20,7 @@
Action
- Account
+ Account
Muted at
diff --git a/client/src/app/+admin/system/jobs/jobs.component.html b/client/src/app/+admin/system/jobs/jobs.component.html
index 185fae220..e06156a9e 100644
--- a/client/src/app/+admin/system/jobs/jobs.component.html
+++ b/client/src/app/+admin/system/jobs/jobs.component.html
@@ -10,45 +10,48 @@
Job state
-
-
- {{ state }}
-
-
+
+
+ {{ state }}
+
+
0" [totalRecords]="totalRecords" [rows]="rowsPerPage" dataKey="uniqId"
- [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" [first]="pagination.start"
- [tableStyle]="{'table-layout':'auto'}" (onPage)="onPage($event)" [expandedRowKeys]="expandedRows"
+ [value]="jobs" [lazy]="true" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [rowsPerPageOptions]="rowsPerPageOptions"
+ [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="uniqId" [first]="pagination.start"
+ [tableStyle]="{'table-layout':'auto'}" (onPage)="onPage($event)"
+ [showCurrentPageReport]="true" i18n-currentPageReportTemplate
+ currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} jobs"
+ (onPage)="onPage($event)" [expandedRowKeys]="expandedRows"
>
- ID
+ ID
Type
Created
- State
-
-
+
+
- {{ job.id }}
- {{ job.type }}
- {{ job.createdAt | date: 'short' }}
- Delayed
- Will start soon...
- Running...
- Finished
- Failed
+ {{ job.id }}
+ {{ job.type }}
+ {{ job.createdAt | date: 'short' }}
@@ -74,5 +77,18 @@
+
+
+
+
+
+
+ No {{ jobState }} jobs found.
+ No {{ jobType }}
jobs found that are {{ jobState }} .
+
+
+
+
+
diff --git a/client/src/app/+admin/system/jobs/jobs.component.scss b/client/src/app/+admin/system/jobs/jobs.component.scss
index c33e14292..784ec4572 100644
--- a/client/src/app/+admin/system/jobs/jobs.component.scss
+++ b/client/src/app/+admin/system/jobs/jobs.component.scss
@@ -1,6 +1,10 @@
@import '_variables';
@import '_mixins';
+.select-job-state {
+ min-width: 120px;
+}
+
.job-id {
max-width: 30vw !important;
}
@@ -13,10 +17,6 @@
width: 170px !important;
}
-.job-state {
- max-width: 60px;
-}
-
.admin-sub-header {
flex-direction: row !important;
justify-content: flex-end;
@@ -47,3 +47,7 @@ pre {
.job-error {
color: red;
}
+
+.badge {
+ @include table-badge;
+}
diff --git a/client/src/app/+admin/system/jobs/jobs.component.ts b/client/src/app/+admin/system/jobs/jobs.component.ts
index 96e0f25b0..25d75aed2 100644
--- a/client/src/app/+admin/system/jobs/jobs.component.ts
+++ b/client/src/app/+admin/system/jobs/jobs.component.ts
@@ -56,6 +56,21 @@ export class JobsComponent extends RestTable implements OnInit {
return 'JobsComponent'
}
+ getJobStateClass (state: JobStateClient) {
+ switch (state) {
+ case 'active':
+ return 'badge-blue'
+ case 'completed':
+ return 'badge-green'
+ case 'delayed':
+ return 'badge-brown'
+ case 'failed':
+ return 'badge-red'
+ case 'waiting':
+ return 'badge-yellow'
+ }
+ }
+
onJobStateOrTypeChanged () {
this.pagination.start = 0
diff --git a/client/src/app/+admin/system/logs/logs.component.html b/client/src/app/+admin/system/logs/logs.component.html
index ae1b0c601..e92e11c2a 100644
--- a/client/src/app/+admin/system/logs/logs.component.html
+++ b/client/src/app/+admin/system/logs/logs.component.html
@@ -5,17 +5,30 @@
-
-
- {{ timeChoice.label }}
-
-
+
+
+ {{ time.label }} ({{ time.id | date: time.dateFormat }} - now )
+
+
-
-
- {{ levelChoice.label }}
-
-
+
+
+ ⬤ {{ levelChoice.label }}
+ ⬤ {{ levelChoice.label }}
+ ⬤ {{ levelChoice.label }}
+ ⬤ {{ levelChoice.label }}
+
+
diff --git a/client/src/app/+admin/system/logs/logs.component.scss b/client/src/app/+admin/system/logs/logs.component.scss
index 6b92f4d0b..587a9795c 100644
--- a/client/src/app/+admin/system/logs/logs.component.scss
+++ b/client/src/app/+admin/system/logs/logs.component.scss
@@ -52,7 +52,8 @@
}
my-button,
- .peertube-select-container {
+ .peertube-select-container,
+ ng-select {
margin-left: 10px;
}
}
@@ -62,6 +63,7 @@
flex-direction: column;
.peertube-select-container,
+ ng-select,
my-button {
width: 100% !important;
margin-left: 0px !important;
@@ -80,6 +82,7 @@
flex-direction: column;
.peertube-select-container,
+ ng-select,
my-button {
width: 100% !important;
margin-left: 0px !important;
diff --git a/client/src/app/+admin/system/logs/logs.component.ts b/client/src/app/+admin/system/logs/logs.component.ts
index c9c9dc3d1..62b8bc0b9 100644
--- a/client/src/app/+admin/system/logs/logs.component.ts
+++ b/client/src/app/+admin/system/logs/logs.component.ts
@@ -14,7 +14,7 @@ export class LogsComponent implements OnInit {
loading = false
logs: LogRow[] = []
- timeChoices: { id: string, label: string }[] = []
+ timeChoices: { id: string, label: string, dateFormat: string }[] = []
levelChoices: { id: LogLevel, label: string }[] = []
logTypeChoices: { id: 'audit' | 'standard', label: string }[] = []
@@ -76,15 +76,18 @@ export class LogsComponent implements OnInit {
this.timeChoices = [
{
id: lastWeek.toISOString(),
- label: $localize`Last week`
+ label: $localize`Last week`,
+ dateFormat: 'shortDate'
},
{
id: lastDay.toISOString(),
- label: $localize`Last day`
+ label: $localize`Last day`,
+ dateFormat: 'short'
},
{
id: lastHour.toISOString(),
- label: $localize`Last hour`
+ label: $localize`Last hour`,
+ dateFormat: 'mediumTime'
}
]
@@ -95,19 +98,19 @@ export class LogsComponent implements OnInit {
this.levelChoices = [
{
id: 'debug',
- label: $localize`Debug`
+ label: $localize`debug`
},
{
id: 'info',
- label: $localize`Info`
+ label: $localize`info`
},
{
id: 'warn',
- label: $localize`Warning`
+ label: $localize`warning`
},
{
id: 'error',
- label: $localize`Error`
+ label: $localize`error`
}
]
diff --git a/client/src/app/shared/shared-moderation/account-blocklist.component.html b/client/src/app/shared/shared-moderation/account-blocklist.component.html
index ad7b6d163..7eca6411e 100644
--- a/client/src/app/shared/shared-moderation/account-blocklist.component.html
+++ b/client/src/app/shared/shared-moderation/account-blocklist.component.html
@@ -25,7 +25,7 @@
Action
- Account
+ Account
Muted at
diff --git a/client/src/app/shared/shared-moderation/server-blocklist.component.html b/client/src/app/shared/shared-moderation/server-blocklist.component.html
index 598e1a42c..225d49c1b 100644
--- a/client/src/app/shared/shared-moderation/server-blocklist.component.html
+++ b/client/src/app/shared/shared-moderation/server-blocklist.component.html
@@ -29,7 +29,7 @@
Action
- Instance
+ Instance
Muted at