diff options
| author | Florian Eckert <fe@dev.tdt.de> | 2019-08-09 14:46:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-09 14:46:29 +0200 |
| commit | 15e95260896220072bd43225229722f313b6b9e1 (patch) | |
| tree | 567b19a3df67ff36a82881b6d1a6ffee2d705349 /applications/luci-app-ocserv | |
| parent | b11a25dcb954093fd44f3ce69c9673a748acbb1e (diff) | |
| parent | 7af8043a75ccf49c3e976984a4b10812e25d115f (diff) | |
Merge pull request #2969 from TDT-AG/pr/20190806-luci-base
luci-base: add new VPN toplevel menu entry
Diffstat (limited to 'applications/luci-app-ocserv')
| -rw-r--r-- | applications/luci-app-ocserv/luasrc/controller/ocserv.lua | 10 | ||||
| -rw-r--r-- | applications/luci-app-ocserv/luasrc/view/ocserv_status.htm | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/applications/luci-app-ocserv/luasrc/controller/ocserv.lua b/applications/luci-app-ocserv/luasrc/controller/ocserv.lua index 79c6ddb78e..f41b481038 100644 --- a/applications/luci-app-ocserv/luasrc/controller/ocserv.lua +++ b/applications/luci-app-ocserv/luasrc/controller/ocserv.lua @@ -10,24 +10,24 @@ function index() local page - page = entry({"admin", "services", "ocserv"}, alias("admin", "services", "ocserv", "main"), + page = entry({"admin", "vpn", "ocserv"}, alias("admin", "vpn", "ocserv", "main"), _("OpenConnect VPN")) page.dependent = true - page = entry({"admin", "services", "ocserv", "main"}, + page = entry({"admin", "vpn", "ocserv", "main"}, cbi("ocserv/main"), _("Server Settings"), 200) page.dependent = true - page = entry({"admin", "services", "ocserv", "users"}, + page = entry({"admin", "vpn", "ocserv", "users"}, cbi("ocserv/users"), _("User Settings"), 300) page.dependent = true - entry({"admin", "services", "ocserv", "status"}, + entry({"admin", "vpn", "ocserv", "status"}, call("ocserv_status")).leaf = true - entry({"admin", "services", "ocserv", "disconnect"}, + entry({"admin", "vpn", "ocserv", "disconnect"}, post("ocserv_disconnect")).leaf = true end diff --git a/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm b/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm index 9c69514b95..d00084a0bc 100644 --- a/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm +++ b/applications/luci-app-ocserv/luasrc/view/ocserv_status.htm @@ -1,7 +1,7 @@ <script type="text/javascript">//<![CDATA[ function ocserv_disconnect(idx) { - (new XHR()).post('<%=url('admin/services/ocserv/disconnect')%>/' + idx, { token: '<%=token%>' }, + (new XHR()).post('<%=url('admin/vpn/ocserv/disconnect')%>/' + idx, { token: '<%=token%>' }, function(x) { var tb = document.getElementById('ocserv_status_table'); @@ -11,7 +11,7 @@ ); } - XHR.poll(-1, '<%=url('admin/services/ocserv/status')%>', null, + XHR.poll(-1, '<%=url('admin/vpn/ocserv/status')%>', null, function(x, st) { var tb = document.getElementById('ocserv_status_table'); |