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

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

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 7e261bf82d16f95b8dcc522801bdda1e0d854fda..ba1c1d2eb701a93da1edf266c0464f8b10d2e9e9 100644 (file)
--- 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 b1828583c448aba055797a97a5924149b1460e51..93c741918a287d182250fa8cefecddc6eddd3cc8 100644 (file)
--- 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"
+               }
        }
 }