diff --git a/core/chat/header.go b/core/chat/header.go index 93264de6..9ee8d6a2 100644 --- a/core/chat/header.go +++ b/core/chat/header.go @@ -30,6 +30,7 @@ func _header_share(m *ice.Message, arg ...string) { m.Push(mdb.NAME, m.Option(mdb.LINK)).PushQRCode(mdb.TEXT, m.Option(mdb.LINK)) } func _header_check(m *ice.Message, arg ...string) bool { + m.Option(ice.MAIN, mdb.Conf(m, "web.serve", "meta.main")) if m.Option(ice.CMD) == aaa.OFFER && m.Option(mdb.HASH) != "" { m.Cmd(aaa.OFFER, m.Option(mdb.HASH), func(value ice.Maps) { aaa.SessAuth(m, kit.Dict(aaa.USERNAME, value[aaa.EMAIL], aaa.USERROLE, aaa.VOID)) diff --git a/core/wiki/portal.go b/core/wiki/portal.go index a14b37eb..5bf5e1f8 100644 --- a/core/wiki/portal.go +++ b/core/wiki/portal.go @@ -34,7 +34,7 @@ func init() { m.Cmd(nfs.SAVE, p, kit.Dict(nfs.CONTENT, m.FormatMeta())) } }}, - }, aaa.RoleAction(ctx.COMMAND, ctx.RUN), ctx.CmdAction()), Hand: func(m *ice.Message, arg ...string) { + }, aaa.WhiteAction(ctx.COMMAND, ctx.RUN), aaa.RoleAction(ctx.COMMAND, ctx.RUN), ctx.CmdAction()), Hand: func(m *ice.Message, arg ...string) { if m.Push(HEADER, m.Cmdx(WORD, path.Join(nfs.SRC_DOCUMENT, INDEX_SHY))); len(arg) > 0 { m.Push(NAV, m.Cmdx(WORD, path.Join(nfs.SRC_DOCUMENT, path.Join(arg...), INDEX_SHY))) } diff --git a/core/wiki/portal.js b/core/wiki/portal.js index cc1d1a16..c73c7914 100644 --- a/core/wiki/portal.js +++ b/core/wiki/portal.js @@ -1,14 +1,14 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.require(["/plugin/local/wiki/word.js"]), can.Conf(html.PADDING, 40) - can.db = {nav: {}}, can.sup.onexport.link = function() { return "/wiki/portal/" } - can.db.prefix = location.pathname.indexOf("/wiki/portal/") == 0? "/wiki/portal/": "/chat/cmd/web.wiki.portal/" + can.db = {nav: {}}, can.sup.onexport.link = function() { return can.db.prefix } + can.db.prefix = location.pathname.indexOf("/chat/cmd/web.wiki.portal/") == 0? "/chat/cmd/web.wiki.portal/": "/wiki/portal/" can.db.current = can.isCmdMode()? can.base.trimPrefix(location.pathname, can.db.prefix): can.Option(nfs.PATH) can.onmotion.clear(can) can.ui = can.onappend.layout(can, [html.HEADER, [html.NAV, html.MAIN, html.ASIDE]], html.FLOW), can.onimport._scroll(can) can.ui.header.innerHTML = msg.Append(html.HEADER), can.ui.nav.innerHTML = msg.Append(html.NAV) if (msg.Append(html.NAV) == "") { can.onmotion.hidden(can, can.ui.nav), can.onmotion.hidden(can, can.ui.aside) - can.db.current == "" && can.onappend.style(can, ice.HOME), can.onimport.content(can, "content.shy") + can.base.isIn(can.db.current, "", "/") && can.onappend.style(can, ice.HOME), can.onimport.content(can, "content.shy") } else { can.page.styleWidth(can, can.ui.nav, 240), can.page.styleWidth(can, can.ui.aside, 200) can.page.ClassList.del(can, can._fields, ice.HOME)