Merge r4040

diff --git a/i18n/english/luasrc/i18n/admin-core.en.lua b/i18n/english/luasrc/i18n/admin-core.en.lua
index 20bf9d67716006e55664b4ca22d78b60f3fa68ed..b6e2d0858d18b3aa534edad56492839abfd975e1 100644 (file)
--- a/i18n/english/luasrc/i18n/admin-core.en.lua
+++ b/i18n/english/luasrc/i18n/admin-core.en.lua
@@ -322,3 +322,4 @@ hostnames = 'Hostnames'
 hostnames_entries = 'Host entries'
 hostnames_hostname = 'Hostname'
 hostnames_address = 'IP address'
+luci_components = "LuCI Components"

diff --git a/i18n/german/luasrc/i18n/admin-core.de.lua b/i18n/german/luasrc/i18n/admin-core.de.lua
index c0acee8b64ccae7cd5e0b0369f3df4e31134145f..ec1b5f951a471139347efaf4c9c09505b413c724 100644 (file)
--- a/i18n/german/luasrc/i18n/admin-core.de.lua
+++ b/i18n/german/luasrc/i18n/admin-core.de.lua
@@ -338,3 +338,4 @@ hostnames = 'Rechnernamen'
 hostnames_entries = 'Host-Einträge'
 hostnames_hostname = 'Rechnername'
 hostnames_address = 'IP-Adresse'
+luci_components = "LuCI Komponenten"

diff --git a/modules/admin-full/luasrc/controller/admin/index.lua b/modules/admin-full/luasrc/controller/admin/index.lua
index e2b812e8c35ce0b36828c882ccfe4be3df9b6a08..580914aa8358a013f5e6f10101d233e22cce3fb5 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/index.lua
+++ b/modules/admin-full/luasrc/controller/admin/index.lua
@@ -40,12 +40,18 @@ function index()
        page.title  = i18n("overview", "Übersicht")
        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.order  = 10
+
+       entry({"admin", "index", "components"}, call("redir_components"), i18n("luci_components", "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 +64,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