X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-mini%2Fluasrc%2Fcontroller%2Fmini%2Findex.lua;h=81c0846bfab39c039ebfe72489f34189a4a8a550;hp=fd960bb1bd658ce6f26250c4d56726c832aae1de;hb=e7b856f159b9fdb0d7f492ce00b1456b634f9e09;hpb=543dd521599ff715ff62b12d7e7c810da1790c2f

diff --git a/modules/admin-mini/luasrc/controller/mini/index.lua b/modules/admin-mini/luasrc/controller/mini/index.lua
index fd960bb1b..81c0846bf 100644
--- a/modules/admin-mini/luasrc/controller/mini/index.lua
+++ b/modules/admin-mini/luasrc/controller/mini/index.lua
@@ -16,28 +16,36 @@ $Id$
 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.lock then
 		root.target = alias("mini")
+		root.index = true
 	end
 	
-	entry({"about"}, template("about")).i18n = "admin-core"
+	entry({"about"}, template("about"))
 	
-	local page   = entry({"mini"}, alias("mini", "index"), i18n("essentials", "Essentials"), 10)
-	page.i18n    = "admin-core"
+	local page   = entry({"mini"}, alias("mini", "index"), i18n("Essentials"), 10)
 	page.sysauth = "root"
-	page.ucidata = true
+	page.sysauth_authenticator = "htmlauth"
+	page.index = true
 	
-	entry({"mini", "index"}, alias("mini", "index", "index"), i18n("overview"), 10)
-	entry({"mini", "index", "index"}, template("mini/index"), i18n("general"), 1)
-	entry({"mini", "index", "luci"}, cbi("mini/luci"), i18n("settings"), 10)
-	entry({"mini", "index", "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