modules/admin-full: rework fstab pages, include extroot options

[project/luci.git] / modules / admin-full / luasrc / controller / admin / index.lua

diff --git a/modules/admin-full/luasrc/controller/admin/index.lua b/modules/admin-full/luasrc/controller/admin/index.lua
index e2b812e..3e7b038 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/index.lua
+++ b/modules/admin-full/luasrc/controller/admin/index.lua
@@ -14,7 +14,7 @@ $Id$
 module("luci.controller.admin.index", package.seeall)
 
 function index()
-       luci.i18n.loadc("admin-core")
+       luci.i18n.loadc("base")
        local i18n = luci.i18n.translate
 
        local root = node()
@@ -23,13 +23,12 @@ function index()
                root.index = true
        end
        
-       entry({"about"}, template("about")).i18n = "admin-core"
+       entry({"about"}, template("about"))
        
        local page   = node("admin")
        page.target  = alias("admin", "index")
-       page.title   = i18n("administration", "Administration")
+       page.title   = i18n("Administration")
        page.order   = 10
-       page.i18n    = "admin-core"
        page.sysauth = "root"
        page.sysauth_authenticator = "htmlauth"
        page.ucidata = true
@@ -37,15 +36,21 @@ function index()
        
        local page  = node("admin", "index")
        page.target = template("admin_index/index")
-       page.title  = i18n("overview", "Übersicht")
+       page.title  = i18n("Overview")
        page.order  = 10
        page.index = true
-       
+
        local page  = node("admin", "index", "luci")
        page.target = cbi("admin_index/luci")
-       page.title  = i18n("a_i_ui", "Oberfläche")
-       
-       entry({"admin", "index", "logout"}, call("action_logout"), i18n("logout"))
+       page.title  = i18n("User Interface")
+       page.order  = 10
+
+       entry({"admin", "index", "components"}, call("redir_components"), i18n("LuCI Components"), 20)
+       entry({"admin", "index", "logout"}, call("action_logout"), i18n("Logout"), 90)
+end
+
+function redir_components()
+       luci.http.redirect(luci.dispatcher.build_url("admin", "system", "packages")..'?update=1&query=luci')
 end
 
 function action_logout()
@@ -58,4 +63,4 @@ function action_logout()
 
        luci.http.header("Set-Cookie", "sysauth=; path=" .. dsp.build_url())
        luci.http.redirect(luci.dispatcher.build_url())
-end
\ No newline at end of file
+end