Merge pull request #1735 from sumpfralle/olsr-jsoninfo-parser-handle-empty-result

[oweals/luci.git] / applications / luci-app-openvpn / luasrc / view / openvpn / pageswitch.htm

diff --git a/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm
index 17beef0d39cc80b153e392776614e4135a3e9787..7d88b844ab4cbfdbb73d47b69d9d8821ac7dead8 100644 (file)
--- a/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm
+++ b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm
@@ -8,27 +8,21 @@
 
 <div class="cbi-section">
        <h3>
-               <a href="<%=url('admin/services/openvpn')%>"><%:Overview%></a> &#187;
+               <a href="<%=url('admin/vpn/openvpn')%>"><%:Overview%></a> &#187;
                <%=luci.i18n.translatef("Instance \"%s\"", self.instance)%>
        </h3>
-       <% if self.mode == "file" then %>
-               <a href="<%=url('admin/services/openvpn/basic', self.instance)%>"><%:Switch to basic configuration%> &#187;</a><p/>
-               <a href="<%=url('admin/services/openvpn/advanced', self.instance, "Service")%>"><%:Switch to advanced configuration%> &#187;</a>
-               <hr />
-       <% elseif self.mode == "basic" then %>
-               <a href="<%=url('admin/services/openvpn/advanced', self.instance, "Service")%>"><%:Switch to advanced configuration%> &#187;</a><p/>
-               <a href="<%=url('admin/services/openvpn/file', self.instance)%>"><%:Switch to file based configuration%> &#187;</a>
+       <% if self.mode == "basic" then %>
+               <a href="<%=url('admin/vpn/openvpn/advanced', self.instance, "Service")%>"><%:Switch to advanced configuration%> &#187;</a><p/>
                <hr />
        <% elseif self.mode == "advanced" then %>
-               <a href="<%=url('admin/services/openvpn/basic', self.instance)%>"><%:Switch to basic configuration%> &#187;</a><p/>
-               <a href="<%=url('admin/services/openvpn/file', self.instance)%>"><%:Switch to file based configuration%> &#187;</a>
+               <a href="<%=url('admin/vpn/openvpn/basic', self.instance)%>"><%:Switch to basic configuration%> &#187;</a><p/>
                <hr />
                <%:Configuration category%>:
                <% for i, c in ipairs(self.categories) do %>
                        <% if c == self.category then %>
                                <strong><%=translate(c)%></strong>
                        <% else %>
-                               <a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn", "advanced", self.instance, c)%>"><%=translate(c)%></a>
+                               <a href="<%=luci.dispatcher.build_url("admin", "vpn", "openvpn", "advanced", self.instance, c)%>"><%=translate(c)%></a>
                        <% end %>
                        <% if next(self.categories, i) then %>|<% end %>
                <% end %>