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 6590caadc4b447a72bf2c84193b854404e9b6165..7d88b844ab4cbfdbb73d47b69d9d8821ac7dead8 100644 (file)
--- a/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm
+++ b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm
@@ -1,30 +1,30 @@
 <%#
  Copyright 2008 Steven Barth <steven@midlink.org>
- Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+ Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
  Licensed to the public under the Apache License 2.0.
 -%>
 
-<fieldset class="cbi-section">
-       <legend>
-               <a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn")%>"><%:Overview%></a> &raquo;
-               <%=luci.i18n.translatef("Instance \"%s\"", self.instance)%>
-       </legend>
+<%+openvpn/ovpn_css%>
 
+<div class="cbi-section">
+       <h3>
+               <a href="<%=url('admin/vpn/openvpn')%>"><%:Overview%></a> &#187;
+               <%=luci.i18n.translatef("Instance \"%s\"", self.instance)%>
+       </h3>
        <% if self.mode == "basic" then %>
-               <a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn", "advanced", self.instance, "Service")%>"><%:Switch to advanced configuration »%></a>
-       <% else %>
-               <a href="<%=luci.dispatcher.build_url("admin", "services", "openvpn", "basic", self.instance)%>"><%:« Switch to basic configuration%></a>
-               <hr style="margin:0.5em 0" />
+               <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/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 %>
        <% end %>
-</fieldset>
+</div>