From e9ce4e32d0efb202c9d5dc36d2ecf3e04a20825f Mon Sep 17 00:00:00 2001
From: Stan Grishin <stangri@melmac.ca>
Date: Thu, 24 Oct 2024 20:20:41 +0000
Subject: luci-app-pbr: Sync with pbr 1.1.7-29

* bump luci-compat to match principal package
* bump compatible README version
* remove unneeded stops from recently added warning messages
* add warningDhcpLanForce warning message
* fix div class for error and warning messages so that URLs are
  properly decorated

Signed-off-by: Stan Grishin <stangri@melmac.ca>
---
 .../htdocs/luci-static/resources/pbr/status.js      | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'applications/luci-app-pbr/htdocs/luci-static')

diff --git a/applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js b/applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js
index fc2d9871cc..c8675423db 100644
--- a/applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js
+++ b/applications/luci-app-pbr/htdocs/luci-static/resources/pbr/status.js
@@ -11,7 +11,7 @@ var pkg = {
 		return "pbr";
 	},
 	get ReadmeCompat() {
-		return "1.1.7-21";
+		return "1.1.7-29";
 	},
 	get URL() {
 		return (
@@ -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(
@@ -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" },
@@ -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,
-- 
cgit v1.2.3