From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 19 Feb 2009 21:31:33 +0000 (+0000)
Subject: applications/luci-splash: fix redirections and form targets
X-Git-Tag: 0.9.0~667
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=b6406c3980e472bcb05144640b2b91a119619a5b

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 b046ff409..5731efc8c 100644
--- 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 659d4f071..3fcf02bac 100644
--- 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 39640eb6c..413efbe2e 100644
--- 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%>