applications/luci-olsr-services: Move services away from mod-freifunk and make it...

[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 b9f551b1e4aec1c79dfdb0f8cf3a96e7c6b8f0c2..8fc3244de0725ac777031627cbb96196cdaef106 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 uci = require "luci.model.uci".cursor()
 
+       -- Frontend
        local page  = node()
        page.lock   = true
        page.target = alias("freifunk")
@@ -41,6 +42,7 @@ function index()
        local page  = node("freifunk", "index", "contact")
        page.target = template("freifunk/contact")
        page.title  = "Kontakt"
+       page.order    = 10
 
        local page  = node("freifunk", "status")
        page.target = template("freifunk/public_status")
@@ -60,35 +62,42 @@ function index()
                assign({"freifunk", "graph"}, {"admin", "statistics", "graph"}, i18n("Statistics"), 40)
        end
 
-       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")
+       -- backend
+       assign({"mini", "freifunk"}, {"admin", "freifunk"}, "Freifunk", 5)
+       entry({"admin", "freifunk"}, alias("admin", "freifunk", "index"), "Freifunk", 5)
+
+       local page  = node("admin", "freifunk")
+       page.target = template("freifunk/adminindex")
        page.title  = "Freifunk"
-       page.order  = 30
+       page.order  = 5
+
+       local page  = node("admin", "freifunk", "basics")
+       page.target = cbi("freifunk/basics")
+       page.title  = "Grundeinstellungen"
+       page.order  = 5
+       
+       local page  = node("admin", "freifunk", "basics", "profile")
+       page.target = cbi("freifunk/profile")
+       page.title  = "Profile"
+       page.order  = 10
+
+       local page  = node("admin", "freifunk", "basics", "profile_expert")
+       page.target = cbi("freifunk/profile_expert")
+       page.title  = "Profile (Expert)"
+       page.order  = 20
 
        local page  = node("admin", "freifunk", "Index-Page")
        page.target = cbi("freifunk/user_index")
        page.title  = "Index-Page"
-       page.order  = 35
+       page.order  = 50
 
        local page  = node("admin", "freifunk", "contact")
        page.target = cbi("freifunk/contact")
        page.title  = "Kontakt"
-       page.order  = 40
+       page.order  = 15
 
        entry({"freifunk", "map"}, template("freifunk-map/frame"), i18n("Karte"), 50)
        entry({"freifunk", "map", "content"}, template("freifunk-map/map"), nil, 51)
-
-       uci:foreach("olsrd", "LoadPlugin", function(s)
-               if s.library == "olsrd_nameservice.so.0.3" then
-                       has_serv = true
-               end
-       end)
-
-       if has_serv then
-               entry({"freifunk", "services"}, template("freifunk-services/services"), i18n("Services"), 60)
-       end
 end
 
 local function fetch_olsrd()
@@ -296,4 +305,3 @@ function public_status_json()
        luci.http.write_json(rv)
        return
 end
-