* luci/modules/freifunk: fix translation of contact page

[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 351a094..3d4bf1c 100644 (file)
--- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
+++ b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
@@ -17,6 +17,7 @@ function index()
        local i18n = luci.i18n.translate
 
        local page  = node()
+       page.lock   = true
        page.target = alias("freifunk")
 
        local page    = node("freifunk")
@@ -38,27 +39,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", "routes"}, {"admin", "status", "routes"}, "Routingtabelle", 10)
-       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
@@ -67,8 +68,10 @@ end
 function action_status()
        local data = {}
        
-       data.system, data.model, data.memtotal, data.memcached, data.membuffers, data.memfree, data.perc_memfree, data.perc_membuffers, data.perc_memcached = luci.sys.sysinfo()
-
+       data.system, data.model, data.memtotal, data.memcached, data.membuffers, data.memfree = luci.sys.sysinfo()
+       data.perc_memfree = math.floor((data.memfree/data.memtotal)*100)
+       data.perc_membuffers = math.floor((data.membuffers/data.memtotal)*100)
+       data.perc_memcached = math.floor((data.memcached/data.memtotal)*100)
        
        data.wifi = luci.sys.wifi.getiwconfig()