modules/freifunk: Make the public index page editable

[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 9769ea0..6df681a 100644 (file)
--- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
+++ b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
@@ -41,13 +41,11 @@ function index()
        page.target = template("freifunk/contact")
        page.title  = "Kontakt"
 
-       entry({"freifunk", "status"}, alias("freifunk", "status", "status"), "Status", 20)
-
-       local page  = node("freifunk", "status", "status")
+       local page  = node("freifunk", "status")
        page.target = form("freifunk/public_status")
-       page.title  = i18n("overview")
+       page.title  = i18n("Status")
        page.order  = 20
-       page.i18n   = "admin-core"
+       page.i18n   = "base"
        page.setuser  = false
        page.setgroup = false
 
@@ -56,8 +54,8 @@ function index()
 
        assign({"freifunk", "olsr"}, {"admin", "status", "olsr"}, "OLSR", 30)
 
-       if luci.fs.access("/etc/config/luci_statistics") then
-               assign({"freifunk", "graph"}, {"admin", "statistics", "graph"}, i18n("stat_statistics", "Statistiken"), 40)
+       if nixio.fs.access("/etc/config/luci_statistics") then
+               assign({"freifunk", "graph"}, {"admin", "statistics", "graph"}, i18n("Statistics"), 40)
        end
 
        assign({"mini", "freifunk"}, {"admin", "freifunk"}, "Freifunk", 15)
@@ -67,13 +65,22 @@ function index()
        page.title  = "Freifunk"
        page.order  = 30
 
+       local page  = node("admin", "freifunk", "Index-Page")
+       page.target = cbi("freifunk/user_index")
+       page.title  = "Index-Page"
+       page.order  = 35
+
        local page  = node("admin", "freifunk", "contact")
        page.target = cbi("freifunk/contact")
        page.title  = "Kontakt"
        page.order  = 40
 
-       entry({"freifunk", "map"}, template("freifunk-map/frame"), i18n("freifunk_map", "Karte"), 50)
+       entry({"freifunk", "map"}, template("freifunk-map/frame"), i18n("Karte"), 50)
        entry({"freifunk", "map", "content"}, template("freifunk-map/map"), nil, 51)
+
+       entry({"freifunk", "services"}, template("freifunk-services/services"), i18n("Services"), 60)
+       entry({"freifunk", "services", "content"}, template("freifunk-services/services"), nil, 61)
+
 end
 
 local function fetch_olsrd()
@@ -83,7 +90,7 @@ local function fetch_olsrd()
        local rawdata = sys.httpget("http://127.0.0.1:2006/")
 
        if #rawdata == 0 then
-               if luci.fs.access("/proc/net/ipv6_route", "r") then
+               if nixio.fs.access("/proc/net/ipv6_route", "r") then
                        rawdata = sys.httpget("http://[::1]:2006/")
                        if #rawdata == 0 then
                                return nil