diff --git a/core/wiki/field.go b/core/wiki/field.go index 66dde5fc..f90d2bc7 100644 --- a/core/wiki/field.go +++ b/core/wiki/field.go @@ -31,7 +31,6 @@ func _field_show(m *ice.Message, name, text string, arg ...string) { }) meta[mdb.NAME], meta[mdb.INDEX] = name, text _wiki_template(m.Options(mdb.META, kit.Format(meta)), "", name, text) - m.Debug("what %v", m.Result()) } const FIELD = "field" diff --git a/core/wiki/portal.css b/core/wiki/portal.css index 2df06a89..8c29ec8c 100644 --- a/core/wiki/portal.css +++ b/core/wiki/portal.css @@ -5,7 +5,7 @@ fieldset.web.wiki.portal>div.output>div.header div.story[data-name=navmenu] { di fieldset.web.wiki.portal>div.output>div.header div.story[data-name=navmenu] div.item { padding:20px; height:var(--portal-header-height); } fieldset.web.wiki.portal>div.output>div.header div.story[data-name=navmenu] div.item.space { padding:0px; margin:0 40px; } fieldset.web.wiki.portal>div.output>div.layout { display:flex; justify-content:center; } -fieldset.web.wiki.portal>div.output>div.layout>div.nav { padding:40px 40px; border-right:var(--plugin-border-color) solid 1px; min-width:240px; overflow:auto; } +fieldset.web.wiki.portal>div.output>div.layout>div.nav { padding:40px 40px; border-right:var(--plugin-border-color) solid 1px; min-width:230px; overflow:auto; } fieldset.web.wiki.portal>div.output>div.layout>div.nav div.story[data-name=navmenu] div.item { padding:5px; } fieldset.web.wiki.portal>div.output>div.layout>div.nav div.story[data-name=navmenu] div.list { padding-left:20px; } fieldset.web.wiki.portal>div.output>div.layout>div.main { padding:40px; height:600px; min-width:400px; max-width:var(--portal-max-width); overflow:auto; } diff --git a/core/wiki/portal.js b/core/wiki/portal.js index b9b1778b..7f8acd59 100644 --- a/core/wiki/portal.js +++ b/core/wiki/portal.js @@ -10,7 +10,8 @@ Volcanos(chat.ONIMPORT, { can.onmotion.hidden(can, can.ui.nav), can.onmotion.hidden(can, can.ui.aside) 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.styleWidth(can, can.ui.nav, 230), can.page.styleWidth(can, can.ui.aside, 200) + if (can.ConfWidth() < 1000) { can.onmotion.hidden(can, can.ui.aside) } can.page.ClassList.del(can, can._fields, ice.HOME) } can.isCmdMode() || can.onimport.layout(can, can.ConfHeight(), can.ConfWidth()) diff --git a/core/wiki/spark.go b/core/wiki/spark.go index 6f50044b..177a61cb 100644 --- a/core/wiki/spark.go +++ b/core/wiki/spark.go @@ -97,10 +97,7 @@ func init() { _spark_tabs(m, arg...) } else { arg = _name(m, arg) - meta := kit.Dict() - kit.For(arg[2:], func(k, v string) { kit.Value(meta, k, v) }) - m.Option(mdb.META, kit.Format(meta)) - if arg[0] == "shell" && meta["with"] == "echo" { + if arg[0] == "shell" && len(arg) > 3 && arg[2] == "with" && arg[3] == "echo" { m.Option("echo", m.Cmdx(cli.SYSTEM, kit.Split(arg[1]))) } _spark_show(m, arg[0], strings.TrimSpace(arg[1]), arg[2:]...) diff --git a/core/wiki/wiki.go b/core/wiki/wiki.go index ad37ecf7..114d117e 100644 --- a/core/wiki/wiki.go +++ b/core/wiki/wiki.go @@ -25,7 +25,8 @@ func _option(m *ice.Message, kind, name, text string, arg ...string) *ice.Messag kit.If(k == "bg", func() { k = "style.background" }) kit.Value(extra, k, kit.Format(kit.Parse(nil, "", kit.Split(v)...))) }) - return m.Options(mdb.TYPE, kind, mdb.NAME, name, mdb.TEXT, text, mdb.EXTRA, kit.Format(extra)) + m.OptionDefault(mdb.META, kit.Format(extra)) + return m.Options(mdb.TYPE, kind, mdb.NAME, name, mdb.TEXT, text) } func _wiki_path(m *ice.Message, arg ...string) string { return path.Join(mdb.Config(m, nfs.PATH), path.Join(arg...))