diff --git a/base/nfs/dir.go b/base/nfs/dir.go index 64eeb0eb..ed5e0766 100644 --- a/base/nfs/dir.go +++ b/base/nfs/dir.go @@ -161,6 +161,7 @@ const ( USR_PUBLISH = ice.USR_PUBLISH USR_LOCAL = ice.USR_LOCAL USR_LOCAL_WORK = ice.USR_LOCAL_WORK + USR_IMAGE = "usr/image/" USR_LOCAL_IMAGE = "usr/local/image/" USR_LEARNING_PORTAL = "usr/learning/portal/" USR_MODULES = "usr/node_modules/" diff --git a/base/web/space.go b/base/web/space.go index 7a3d7f29..a9c4b25d 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -335,8 +335,8 @@ func init() { aaa.White(m, SPACE, ice.MAIN) if kit.IsIn(ice.Info.NodeIcon, "src/main.ico", "") { nfs.Exists(m, "src/main.ico", func(p string) { ice.Info.NodeIcon = p }) - nfs.Exists(m, "src/main.png", func(p string) { ice.Info.NodeIcon = p }) nfs.Exists(m, "src/main.jpg", func(p string) { ice.Info.NodeIcon = p }) + nfs.Exists(m, "src/main.png", func(p string) { ice.Info.NodeIcon = p }) } }}, mdb.ICONS: {Hand: func(m *ice.Message, arg ...string) { @@ -504,9 +504,10 @@ func init() { m.Options(nfs.DIR_DEEP, ice.TRUE, nfs.DIR_REG, kit.ExtReg(nfs.PNG, nfs.JPG, nfs.JPEG)) m.Cmdy(nfs.DIR, nfs.SRC, nfs.PATH) if aaa.IsTechOrRoot(m) { - m.Cmdy(nfs.DIR, ice.USR_LOCAL_IMAGE, nfs.PATH) + m.Cmdy(nfs.DIR, nfs.USR_LOCAL_IMAGE, nfs.PATH) } - m.Cmdy(nfs.DIR, ice.USR_ICONS, nfs.PATH) + m.Cmdy(nfs.DIR, nfs.USR_IMAGE, nfs.PATH) + m.Cmdy(nfs.DIR, nfs.USR_ICONS, nfs.PATH) m.CutTo(nfs.PATH, arg[0]) case ctx.INDEX, ice.CMD: m.OptionFields(ctx.INDEX) diff --git a/core/code/vimer.go b/core/code/vimer.go index d688f33a..5f9f2f1d 100644 --- a/core/code/vimer.go +++ b/core/code/vimer.go @@ -171,7 +171,7 @@ func init() { m.PushButton(kit.Dict(m.CommandKey(), "编程")) }) }}, - }, web.DreamTablesAction("编程"), ctx.ConfAction(ctx.TOOLS, "compile,runtime,xterm", web.ONLINE, ice.TRUE)), Hand: func(m *ice.Message, arg ...string) { + }, web.DreamTablesAction("编程"), ctx.ConfAction(ctx.TOOLS, "xterm,runtime,compile", web.ONLINE, ice.TRUE)), Hand: func(m *ice.Message, arg ...string) { if m.Cmdy(INNER, arg); arg[0] == ctx.ACTION { return } else if len(arg) == 1 { diff --git a/misc/git/repos.go b/misc/git/repos.go index 2360903c..e0953251 100644 --- a/misc/git/repos.go +++ b/misc/git/repos.go @@ -511,13 +511,17 @@ func init() { case INIT: m.Push(arg[0], ice.Info.Make.Remote) m.Push(arg[0], kit.MergeURL2(web.UserHost(m), web.X(path.Base(kit.Path(""))))) - m.Cmd(web.SPIDE, ice.OptionFields(web.CLIENT_ORIGIN)).Sort(web.CLIENT_ORIGIN).Table(func(value ice.Maps) { - m.Push(arg[0], value[web.CLIENT_ORIGIN]+web.X(path.Base(kit.Path("")))) + m.Cmd(web.SPIDE, ice.OptionFields(web.CLIENT_ORIGIN, web.CLIENT_TYPE)).Sort(web.CLIENT_ORIGIN).Table(func(value ice.Maps) { + if value[web.CLIENT_TYPE] == nfs.REPOS { + m.Push(arg[0], value[web.CLIENT_ORIGIN]+web.X(path.Base(kit.Path("")))) + } }) case INSTEADOF: m.Push(arg[0], kit.MergeURL2(web.UserHost(m), web.X())) - m.Cmd(web.SPIDE, ice.OptionFields(web.CLIENT_ORIGIN)).Sort(web.CLIENT_ORIGIN).Table(func(value ice.Maps) { - m.Push(arg[0], value[web.CLIENT_ORIGIN]+web.X()) + m.Cmd(web.SPIDE, ice.OptionFields(web.CLIENT_ORIGIN, web.CLIENT_TYPE)).Sort(web.CLIENT_ORIGIN).Table(func(value ice.Maps) { + if value[web.CLIENT_TYPE] == nfs.REPOS { + m.Push(arg[0], value[web.CLIENT_ORIGIN]+web.X()) + } }) default: switch arg[0] {