Merge branch 'release/v5.0' into tweak/groups_mgmt_disable_controls

This commit is contained in:
DL6ER
2020-01-27 10:52:14 +00:00
5 changed files with 21 additions and 0 deletions

View File

@@ -122,6 +122,10 @@ function initTable() {
"</button>";
$("td:eq(4)", row).html(button);
},
dom:
"<'row'<'col-sm-4'l><'col-sm-8'f>>" +
"<'row'<'col-sm-12'<'table-responsive'tr>>>" +
"<'row'<'col-sm-5'i><'col-sm-7'p>>",
lengthMenu: [
[10, 25, 50, 100, -1],
[10, 25, 50, 100, "All"]

View File

@@ -133,6 +133,10 @@ function initTable() {
"</button>";
$("td:eq(2)", row).html(button);
},
dom:
"<'row'<'col-sm-4'l><'col-sm-8'f>>" +
"<'row'<'col-sm-12'<'table-responsive'tr>>>" +
"<'row'<'col-sm-5'i><'col-sm-7'p>>",
lengthMenu: [
[10, 25, 50, 100, -1],
[10, 25, 50, 100, "All"]

View File

@@ -139,6 +139,10 @@ function initTable() {
"</button>";
$("td:eq(5)", row).html(button);
},
dom:
"<'row'<'col-sm-4'l><'col-sm-8'f>>" +
"<'row'<'col-sm-12'<'table-responsive'tr>>>" +
"<'row'<'col-sm-5'i><'col-sm-7'p>>",
lengthMenu: [
[10, 25, 50, 100, -1],
[10, 25, 50, 100, "All"]

View File

@@ -83,6 +83,10 @@ $(document).ready(function() {
$("td:eq(3)", row).html(button);
}
},
dom:
"<'row'<'col-sm-4'l><'col-sm-8'f>>" +
"<'row'<'col-sm-12'<'table-responsive'tr>>>" +
"<'row'<'col-sm-5'i><'col-sm-7'p>>",
lengthMenu: [
[10, 25, 50, 100, -1],
[10, 25, 50, 100, "All"]

View File

@@ -228,6 +228,11 @@ $(document).ready(function() {
buttontext = "";
}
// Add extra label when blocking happend during deep CNAME inspection
if (blocked && data.length > 6 && data[6] === "3") {
fieldtext += "<br>CNAME";
}
$(row).addClass(colorClass);
$("td:eq(4)", row).html(fieldtext);
$("td:eq(6)", row).html(buttontext);