applications/luci-splash: fix redirections and form targets

diff --git a/applications/luci-splash/luasrc/controller/splash/splash.lua b/applications/luci-splash/luasrc/controller/splash/splash.lua
index b046ff409af56dcb80f7606f9f1e1c7d690a1039..5731efc8ca5b6aed2767f09fb2a483cb3b20762a 100644 (file)
--- a/applications/luci-splash/luasrc/controller/splash/splash.lua
+++ b/applications/luci-splash/luasrc/controller/splash/splash.lua
@@ -4,8 +4,8 @@ function index()
        entry({"admin", "services", "splash"}, cbi("splash/splash"), "Client-Splash")
 
        node("splash").target = call("action_dispatch")
-       node("splash", "splash", "activate").target = call("action_activate")
-       node("splash", "splash", "splash").target   = template("splash_splash/splash")
+       node("splash", "activate").target = call("action_activate")
+       node("splash", "splash").target   = template("splash_splash/splash")
 end
 
 function action_dispatch()
@@ -14,7 +14,7 @@ function action_dispatch()
        if #mac > 0 and ( status == "whitelisted" or status == "lease" ) then
                luci.http.redirect(luci.dispatcher.build_url())
        else
-               luci.http.redirect(luci.dispatcher.build_url("splash", "splash", "splash"))
+               luci.http.redirect(luci.dispatcher.build_url("splash", "splash"))
        end
 end
 

diff --git a/applications/luci-splash/luasrc/view/splash/splash.htm b/applications/luci-splash/luasrc/view/splash/splash.htm
index 659d4f07179da667ea867d1b6a66348f21edc185..3fcf02bac84e80a575bafa82066d1e041313f475 100644 (file)
--- a/applications/luci-splash/luasrc/view/splash/splash.htm
+++ b/applications/luci-splash/luasrc/view/splash/splash.htm
@@ -42,6 +42,6 @@ Wenn Du unsere Idee gut findest, kannst Du uns unterstützen:
 </p>
 
 <p>
-Mit einem Klick auf <em><%:accept%></em> kannst du für <%=c.leasetime%> Stunden
+Mit einem Klick auf <em><%:accept Accept%></em> kannst du für <%=c.leasetime%> Stunden
 über unser Netz das Internet verwenden. Dann wirst du erneut aufgefordet, diese Bedingungen zu akzeptieren.
-</p>
\ No newline at end of file
+</p>

diff --git a/applications/luci-splash/luasrc/view/splash_splash/splash.htm b/applications/luci-splash/luasrc/view/splash_splash/splash.htm
index 39640eb6c76b5636cdbe1a1dfbcfe28cb9a1aabf..413efbe2e6b58510c591801fbec4f073868d9cc4 100644 (file)
--- a/applications/luci-splash/luasrc/view/splash_splash/splash.htm
+++ b/applications/luci-splash/luasrc/view/splash_splash/splash.htm
@@ -14,8 +14,8 @@ $Id$
 -%>
 <%+header%>
 <%+splash/splash%>
-<form method="get" action="<%=controller%>/splash/splash/activate">
-       <input type="submit" value="<%:decline%>" />
-       <input type="submit" name="accept" value="<%:accept%>" />
+<form method="get" action="<%=controller%>/splash/activate">
+       <input type="submit" value="<%:decline Decline%>" />
+       <input type="submit" name="accept" value="<%:accept Accept%>" />
 </form>
-<%+footer%>
\ No newline at end of file
+<%+footer%>