From: ZiMing Mo <msylgj@immortalwrt.org>
Date: Sat, 30 Apr 2022 07:55:40 +0000 (+0800)
Subject: luci-app-frpc: fix service status bar style
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fbd3a40c3e364c91a9effc1193456c8b3303b880;p=project%2Fluci.git

luci-app-frpc: fix service status bar style

mod the service status bar to use normaly 'cbi-section' class style.

Signed-off-by: ZiMing Mo <msylgj@immortalwrt.org>
[squash commits, add balnk line between commit subject and message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js b/applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js
index 7fe9042d42..dc9241cec9 100644
--- a/applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js
+++ b/applications/luci-app-frpc/htdocs/luci-static/resources/view/frpc.js
@@ -135,7 +135,7 @@ function getServiceStatus() {
 
 function renderStatus(isRunning) {
 	var renderHTML = "";
-	var spanTemp = "<span style=\"color:%s;font-weight:bold;margin-left:15px\">%s - %s</span>";
+	var spanTemp = '<em><span style="color:%s"><strong>%s %s</strong></span></em>';
 
 	if (isRunning) {
 		renderHTML += String.format(spanTemp, 'green', _("frp Client"), _("RUNNING"));
@@ -163,8 +163,8 @@ return view.extend({
 			});
 
 			return E('div', { class: 'cbi-map' },
-				E('div', { class: 'cbi-section'}, [
-					E('div', { id: 'service_status' },
+				E('fieldset', { class: 'cbi-section'}, [
+					E('p', { id: 'service_status' },
 						_('Collecting data ...'))
 				])
 			);
diff --git a/applications/luci-app-frps/htdocs/luci-static/resources/view/frps.js b/applications/luci-app-frps/htdocs/luci-static/resources/view/frps.js
index 83698cbe30..27136134f4 100644
--- a/applications/luci-app-frps/htdocs/luci-static/resources/view/frps.js
+++ b/applications/luci-app-frps/htdocs/luci-static/resources/view/frps.js
@@ -110,7 +110,7 @@ function getServiceStatus() {
 
 function renderStatus(isRunning) {
 	var renderHTML = "";
-	var spanTemp = "<span style=\"color:%s;font-weight:bold;margin-left:15px\">%s - %s</span>";
+	var spanTemp = '<em><span style="color:%s"><strong>%s %s</strong></span></em>';
 
 	if (isRunning) {
 		renderHTML += String.format(spanTemp, 'green', _("frp Server"), _("RUNNING"));
@@ -138,8 +138,8 @@ return view.extend({
 			});
 
 			return E('div', { class: 'cbi-map' },
-				E('div', { class: 'cbi-section'}, [
-					E('div', { id: 'service_status' },
+				E('fieldset', { class: 'cbi-section'}, [
+					E('p', { id: 'service_status' },
 						_('Collecting data ...'))
 				])
 			);