Skip to content

Commit

Permalink
Merge pull request openwrt#7348 from stangri/master-luci-app-pbr
Browse files Browse the repository at this point in the history
luci-app-pbr: Sync with pbr 1.1.7-29
  • Loading branch information
stangri authored Oct 29, 2024
2 parents d3ba74e + e9ce4e3 commit ecd1004
Show file tree
Hide file tree
Showing 4 changed files with 88 additions and 72 deletions.
2 changes: 1 addition & 1 deletion applications/luci-app-pbr/Makefile
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 <[email protected]>
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
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

0 comments on commit ecd1004

Please sign in to comment.