Merge pull request #7092 from TDT-AG/pr/20240429-luci-app-keepalived

luci-app-keepalived: move status page to status menu

2 files changed, 17 insertions, 17 deletions

diff --git a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/overview.js b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/overview.js
index 7e261bf82d..7126d5938d 100644
--- a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/overview.js
+++ b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/overview.js
@@ -48,24 +48,24 @@ return view.extend({
 								}
 							}
 						}
-						return  [ 
+						return  [
 							target.data.iname,
 							target.data.ifp_ifname,
 							state,
 							target.stats.advert_sent,
 							target.stats.advert_rcvd,
 							new Date(target.data.last_transition * 1000)
-						];	
+						];
 					}),
 					E('em', _('There are no active instances'))
 				);
 			});
 		});
 
-		return E([
-			E('h3', _('Keepalived Instances Status')),
-			E('br'),
-			table
+		return E('div', {'class': 'cbi-map'}, [
+			E('h2', _('VRRP')),
+			E('div', {'class': 'cbi-map-descr'}, _('This overview shows the current status of the VRRP instances on this device.')),
+			E('div', { 'class': 'cbi-section' }, table)
 		]);
 	},
 
diff --git a/applications/luci-app-keepalived/root/usr/share/luci/menu.d/luci-app-keepalived.json b/applications/luci-app-keepalived/root/usr/share/luci/menu.d/luci-app-keepalived.json
index d839ab935c..93c741918a 100644
--- a/applications/luci-app-keepalived/root/usr/share/luci/menu.d/luci-app-keepalived.json
+++ b/applications/luci-app-keepalived/root/usr/share/luci/menu.d/luci-app-keepalived.json
@@ -1,19 +1,10 @@
 {
 	"admin/services/keepalived": {
-		"title": "Keepalived",
+		"title": "VRRP",
 		"order": 1,
 		"action": {
 			"type": "alias",
-			"path": "admin/services/keepalived/overview"
-		}
-	},
-
-	"admin/services/keepalived/overview": {
-		"title": "Overview",
-		"order": 10,
-		"action": {
-			"type": "view",
-			"path": "keepalived/overview"
+			"path": "admin/services/keepalived/globals"
 		}
 	},
 
@@ -105,5 +96,14 @@
 			"type": "view",
 			"path": "keepalived/vrrp_sync_group"
 		}
+	},
+
+	"admin/status/keepalived": {
+		"title": "VRRP",
+		"order": 10,
+		"action": {
+			"type": "view",
+			"path": "keepalived/overview"
+		}
 	}
 }