luci-0.8: merge complete trunk

[project/luci.git] / modules / freifunk / luasrc / controller / freifunk / freifunk.lua

diff --git a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
index 460ebbe..533211b 100644 (file)
--- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
+++ b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
@@ -19,6 +19,8 @@ function index()
        local page  = node()
        page.lock   = true
        page.target = alias("freifunk")
+       page.subindex = true
+       page.index = false
 
        local page    = node("freifunk")
        page.title    = "Freifunk"
@@ -27,11 +29,13 @@ function index()
        page.setuser  = "nobody"
        page.setgroup = "nogroup"
        page.i18n     = "freifunk"
+       page.index    = true
 
        local page  = node("freifunk", "index")
        page.target = template("freifunk/index")
        page.title  = "Übersicht"
        page.order  = 10
+       page.indexignore = true
 
        local page  = node("freifunk", "index", "contact")
        page.target = template("freifunk/contact")
@@ -39,26 +43,27 @@ function index()
 
 
        local page  = node("freifunk", "status")
-       page.target = call("action_status")
+       page.target = form("freifunk/public_status")
        page.title  = "Status"
        page.order  = 20
+       page.i18n   = "admin-core"
        page.setuser  = false
        page.setgroup = false
 
-       assign({"freifunk", "status", "iwscan"}, {"admin", "status", "iwscan"}, "WLAN-Scan", 20)
-       
        assign({"freifunk", "olsr"}, {"admin", "status", "olsr"}, "OLSR", 30)
 
        if luci.fs.isfile("/etc/config/luci_statistics") then
-               assign({"freifunk", "statistics"}, {"admin", "statistics", "graph"}, i18n("stat_statistics", "Statistiken"), 40)
+               assign({"freifunk", "graph"}, {"admin", "statistics", "graph"}, i18n("stat_statistics", "Statistiken"), 40)
        end
 
-       local page  = node("admin", "index", "freifunk")
+       assign({"mini", "freifunk"}, {"admin", "freifunk"}, "Freifunk", 15)
+       entry({"admin", "freifunk"}, alias("admin", "freifunk", "index"), "Freifunk", 15)
+       local page  = node("admin", "freifunk", "index")
        page.target = cbi("freifunk/freifunk")
        page.title  = "Freifunk"
        page.order  = 30
 
-       local page  = node("admin", "index", "contact")
+       local page  = node("admin", "freifunk", "contact")
        page.target = cbi("freifunk/contact")
        page.title  = "Kontakt"
        page.order  = 40