mac add ctx.CGI

src/contexts/ctx.go

@@ -5,6 +5,7 @@ import ( // {{{
 	"encoding/hex"
 	"errors"
 	"fmt"
+	"html/template"
 	"io"
 	"math/rand"
 	"os"
@@ -878,10 +879,13 @@ func (m *Message) Sess(key string, arg ...string) *Message { // {{{
 // }}}
 func (m *Message) Sesss(key string, arg ...interface{}) *Message { // {{{
 	if _, ok := m.Sessions[key]; !ok && len(arg) > 0 {
-		switch msg := arg[0].(type) {
+		switch value := arg[0].(type) {
 		case *Message:
-			m.Sessions[key] = msg
+			m.Sessions[key] = value
-			return msg
+			return m.Sessions[key]
+		case *Context:
+			m.Sessions[key] = m.Spawn(value)
+			return m.Sessions[key]
 		}
 
 		root := true
@@ -1587,6 +1591,306 @@ func (m *Message) Cap(key string, arg ...string) string { // {{{
 
 // }}}
 
+var CGI = template.FuncMap{
+	"meta": func(arg ...interface{}) string { // {{{
+		if len(arg) == 0 {
+			return ""
+		}
+
+		up := ""
+
+		list := []string{}
+		switch data := arg[0].(type) {
+		case map[string][]string:
+			if len(arg) == 1 {
+				list = append(list, fmt.Sprintf("detail: %s\n", data["detail"]))
+				list = append(list, fmt.Sprintf("option: %s\n", data["option"]))
+				list = append(list, fmt.Sprintf("result: %s\n", data["result"]))
+				list = append(list, fmt.Sprintf("append: %s\n", data["append"]))
+				break
+			}
+			if key, ok := arg[1].(string); ok {
+				if list, ok = data[key]; ok {
+					arg = arg[1:]
+				} else {
+					return up
+				}
+			} else {
+				return fmt.Sprintf("%v", data)
+			}
+		case []string:
+			list = data
+		default:
+			if data == nil {
+				return ""
+			}
+			return fmt.Sprintf("%v", data)
+		}
+
+		if len(arg) == 1 {
+			return strings.Join(list, "")
+		}
+
+		index, ok := arg[1].(int)
+		if !ok {
+			return strings.Join(list, "")
+		}
+
+		if index >= len(list) {
+			return ""
+		}
+		return list[index]
+	}, // }}}
+	"sess": func(arg ...interface{}) string { // {{{
+		if len(arg) == 0 {
+			return ""
+		}
+
+		if m, ok := arg[0].(*Message); ok {
+			if len(arg) == 1 {
+				return fmt.Sprintf("%v", m)
+			}
+
+			switch which := arg[1].(type) {
+			case string:
+				m.Log("fuck", nil, "sesss %s", which)
+				m.Sesss(which, arg[2:]...)
+				return ""
+			}
+		}
+		return ""
+	}, // }}}
+
+	"ctx": func(arg ...interface{}) string { // {{{
+		if len(arg) == 0 {
+			return ""
+		}
+		if m, ok := arg[0].(*Message); ok {
+			if len(arg) == 1 {
+				return fmt.Sprintf("%v", m)
+			}
+
+			switch which := arg[1].(type) {
+			case string:
+				switch which {
+				case "name":
+					return fmt.Sprintf("%s", m.target.Name)
+				case "help":
+					return fmt.Sprintf("%s", m.target.Help)
+				case "context":
+					return fmt.Sprintf("%s", m.target.context.Name)
+				case "contexts":
+					ctx := []string{}
+					for _, v := range m.target.contexts {
+						ctx = append(ctx, fmt.Sprintf("%d", v.Name))
+					}
+					return strings.Join(ctx, " ")
+				case "time":
+					return m.time.Format("2006-01-02 15:04:05")
+				case "source":
+					return m.source.Name
+				case "target":
+					return m.target.Name
+				case "message":
+					return fmt.Sprintf("%d", m.message.code)
+				case "messages":
+				case "sessions":
+					msg := []string{}
+					for k, _ := range m.Sessions {
+						msg = append(msg, fmt.Sprintf("%s", k))
+					}
+					return strings.Join(msg, " ")
+				}
+			case int:
+			}
+		}
+		return ""
+	}, // }}}
+	"msg": func(arg ...interface{}) string { // {{{
+		if len(arg) == 0 {
+			return ""
+		}
+		if m, ok := arg[0].(*Message); ok {
+			if len(arg) == 1 {
+				return fmt.Sprintf("%v", m)
+			}
+
+			switch which := arg[1].(type) {
+			case string:
+				switch which {
+				case "code":
+					return fmt.Sprintf("%d", m.code)
+				case "time":
+					return m.time.Format("2006-01-02 15:04:05")
+				case "source":
+					return m.source.Name
+				case "target":
+					return m.target.Name
+				case "message":
+					return fmt.Sprintf("%d", m.message.code)
+				case "messages":
+					msg := []string{}
+					for _, v := range m.messages {
+						msg = append(msg, fmt.Sprintf("%d", v.code))
+					}
+					return strings.Join(msg, " ")
+				case "sessions":
+					msg := []string{}
+					for k, _ := range m.Sessions {
+						msg = append(msg, fmt.Sprintf("%s", k))
+					}
+					return strings.Join(msg, " ")
+				}
+			case int:
+			}
+		}
+		return ""
+	}, // }}}
+
+	"cap": func(arg ...interface{}) string { // {{{
+		if len(arg) == 0 {
+			return ""
+		}
+
+		if m, ok := arg[0].(*Message); ok {
+			if len(arg) == 1 {
+				return fmt.Sprintf("%v", m)
+			}
+
+			switch which := arg[1].(type) {
+			case string:
+				if len(arg) == 2 {
+					return m.Cap(which)
+				}
+
+				switch value := arg[2].(type) {
+				case string:
+					return m.Cap(which, value)
+				case int:
+					return fmt.Sprintf("%d", m.Capi(which, value))
+				case bool:
+					return fmt.Sprintf("%t", m.Caps(which, value))
+				default:
+					return m.Cap(which, fmt.Sprintf("%v", arg[2]))
+				}
+			}
+		}
+		return ""
+	}, // }}}
+	"conf": func(arg ...interface{}) string { // {{{
+		if len(arg) == 0 {
+			return ""
+		}
+
+		if m, ok := arg[0].(*Message); ok {
+			if len(arg) == 1 {
+				return fmt.Sprintf("%v", m)
+			}
+
+			switch which := arg[1].(type) {
+			case string:
+				if len(arg) == 2 {
+					return m.Conf(which)
+				}
+
+				switch value := arg[2].(type) {
+				case string:
+					return m.Conf(which, value)
+				case int:
+					return fmt.Sprintf("%d", m.Confi(which, value))
+				case bool:
+					return fmt.Sprintf("%t", m.Confs(which, value))
+				default:
+					return m.Conf(which, fmt.Sprintf("%v", arg[2]))
+				}
+			}
+		}
+		return ""
+	}, // }}}
+	"cmd": func(arg ...interface{}) string { // {{{
+		if len(arg) == 0 {
+			return ""
+		}
+
+		if m, ok := arg[0].(*Message); ok {
+			if len(arg) == 1 {
+				return fmt.Sprintf("%v", m)
+			}
+
+			msg := m.Spawn(m.Target()).Cmd(arg[1:]...)
+			return strings.Join(msg.Meta["result"], "")
+		}
+		return ""
+	}, // }}}
+
+	"detail": func(arg ...interface{}) string { // {{{
+		if len(arg) == 0 {
+			return ""
+		}
+
+		if m, ok := arg[0].(*Message); ok {
+			if len(arg) == 1 {
+				return strings.Join(m.Meta["detail"], "")
+			}
+			return m.Detail(0, arg[1:]...)
+		}
+		return ""
+	}, // }}}
+	"option": func(arg ...interface{}) string { // {{{
+		if len(arg) == 0 {
+			return ""
+		}
+
+		if m, ok := arg[0].(*Message); ok {
+			if len(arg) == 1 {
+				return fmt.Sprintf("%v", m)
+			}
+			switch which := arg[1].(type) {
+			case string:
+				if len(arg) == 2 {
+					return m.Option(which)
+				}
+
+				return m.Option(which, arg[2:]...)
+			}
+		}
+		return ""
+	}, // }}}
+	"result": func(arg ...interface{}) string { // {{{
+		if len(arg) == 0 {
+			return ""
+		}
+
+		if m, ok := arg[0].(*Message); ok {
+			if len(arg) == 1 {
+				return strings.Join(m.Meta["result"], "")
+			}
+			return m.Result(0, arg[1:]...)
+		}
+		return ""
+	}, // }}}
+	"append": func(arg ...interface{}) string { // {{{
+		if len(arg) == 0 {
+			return ""
+		}
+
+		if m, ok := arg[0].(*Message); ok {
+			if len(arg) == 1 {
+				return fmt.Sprintf("%v", m)
+			}
+			switch which := arg[1].(type) {
+			case string:
+				if len(arg) == 2 {
+					return m.Append(which)
+				}
+
+				return m.Append(which, arg[2:]...)
+			}
+		}
+		return ""
+	}, // }}}
+}
+
 var Pulse = &Message{
 	code:     0,
 	time:     time.Now(),

src/contexts/web/web.go

@@ -85,89 +85,6 @@ type WEB struct {
 	*ctx.Context
 }
 
-var funcmap = template.FuncMap{
-	"meta": func(arg ...interface{}) string { // {{{
-		if len(arg) == 0 {
-			return ""
-		}
-
-		up := ""
-
-		list := []string{}
-		switch data := arg[0].(type) {
-		case map[string][]string:
-			if len(arg) == 1 {
-				list = append(list, fmt.Sprintf("detail: %s\n", data["detail"]))
-				list = append(list, fmt.Sprintf("option: %s\n", data["option"]))
-				list = append(list, fmt.Sprintf("result: %s\n", data["result"]))
-				list = append(list, fmt.Sprintf("append: %s\n", data["append"]))
-				break
-			}
-			if key, ok := arg[1].(string); ok {
-				if list, ok = data[key]; ok {
-					arg = arg[1:]
-				} else {
-					return up
-				}
-			} else {
-				return fmt.Sprintf("%v", data)
-			}
-		case []string:
-			list = data
-		default:
-			if data == nil {
-				return ""
-			}
-			return fmt.Sprintf("%v", data)
-		}
-
-		if len(arg) == 1 {
-			return strings.Join(list, "")
-		}
-
-		index, ok := arg[1].(int)
-		if !ok {
-			return strings.Join(list, "")
-		}
-
-		if index >= len(list) {
-			return ""
-		}
-		return list[index]
-	}, // }}}
-	"msg": func(arg ...interface{}) string { // {{{
-		if len(arg) == 0 {
-			return ""
-		}
-		if m, ok := arg[0].(*ctx.Message); ok {
-			if len(arg) == 1 {
-				return fmt.Sprintf("%v", m)
-			}
-
-			switch action := arg[1].(type) {
-			case string:
-				switch action {
-				case "option":
-					if len(arg) == 2 {
-						return fmt.Sprintf("%v", m.Meta["option"])
-					}
-
-					key, _ := arg[2].(string)
-					if len(arg) == 3 {
-						return m.Option(key)
-					}
-					value, _ := arg[3].(string)
-					if len(arg) == 4 {
-						return m.Option(key, value)
-					}
-				}
-			case int:
-			}
-		}
-		return ""
-	}, // }}}
-}
-
 func (web *WEB) generate(m *ctx.Message, uri string, arg ...string) string { // {{{
 	add, e := url.Parse(uri)
 	m.Assert(e)
@@ -446,17 +363,22 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心",
 		"count": &ctx.Cache{Name: "count", Value: "0", Help: "主机协议"},
 	},
 	Configs: map[string]*ctx.Config{
-		"protocol":     &ctx.Config{Name: "protocol", Value: "", Help: "主机协议"},
+		"protocol": &ctx.Config{Name: "protocol", Value: "", Help: "主机协议"},
-		"hostname":     &ctx.Config{Name: "hostname", Value: "", Help: "主机地址"},
+		"hostname": &ctx.Config{Name: "hostname", Value: "", Help: "主机地址"},
-		"port":         &ctx.Config{Name: "port", Value: "", Help: "主机端口"},
+		"port":     &ctx.Config{Name: "port", Value: "", Help: "主机端口"},
-		"dir":          &ctx.Config{Name: "dir", Value: "/", Help: "主机路由"},
+		"dir":      &ctx.Config{Name: "dir", Value: "/", Help: "主机路由"},
-		"file":         &ctx.Config{Name: "file", Value: "", Help: "主机文件"},
+		"file":     &ctx.Config{Name: "file", Value: "", Help: "主机文件"},
-		"query":        &ctx.Config{Name: "query", Value: "", Help: "主机参数"},
+		"query":    &ctx.Config{Name: "query", Value: "", Help: "主机参数"},
-		"output":       &ctx.Config{Name: "output", Value: "stdout", Help: "响应输出"},
+		"output":   &ctx.Config{Name: "output", Value: "stdout", Help: "响应输出"},
-		"editor":       &ctx.Config{Name: "editor", Value: "vim", Help: "响应编辑器"},
+		"editor":   &ctx.Config{Name: "editor", Value: "vim", Help: "响应编辑器"},
-		"upload_tpl":   &ctx.Config{Name: "upload_tpl", Value: "upload.html", Help: "上传文件路径"},
+
-		"travel_tpl":   &ctx.Config{Name: "travel_tpl", Value: "travel.html", Help: "上传文件路径"},
+		"template_dir": &ctx.Config{Name: "template_dir", Value: "usr/template/", Help: "通用模板路径"},
-		"template_dir": &ctx.Config{Name: "template_dir", Value: "usr/template/", Help: "上传文件路径"},
+		"common_tmpl":  &ctx.Config{Name: "common_tmpl", Value: "common/*.html", Help: "通用模板路径"},
+		"common_main":  &ctx.Config{Name: "common_main", Value: "main.html", Help: "通用模板框架"},
+		"upload_tmpl":  &ctx.Config{Name: "upload_tmpl", Value: "upload.html", Help: "上传文件模板"},
+		"upload_main":  &ctx.Config{Name: "upload_main", Value: "main.html", Help: "上传文件框架"},
+		"travel_tmpl":  &ctx.Config{Name: "travel_tmpl", Value: "travel.html", Help: "浏览模块模板"},
+		"travel_main":  &ctx.Config{Name: "travel_main", Value: "main.html", Help: "浏览模块框架"},
 	},
 	Commands: map[string]*ctx.Command{
 		"serve": &ctx.Command{Name: "serve [directory [address [protocol]]]", Help: "开启应用服务", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) {
@@ -689,6 +611,7 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心",
 				m.Option("file", m.Cap("directory"))
 			}
 
+			// 权限检查
 			m.Option("right", "")
 			m.Option("message", "")
 			aaa := m.Find("aaa").Cmd("login", m.Option("sessid"))
@@ -697,46 +620,49 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心",
 				m.Option("message", "login failure")
 			} else {
 				m.Option("username", aaa.Result(0))
-				msg := m.Spawn(m.Target())
+				msg := m.Spawn(m.Target()).Cmd("right", "check", aaa.Cap("group"), "command", "/upload", "file", m.Option("file"))
-				msg.Cmd("right", "check", aaa.Cap("group"), "command", "/upload", "file", m.Option("file"))
 				if msg.Result(0) == "ok" {
 					m.Option("right", aaa.Cap("group"))
 				} else {
-					m.Option("message", "your do not have the right of", m.Option("file"))
+					m.Option("message", "your do not have the right of ", m.Option("file"))
 				}
 			}
 
 			if m.Option("method") == "POST" {
 				if !m.Options("right") {
-					m.Echo("you do not have the rightt, please contact manager!")
 					return
 				}
 
-				if m.Options("notshareto") {
+				if m.Options("notshareto") { // 取消共享
 					msg := m.Spawn(m.Target())
 					msg.Cmd("right", "del", m.Option("notshareto"), "command", "/upload", "file", m.Option("sharefile"))
 					m.Append("link", "hello")
 					return
-				} else if m.Options("shareto") {
+				} else if m.Options("shareto") { //共享目录
 					msg := aaa.Spawn(m.Target())
 					msg.Sesss("aaa", aaa)
 					msg.Cmd("right", "add", m.Option("shareto"), "command", "/upload", "file", m.Option("sharefile"))
 					m.Append("link", "hello")
 					return
-				} else if m.Options("content") {
+				} else if m.Options("filename") { //添加文件或目录
 					name := path.Join(m.Option("file"), m.Option("filename"))
 					if _, e := os.Stat(name); e != nil {
-						f, e := os.Create(name)
+						if m.Options("content") {
-						m.Assert(e)
+							f, e := os.Create(name)
-						defer f.Close()
+							m.Assert(e)
+							defer f.Close()
 
-						_, e = f.WriteString(m.Option("content"))
+							_, e = f.WriteString(m.Option("content"))
-						m.Assert(e)
+							m.Assert(e)
-						m.Option("message", name, "upload success!")
+						} else {
+							e = os.Mkdir(name, 0766)
+							m.Assert(e)
+						}
+						m.Option("message", name, " create success!")
 					} else {
 						m.Option("message", name, "already exist!")
 					}
-				} else {
+				} else { //上传文件
 					file, header, e := r.FormFile("file")
 					m.Assert(e)
 
@@ -756,71 +682,36 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心",
 				}
 			}
 
-			tmpl := template.Must(template.Must(template.New("fuck").Funcs(funcmap).ParseGlob(m.Conf("template_dir") + "/common/*.html")).ParseGlob(m.Conf("template_dir") + "upload.html"))
+			// 解析模板
-			m.Assert(tmpl)
+			tmpl := template.Must(template.New("fuck").Funcs(ctx.CGI).ParseGlob(path.Join(m.Conf("template_dir"), m.Conf("common_tmpl"))))
+			tmpl = template.Must(tmpl.ParseGlob(path.Join(m.Conf("template_dir"), m.Conf("upload_tmpl"))))
+			defer func() {
+				w.Header().Add("Content-Type", "text/html")
+				m.Assert(tmpl.ExecuteTemplate(w, m.Conf("upload_main"), m))
+			}()
 
 			if !m.Options("right") {
-				w.Header().Add("Content-Type", "text/html")
+				m.Option("title", "login")
-				tmpl.ExecuteTemplate(w, "head", m.Meta)
+				m.Option("tmpl", "login")
-				tmpl.ExecuteTemplate(w, "login", m.Meta)
-				tmpl.ExecuteTemplate(w, "message", m.Meta)
-				tmpl.ExecuteTemplate(w, "tail", m.Meta)
 				return
 			}
 
+			// 输出文件
 			s, e := os.Stat(m.Option("file"))
 			if m.Assert(e); !s.IsDir() {
 				http.ServeFile(w, r, m.Option("file"))
 				return
 			}
 
-			fs, e := ioutil.ReadDir(m.Option("file"))
+			// 共享列表
-			m.Assert(e)
+			share := m.Sesss("share", m.Target())
-
-			max := true
-			if i, e := strconv.Atoi(m.Option("order")); e == nil {
-				max = i%2 == 1
-			}
-
-			m.Option("sort", "")
-			m.Option("reverse", "")
-			switch m.Option("list") {
-			case "time":
-				if max {
-					m.Option("sort", "time")
-					sort.Sort(listtime(fs))
-				} else {
-					m.Option("reverse", "time")
-					sort.Sort(sort.Reverse(listtime(fs)))
-				}
-			case "size":
-				if max {
-					m.Option("sort", "size")
-					sort.Sort(listsize(fs))
-				} else {
-					m.Option("reverse", "size")
-					sort.Sort(sort.Reverse(listsize(fs)))
-				}
-			case "name":
-				if max {
-					m.Option("sort", "name")
-					sort.Sort(listname(fs))
-				} else {
-					m.Option("reverse", "name")
-					sort.Sort(sort.Reverse(listname(fs)))
-				}
-			}
-
-			share := m.Spawn(m.Target())
 			index := share.Target().Index
 			if index != nil && index[m.Option("right")] != nil {
 				for k, v := range index[m.Option("right")].Index {
 					for i, j := range v.Commands {
 						for v, n := range j.Shares {
 							for _, nn := range n {
-								match, e := regexp.MatchString(nn, m.Option("file"))
+								if match, e := regexp.MatchString(nn, m.Option("file")); m.Assert(e) && match {
-								m.Assert(e)
-								if match {
 									share.Add("append", "group", k)
 									share.Add("append", "command", i)
 									share.Add("append", "argument", v)
@@ -833,16 +724,61 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心",
 				}
 			}
 
-			list := m.Spawn(m.Target())
+			// 输出目录
+			fs, e := ioutil.ReadDir(m.Option("file"))
+			m.Assert(e)
+			fs = append(fs, s)
+			list := m.Sesss("list", m.Target())
 			list.Option("file", m.Option("file"))
+
+			// 目录排序
+			max := true
+			if i, e := strconv.Atoi(m.Option("order")); e == nil {
+				max = i%2 == 1
+			}
+			list.Option("sort", "")
+			list.Option("reverse", "")
+			switch m.Option("list") {
+			case "time":
+				if max {
+					list.Option("sort", "time")
+					sort.Sort(listtime(fs))
+				} else {
+					list.Option("reverse", "time")
+					sort.Sort(sort.Reverse(listtime(fs)))
+				}
+			case "size":
+				if max {
+					list.Option("sort", "size")
+					sort.Sort(listsize(fs))
+				} else {
+					list.Option("reverse", "size")
+					sort.Sort(sort.Reverse(listsize(fs)))
+				}
+			case "name":
+				if max {
+					list.Option("sort", "name")
+					sort.Sort(listname(fs))
+				} else {
+					list.Option("reverse", "name")
+					sort.Sort(sort.Reverse(listname(fs)))
+				}
+			}
+
 			for _, v := range fs {
 				name := v.Name()
+				if v == s {
+					if name == m.Option("file") {
+						continue
+					}
+					name = ".."
+				} else if name[0] == '.' {
+					continue
+				}
+
 				if v.IsDir() {
 					name += "/"
 				}
-				if name[0] == '.' {
-					continue
-				}
 
 				list.Add("append", "time", v.ModTime().Format("2006-01-02 15:04:05"))
 				list.Add("append", "size", kit.FmtSize(v.Size()))
@@ -850,28 +786,20 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心",
 				list.Add("append", "path", path.Join(m.Option("file"), name))
 			}
 
-			w.Header().Add("Content-Type", "text/html")
+			// 执行命令
-			tmpl.ExecuteTemplate(w, "head", m.Meta)
-			if m.Options("message") {
-				tmpl.ExecuteTemplate(w, "message", m.Meta)
-			}
-
-			tmpl.ExecuteTemplate(w, "userinfo", m.Meta)
-			tmpl.ExecuteTemplate(w, "share", share)
-			tmpl.ExecuteTemplate(w, "list", list.Meta)
-
 			switch m.Option("cmd") {
 			case "git":
+				git := m.Sesss("git", m.Target())
+
 				branch := m.Find("nfs").Cmd("git", "-C", m.Option("file"), "branch")
-				m.Option("branch", branch.Result(0))
+				git.Option("branch", branch.Result(0))
+
 				status := m.Find("nfs").Cmd("git", "-C", m.Option("file"), "status")
-				m.Option("status", status.Result(0))
+				git.Option("status", status.Result(0))
-				tmpl.ExecuteTemplate(w, "git", m.Meta)
 			}
 
-			tmpl.ExecuteTemplate(w, "upload", m.Meta)
+			m.Option("title", "upload")
-			tmpl.ExecuteTemplate(w, "create", m.Meta)
+			m.Option("tmpl", "userinfo", "share", "list", "git", "upload", "create")
-			tmpl.ExecuteTemplate(w, "tail", m.Meta)
 			// }}}
 		}},
 		"/travel": &ctx.Command{Name: "/travel", Help: "文件上传", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) {
@@ -932,7 +860,7 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心",
 			}
 
 			w.Header().Add("Content-Type", "text/html")
-			tmpl := template.Must(template.Must(template.New("fuck").Funcs(funcmap).ParseGlob(m.Conf("template_dir") + "/common/*.html")).ParseGlob(m.Conf("template_dir") + "travel.html"))
+			tmpl := template.Must(template.Must(template.New("fuck").Funcs(ctx.CGI).ParseGlob(m.Conf("template_dir") + "/common/*.html")).ParseGlob(m.Conf("template_dir") + "travel.html"))
 			m.Assert(tmpl)
 
 			m.Assert(tmpl.ExecuteTemplate(w, "head", m.Meta))
@@ -984,13 +912,16 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心",
 			w := m.Data["response"].(http.ResponseWriter)
 
 			w.Header().Add("Content-Type", "text/html")
-			tmpl := template.Must(template.New("fuck").Funcs(funcmap).ParseGlob(m.Conf("template_dir") + "/common/*.html"))
+			tmpl := template.Must(template.New("fuck").Funcs(ctx.CGI).ParseGlob(m.Conf("template_dir") + "/common/*.html"))
 			m.Assert(tmpl)
 
 			m.Option("message", "hello")
 			tmpl.ExecuteTemplate(w, "head", m)
 			tmpl.ExecuteTemplate(w, "tail", m.Meta)
 		}},
+		"hi": &ctx.Command{Name: "hi", Help: "应用示例", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) {
+			m.Echo("hello")
+		}},
 	},
 }
 

usr/template/common/base.html

@@ -2,6 +2,7 @@
 <!DOCTYPE html>
 <head>
 <meta charset="UTF-8">
+<title>{{meta .title}}</title>
 <style>
 	legend {
 		font-size:16px;
@@ -10,6 +11,8 @@
 	th {
 		cursor:pointer;
 		background-color:lightgray;
+		padding-left: 10px;
+		padding-right: 10px;
 	}
 	code {
 		font-size:14px;

usr/template/common/main.html

@@ -0,0 +1,9 @@
+{{$msg := .}}
+{{$meta := .Meta}}
+
+{{template "head" $meta}}
+{{if meta $meta.message}}
+	{{template "message" $meta}}
+{{end}}
+{{template "main" $msg}}
+{{template "tail" $meta}}

usr/template/upload.html

@@ -1,12 +1,3 @@
-{{define "git"}}
-<fieldset><legend>branch</legend>
-	<pre>{{index . "branch"}}</pre>
-</fieldset>
-<fieldset><legend>status</legend>
-	<pre>{{index . "status"}}</pre>
-</fieldset>
-{{end}}
-
 {{define "list"}}
 <fieldset><legend><input type="text" id="dir" value="{{meta .file}}" onkeydown="return Change(event)"></legend>
 	<table>
@@ -83,6 +74,15 @@
 </script>
 {{end}}
 
+{{define "git"}}
+<fieldset><legend>branch</legend>
+	<pre>{{index . "branch"}}</pre>
+</fieldset>
+<fieldset><legend>status</legend>
+	<pre>{{index . "status"}}</pre>
+</fieldset>
+{{end}}
+
 {{define "upload"}}
 <fieldset><legend>upload</legend>
 	<form method="POST" action="/upload" enctype="multipart/form-data">
@@ -96,8 +96,33 @@
 	<form method="POST" action="/upload">
 		<table>
 			<tr><td>filename:</td><td><input type="text" name="filename" required><input type="submit"></td></tr>
-			<tr><td>content:</td><td><textarea rows="5" cols="80" name="content" required></textarea></td></tr>
+			<tr><td>content:</td><td><textarea rows="5" cols="80" name="content"></textarea></td></tr>
 		</table>
 	</form>
 </fieldset>
 {{end}}
+
+{{define "main"}}
+{{$msg := .}}
+{{$meta := .Meta}}
+{{range .Meta.tmpl}}
+	{{if eq . "login"}}
+		{{template "login" $meta}}
+	{{else if eq . "userinfo"}}
+		{{template "userinfo" $meta}}
+	{{else if eq . "share"}}
+		{{template "share" $msg.Sessions.share}}
+	{{else if eq . "list"}}
+		{{template "list" $msg.Sessions.list.Meta}}
+	{{else if eq . "git"}}
+		{{if $msg.Sessions.git}}
+			{{template "git" $msg.Sessions.git.Meta}}
+		{{end}}
+	{{else if eq . "upload"}}
+		{{template "upload" $meta}}
+	{{else if eq . "create"}}
+		{{template "create" $meta}}
+	{{end}}
+{{end}}
+{{end}}
+