commit 74cef6f: [Minor] Change FooTable breakpoints
moisseev
moiseev at mezonplus.ru
Mon Jul 29 17:54:34 UTC 2024
Author: moisseev
Date: 2024-03-17 19:50:37 +0300
URL: https://github.com/rspamd/rspamd/commit/74cef6faca1650a8cb783c40e97c0eae804b0d71 (refs/pull/4878/head)
[Minor] Change FooTable breakpoints
to match Bootstrap 5
---
interface/js/app/common.js | 8 ++++++++
interface/js/app/graph.js | 1 +
interface/js/app/history.js | 15 ++++++++-------
interface/js/app/libft.js | 19 ++++++++++---------
interface/js/app/symbols.js | 7 ++++---
5 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/interface/js/app/common.js b/interface/js/app/common.js
index 1fc723542..ace4bbba1 100644
--- a/interface/js/app/common.js
+++ b/interface/js/app/common.js
@@ -4,6 +4,14 @@ define(["jquery", "nprogress"],
($, NProgress) => {
"use strict";
const ui = {
+ breakpoints: {
+ xs: 0,
+ sm: 576,
+ md: 768,
+ lg: 992,
+ xl: 1200,
+ xxl: 1400
+ },
chartLegend: [
{label: "reject", color: "#FF0000"},
{label: "soft reject", color: "#BF8040"},
diff --git a/interface/js/app/graph.js b/interface/js/app/graph.js
index 5b92c6df6..4d10b95d8 100644
--- a/interface/js/app/graph.js
+++ b/interface/js/app/graph.js
@@ -128,6 +128,7 @@ define(["jquery", "app/common", "d3evolution", "d3pie", "d3", "footable"],
function initSummaryTable(rows, unit) {
common.tables.rrd_summary = FooTable.init("#rrd-table", {
+ breakpoints: common.breakpoints,
cascade: true,
sorting: {
enabled: true
diff --git a/interface/js/app/history.js b/interface/js/app/history.js
index 97a759c9b..6366f6723 100644
--- a/interface/js/app/history.js
+++ b/interface/js/app/history.js
@@ -73,7 +73,7 @@ define(["jquery", "app/common", "app/libft", "footable"],
}, {
name: "ip",
title: "IP address",
- breakpoints: "sm",
+ breakpoints: "md",
style: {width: 150, maxWidth: 150}
}, {
name: "action",
@@ -92,13 +92,13 @@ define(["jquery", "app/common", "app/libft", "footable"],
}, {
name: "size",
title: "Message size",
- breakpoints: "sm",
+ breakpoints: "md",
style: {width: 120, maxWidth: 120},
formatter: libft.formatBytesIEC
}, {
name: "scan_time",
title: "Scan time",
- breakpoints: "sm",
+ breakpoints: "md",
style: {maxWidth: 80},
sortValue: function (val) { return Number(val); }
}, {
@@ -110,7 +110,7 @@ define(["jquery", "app/common", "app/libft", "footable"],
}, {
name: "user",
title: "Authenticated user",
- breakpoints: "sm",
+ breakpoints: "md",
style: {width: 200, maxWidth: 200}
}];
}
@@ -208,6 +208,7 @@ define(["jquery", "app/common", "app/libft", "footable"],
function initErrorsTable(rows) {
common.tables.errors = FooTable.init("#errorsLog", {
+ breakpoints: common.breakpoints,
cascade: true,
columns: [
{sorted: true,
@@ -218,15 +219,15 @@ define(["jquery", "app/common", "app/libft", "footable"],
sortValue: function (val) { return Number(val.options.sortValue); }},
{name: "type",
title: "Worker type",
- breakpoints: "sm",
+ breakpoints: "md",
style: {width: 150, maxWidth: 150}},
{name: "pid",
title: "PID",
- breakpoints: "sm",
+ breakpoints: "md",
style: {width: 110, maxWidth: 110}},
{name: "module", title: "Module"},
{name: "id", title: "Internal ID"},
- {name: "message", title: "Message", breakpoints: "sm"},
+ {name: "message", title: "Message", breakpoints: "md"},
],
rows: rows,
paging: {
diff --git a/interface/js/app/libft.js b/interface/js/app/libft.js
index a3d655780..e45a1718d 100644
--- a/interface/js/app/libft.js
+++ b/interface/js/app/libft.js
@@ -66,12 +66,12 @@ define(["jquery", "app/common", "footable"],
}, {
name: "file",
title: "File name",
- breakpoints: "xs",
+ breakpoints: "sm",
sortValue: (val) => ((typeof val === "undefined") ? "" : val)
}, {
name: "ip",
title: "IP address",
- breakpoints: "md",
+ breakpoints: "lg",
style: {
"minWidth": "calc(14ch + 8px)",
"word-break": "break-all"
@@ -81,7 +81,7 @@ define(["jquery", "app/common", "footable"],
}, {
name: "sender_mime",
title: "[Envelope From] From",
- breakpoints: "md",
+ breakpoints: "lg",
style: {
"minWidth": 100,
"maxWidth": 200,
@@ -90,7 +90,7 @@ define(["jquery", "app/common", "footable"],
}, {
name: "rcpt_mime_short",
title: "[Envelope To] To/Cc/Bcc",
- breakpoints: "md",
+ breakpoints: "lg",
filterable: false,
classes: "d-none d-xl-table-cell",
style: {
@@ -106,7 +106,7 @@ define(["jquery", "app/common", "footable"],
}, {
name: "subject",
title: "Subject",
- breakpoints: "md",
+ breakpoints: "lg",
style: {
"word-break": "break-all",
"minWidth": 150
@@ -118,7 +118,7 @@ define(["jquery", "app/common", "footable"],
}, {
name: "passthrough_module",
title: '<div title="The module that has set the pre-result"><nobr>Pass-through</nobr> module</div>',
- breakpoints: "xs",
+ breakpoints: "sm",
style: {minWidth: 98, maxWidth: 98},
sortValue: (val) => ((typeof val === "undefined") ? "" : val)
}, {
@@ -149,13 +149,13 @@ define(["jquery", "app/common", "footable"],
}, {
name: "size",
title: "Msg size",
- breakpoints: "md",
+ breakpoints: "lg",
style: {minwidth: 50},
formatter: ui.formatBytesIEC
}, {
name: "time_real",
title: "Scan time",
- breakpoints: "md",
+ breakpoints: "lg",
style: {maxWidth: 72},
sortValue: function (val) { return Number(val); }
}, {
@@ -168,7 +168,7 @@ define(["jquery", "app/common", "footable"],
}, {
name: "user",
title: "Authenticated user",
- breakpoints: "md",
+ breakpoints: "lg",
style: {
"minWidth": 100,
"maxWidth": 130,
@@ -326,6 +326,7 @@ define(["jquery", "app/common", "footable"],
: columnsDefault.map((column) => column);
common.tables[table] = FooTable.init("#historyTable_" + table, {
+ breakpoints: common.breakpoints,
cascade: true,
columns: columns,
rows: items,
diff --git a/interface/js/app/symbols.js b/interface/js/app/symbols.js
index 203cf0d14..aa1403101 100644
--- a/interface/js/app/symbols.js
+++ b/interface/js/app/symbols.js
@@ -186,17 +186,18 @@ define(["jquery", "app/common", "footable"],
/* eslint-enable consistent-this, no-underscore-dangle, one-var-declaration-per-line */
common.tables.symbols = FooTable.init("#symbolsTable", {
+ breakpoints: common.breakpoints,
cascade: true,
columns: [
{sorted: true, direction: "ASC", name: "group", title: "Group"},
{name: "symbol", title: "Symbol"},
- {name: "description", title: "Description", breakpoints: "sm"},
+ {name: "description", title: "Description", breakpoints: "md"},
{name: "weight", title: "Score"},
{name: "frequency",
title: "Frequency",
- breakpoints: "sm",
+ breakpoints: "md",
sortValue: function (value) { return Number(value).toFixed(2); }},
- {name: "time", title: "Avg. time", breakpoints: "sm"},
+ {name: "time", title: "Avg. time", breakpoints: "md"},
],
rows: items[0],
paging: {
More information about the Commits
mailing list