diff --git a/base/web/dream.go b/base/web/dream.go index 70baa7c4..04890e89 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -28,6 +28,7 @@ func _dream_list(m *ice.Message) *ice.Message { return } if space, ok := list[value[mdb.NAME]]; ok { + value[mdb.HELP] = space[mdb.HELP] value[ice.MAIN] = space[ice.MAIN] value[mdb.ICONS] = space[mdb.ICONS] m.Push("", value, kit.Slice(head, 0, -1)) @@ -483,7 +484,7 @@ func init() { m.Cmdy(nfs.CAT, "go.work") }}, }, StatsAction(), DreamAction(), DreamTablesAction(), mdb.ImportantHashAction( - mdb.SHORT, mdb.NAME, mdb.FIELD, "time,name,main,icons,repos,binary,template,restart,access", + mdb.SHORT, mdb.NAME, mdb.FIELD, "time,name,help,main,icons,repos,binary,template,restart,access", html.BUTTON, kit.JoinWord(PORTAL, DESKTOP, ADMIN, WORD, VIMER, STATUS, COMPILE, XTERM, DREAM), )), Hand: func(m *ice.Message, arg ...string) { if len(arg) == 0 { diff --git a/base/web/space.go b/base/web/space.go index 7ad8018c..600afd4c 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -49,7 +49,9 @@ func _space_qrcode(m *ice.Message, dev string) { func _space_dial(m *ice.Message, dev, name string, arg ...string) { msg := m.Cmd(SPIDE, dev) origin := msg.Append(CLIENT_ORIGIN) - u := kit.ParseURL(kit.MergeURL2(strings.Replace(origin, HTTP, "ws", 1), PP(SPACE), mdb.TYPE, ice.Info.NodeType, mdb.NAME, name, TOKEN, msg.Append(TOKEN), mdb.ICONS, ice.Info.NodeIcon, + u := kit.ParseURL(kit.MergeURL2(strings.Replace(origin, HTTP, "ws", 1), PP(SPACE), mdb.TYPE, ice.Info.NodeType, mdb.NAME, name, + mdb.HELP, ice.Info.Titles, + TOKEN, msg.Append(TOKEN), mdb.ICONS, ice.Info.NodeIcon, ice.MAIN, ice.Info.NodeMain, mdb.TIME, ice.Info.Make.Time, nfs.MODULE, ice.Info.Make.Module, nfs.VERSION, ice.Info.Make.Versions(), cli.GOOS, runtime.GOOS, cli.GOARCH, runtime.GOARCH, arg)) args := kit.SimpleKV("type,name,host,port", u.Scheme, dev, u.Hostname(), kit.Select(kit.Select(tcp.PORT_443, tcp.PORT_80, u.Scheme == "ws"), u.Port())) gdb.Go(m, func() { @@ -103,7 +105,7 @@ func _space_fork(m *ice.Message) { safe = aaa.IsTechOrRoot(m) } } - args := kit.Simple(mdb.TYPE, m.Option(mdb.TYPE), mdb.NAME, name, mdb.TEXT, text, m.OptionSimple(mdb.ICONS, mdb.TIME, nfs.MODULE, nfs.VERSION, cli.DAEMON, "main")) + args := kit.Simple(mdb.TYPE, m.Option(mdb.TYPE), mdb.NAME, name, mdb.TEXT, text, m.OptionSimple(mdb.HELP, mdb.ICONS, mdb.TIME, nfs.MODULE, nfs.VERSION, cli.DAEMON, "main")) args = append(args, aaa.USERNICK, m.Option(ice.MSG_USERNICK), aaa.USERNAME, m.Option(ice.MSG_USERNAME), aaa.USERROLE, m.Option(ice.MSG_USERROLE)) args = append(args, cli.SYSTEM, m.Option(cli.GOOS)) args = append(args, ParseUA(m)...) @@ -445,7 +447,7 @@ func init() { }}, nfs.PS: {Hand: func(m *ice.Message, arg ...string) { _space_fork(m) }}, }, gdb.EventsAction(SPACE_LOGIN), mdb.HashAction(mdb.LIMIT, 1000, mdb.LEAST, 500, - mdb.SHORT, mdb.NAME, mdb.FIELD, "time,type,name,text,main,icons,module,version,agent,system,ip,usernick,username,userrole", + mdb.SHORT, mdb.NAME, mdb.FIELD, "time,type,name,help,text,main,icons,module,version,agent,system,ip,usernick,username,userrole", ctx.ACTION, OPEN, REDIAL, kit.Dict("a", 1000, "b", 100, "c", 1000), ), mdb.ClearOnExitHashAction()), Hand: func(m *ice.Message, arg ...string) { if len(arg) < 2 {