admin-mini: Fixed firmware flash; was referring to admin-full upgrade instead of...

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

diff --git a/modules/admin-mini/luasrc/controller/mini/index.lua b/modules/admin-mini/luasrc/controller/mini/index.lua
index eb58e00..81c0846 100644 (file)
--- a/modules/admin-mini/luasrc/controller/mini/index.lua
+++ b/modules/admin-mini/luasrc/controller/mini/index.lua
@@ -2,6 +2,7 @@
 LuCI - Lua Configuration Interface
 
 Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -11,39 +12,40 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-module("luci.controller.admin.index", package.seeall)
+
+module("luci.controller.mini.index", package.seeall)
 
 function index()
-       luci.i18n.loadc("admin-core")
+       luci.i18n.loadc("base")
        local i18n = luci.i18n.translate
 
        local root = node()
-       if not root.target then
-               root.target = alias("admin")
+       if not root.lock then
+               root.target = alias("mini")
+               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.order   = 10
-       page.i18n    = "admin-core"
+       local page   = entry({"mini"}, alias("mini", "index"), i18n("Essentials"), 10)
        page.sysauth = "root"
+       page.sysauth_authenticator = "htmlauth"
+       page.index = true
        
-       local page  = node("admin", "index")
-       page.target = template("admin_index/index")
-       page.title  = i18n("overview", "Übersicht")
-       page.order  = 10
-       
-       local page  = node("admin", "index", "luci")
-       page.target = cbi("admin_index/luci")
-       page.title  = i18n("a_i_ui", "Oberfläche")
-       
-       entry({"admin", "logout"}, call("action_logout"), i18n("logout"))
+       entry({"mini", "index"}, alias("mini", "index", "index"), i18n("Overview"), 10).index = true
+       entry({"mini", "index", "index"}, form("mini/index"), i18n("General"), 1).ignoreindex = true
+       entry({"mini", "index", "luci"}, cbi("mini/luci", {autoapply=true}), i18n("Settings"), 10)
+       entry({"mini", "index", "logout"}, call("action_logout"), i18n("Logout"))
 end
 
 function action_logout()
-       luci.http.header("Set-Cookie", "sysauth=; path=/")
+       local dsp = require "luci.dispatcher"
+       local sauth = require "luci.sauth"
+       if dsp.context.authsession then
+               sauth.kill(dsp.context.authsession)
+               dsp.context.urltoken.stok = nil
+       end
+
+       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