From 5d2a7314d0ac6456c94682fc8955b1a6d0ebf065 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 29 Apr 2024 10:35:08 +0200 Subject: [PATCH 1/4] luci-app-keepalived: rename menu entry to more common name VRRP Signed-off-by: Florian Eckert --- .../root/usr/share/luci/menu.d/luci-app-keepalived.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..b1828583c4 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,6 +1,6 @@ { "admin/services/keepalived": { - "title": "Keepalived", + "title": "VRRP", "order": 1, "action": { "type": "alias", From 139d27e1547bce517723acf5a5a850352fd4fefd Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 29 Apr 2024 10:45:00 +0200 Subject: [PATCH 2/4] luci-app-keepalived: move status page to status menu Signed-off-by: Florian Eckert --- .../resources/view/keepalived/overview.js | 2 +- .../luci/menu.d/luci-app-keepalived.json | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 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..ba1c1d2eb7 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 @@ -63,7 +63,7 @@ return view.extend({ }); return E([ - E('h3', _('Keepalived Instances Status')), + E('h3', _('VRRP')), E('br'), 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 b1828583c4..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 @@ -4,16 +4,7 @@ "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" + } } } From 7c06536a00f9bc59a3146f8b9f82c90e9f8b399e Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 29 Apr 2024 11:43:35 +0200 Subject: [PATCH 3/4] luci-app-keepalived: fix indentation Signed-off-by: Florian Eckert --- .../htdocs/luci-static/resources/view/keepalived/overview.js | 4 ++-- 1 file changed, 2 insertions(+), 2 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 ba1c1d2eb7..e65762a914 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,14 +48,14 @@ 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')) ); From 9d526222d2b57036b3829977347b324a0bc89482 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 29 Apr 2024 12:42:59 +0200 Subject: [PATCH 4/4] luci-app-keepalived: add missing cbi class section and description Signed-off-by: Florian Eckert --- .../luci-static/resources/view/keepalived/overview.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 e65762a914..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 @@ -62,10 +62,10 @@ return view.extend({ }); }); - return E([ - E('h3', _('VRRP')), - 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) ]); },