luci-0.10: merge r6791, r6792 and r6793

[oweals/luci.git] / applications / luci-ffwizard / luasrc / controller / ffwizard.lua

diff --git a/applications/luci-ffwizard/luasrc/controller/ffwizard.lua b/applications/luci-ffwizard/luasrc/controller/ffwizard.lua
index 428962d4bea4a6b9a77da92fe8d28a51ec44a7ce..5ad48eeabef5c46f1e96b21b46cf7fcc94a31dc0 100644 (file)
--- a/applications/luci-ffwizard/luasrc/controller/ffwizard.lua
+++ b/applications/luci-ffwizard/luasrc/controller/ffwizard.lua
@@ -18,6 +18,10 @@ $Id$
 module "luci.controller.ffwizard"
 
 function index()
-       entry({"admin", "freifunk", "ffwizard"}, form("ffwizard"), "Freifunkassistent", 1)
-       assign({"mini", "freifunk", "ffwizard"}, {"admin", "freifunk", "ffwizard"}, "Freifunkassistent", 1)
-end
\ No newline at end of file
+       entry({"admin", "freifunk", "ffwizard"}, form("freifunk/ffwizard"), "Freifunkassistent", 40)
+       assign({"mini", "freifunk", "ffwizard"}, {"admin", "freifunk", "ffwizard"}, "Freifunkassistent", 40)
+       
+       entry({"admin", "freifunk", "ffwizard_error"}, template("freifunk/ffwizard_error"))
+       assign({"mini", "freifunk", "ffwizard_error"}, {"admin", "freifunk", "ffwizard_error"})
+end
+