Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

luci-app-pbr: Sync with pbr 1.1.7-29 #7348

Merged
merged 1 commit into from
Oct 29, 2024
Merged

luci-app-pbr: Sync with pbr 1.1.7-29 #7348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion applications/luci-app-pbr/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PKG_NAME:=luci-app-pbr
PKG_LICENSE:=AGPL-3.0-or-later
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_VERSION:=1.1.7
PKG_RELEASE:=21
PKG_RELEASE:=29

LUCI_TITLE:=Policy Based Routing Service Web UI
LUCI_URL:=https://github.com/stangri/luci-app-pbr/
Expand Down
21 changes: 16 additions & 5 deletions applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var pkg = {
return "pbr";
},
get ReadmeCompat() {
return "1.1.7-21";
return "1.1.7-29";
},
get URL() {
return (
Expand Down Expand Up @@ -260,10 +260,21 @@ var status = baseclass.extend({
"The principal package (pbr) is outdated, please update it"
),
warningBadNftCallsInUserFile: _(
"Incompatible nft calls detected in user include file, disabling fw4 nft file support."
"Incompatible nft calls detected in user include file, disabling fw4 nft file support"
),
warningDnsmasqInstanceNoConfdir: _(
"Dnsmasq instance (%s) targeted in settings, but it doesn't have its own confdir."
"Dnsmasq instance (%s) targeted in settings, but it doesn't have its own confdir"
),
warningDhcpLanForce: _(
_(
"Please set 'dhcp.lan.force=1' to speed up service start-up %s(more info)%s"
).format(
"<a href='" +
pkg.URL +
"#Warning:Pleasesetdhcp.lan.force1" +
"' target='_blank'>",
"</a>"
)
),
};
var warningsTitle = E(
Expand All @@ -284,7 +295,7 @@ var status = baseclass.extend({
text += _("Unknown warning") + "<br />";
}
});
var warningsText = E("div", {}, text);
var warningsText = E("div", { class: "cbi-value-description" }, text);
var warningsField = E(
"div",
{ class: "cbi-value-field" },
Expand Down Expand Up @@ -421,7 +432,7 @@ var status = baseclass.extend({
'<a href="' + pkg.URL + '" target="_blank">',
"</a>!<br />"
);
var errorsText = E("div", {}, text);
var errorsText = E("div", { class: "cbi-value-description" }, text);
var errorsField = E("div", { class: "cbi-value-field" }, errorsText);
errorsDiv = E("div", { class: "cbi-value" }, [
errorsTitle,
Expand Down
Loading