diff --git a/base/web/render.go b/base/web/render.go
index f85c7572..bc86ef17 100644
--- a/base/web/render.go
+++ b/base/web/render.go
@@ -11,7 +11,6 @@ import (
ice "shylinux.com/x/icebergs"
"shylinux.com/x/icebergs/base/aaa"
"shylinux.com/x/icebergs/base/ctx"
- "shylinux.com/x/icebergs/base/lex"
"shylinux.com/x/icebergs/base/mdb"
"shylinux.com/x/icebergs/base/nfs"
"shylinux.com/x/icebergs/base/tcp"
@@ -76,13 +75,11 @@ func Render(m *ice.Message, cmd string, args ...ice.Any) bool {
for _, k := range []string{"sessid", "cmds", "fields", "_option", "_handle", "_output"} {
m.Set(k)
}
-
- if cmd != "" && cmd != ice.RENDER_RAW { // [str [arg...]]
+ if cmd != "" && cmd != ice.RENDER_RAW {
m.Echo(kit.Format(cmd, args...))
}
RenderType(m.W, nfs.JSON, "")
- fmt.Fprint(m.W, m.FormatsMeta())
- // fmt.Fprint(m.W, m.FormatMeta())
+ fmt.Fprint(m.W, m.FormatMeta())
}
return true
}
@@ -149,11 +146,11 @@ func RenderIndex(m *ice.Message, repos string, file ...string) *ice.Message {
}
return m.RenderDownload(path.Join(m.Conf(SERVE, kit.Keym(repos, nfs.PATH)), kit.Select(m.Conf(SERVE, kit.Keym(repos, INDEX)), path.Join(file...))))
}
-func RenderWebsite(m *ice.Message, pod string, dir string, arg ...string) *ice.Message {
- return m.Echo(m.Cmdx(Space(m, pod), "web.chat.website", lex.PARSE, dir, arg)).RenderResult()
-}
-func RenderCmd(m *ice.Message, cmd string, arg ...ice.Any) {
- RenderPodCmd(m, "", cmd, arg...)
+func RenderMain(m *ice.Message, pod, index string, arg ...ice.Any) *ice.Message {
+ if script := m.Cmdx(Space(m, pod), nfs.CAT, kit.Select(ice.SRC_MAIN_JS, index)); script != "" {
+ return m.Echo(kit.Format(_main_template, script)).RenderResult()
+ }
+ return RenderIndex(m, ice.VOLCANOS)
}
func RenderPodCmd(m *ice.Message, pod, cmd string, arg ...ice.Any) {
msg := m.Cmd(Space(m, pod), ctx.COMMAND, kit.Select("web.wiki.word", cmd))
@@ -163,31 +160,18 @@ func RenderPodCmd(m *ice.Message, pod, cmd string, arg ...ice.Any) {
)))
m.Echo(kit.Format(_cmd_template, list)).RenderResult()
}
-func RenderMain(m *ice.Message, pod, index string, arg ...ice.Any) *ice.Message {
- if script := m.Cmdx(Space(m, pod), nfs.CAT, kit.Select(ice.SRC_MAIN_JS, index)); script != "" {
- return m.Echo(kit.Format(_main_template, script)).RenderResult()
- }
- return RenderIndex(m, ice.VOLCANOS)
+func RenderCmd(m *ice.Message, cmd string, arg ...ice.Any) {
+ RenderPodCmd(m, "", cmd, arg...)
}
-var _cmd_template = `
-
-
-
-
-
-
-
-
-`
var _main_template = `
volcanos
-
-
+
+
@@ -195,3 +179,14 @@ var _main_template = `
`
+
+var _cmd_template = `
+
+
+
+
+
+
+
+
+`
diff --git a/core/chat/pod.go b/core/chat/pod.go
index d6568a34..68fa4cd7 100644
--- a/core/chat/pod.go
+++ b/core/chat/pod.go
@@ -9,6 +9,7 @@ import (
"shylinux.com/x/icebergs/base/cli"
"shylinux.com/x/icebergs/base/ctx"
"shylinux.com/x/icebergs/base/mdb"
+ "shylinux.com/x/icebergs/base/lex"
"shylinux.com/x/icebergs/base/web"
kit "shylinux.com/x/toolkits"
)
@@ -32,8 +33,12 @@ func init() {
} else if arg[1] == CMD {
web.RenderPodCmd(m, arg[0], arg[2], arg[3:])
} else if arg[1] == WEBSITE {
- web.RenderWebsite(m, arg[0], path.Join(arg[2:]...))
+ RenderWebsite(m, arg[0], path.Join(arg[2:]...))
}
}},
})
}
+
+func RenderWebsite(m *ice.Message, pod string, dir string, arg ...string) *ice.Message {
+ return m.Echo(m.Cmdx(web.Space(m, pod), "web.chat.website", lex.PARSE, dir, arg)).RenderResult()
+}
\ No newline at end of file