lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-12-22 23:10:49 +00:00
Code Issues Releases Activity

move the template related fun to template.go

Browse Source
This commit is contained in:
astaxie 2015-09-07 19:21:55 +08:00
parent 85d8ec5ca6
commit 284dfc0843
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
beego.go
View File

@ -100,30 +100,3 @@ func initBeforeHttpRun() {
}
}
}
// SetViewsPath sets view directory path in beego application.
func SetViewsPath(path string) *App {
ViewsPath = path
return BeeApp
}
// SetStaticPath sets static directory path and proper url pattern in beego application.
// if beego.SetStaticPath("static","public"), visit /static/* to load static file in folder "public".
func SetStaticPath(url string, path string) *App {
if !strings.HasPrefix(url, "/") {
url = "/" + url
}
url = strings.TrimRight(url, "/")
StaticDir[url] = path
return BeeApp
}
// DelStaticPath removes the static folder setting in this url pattern in beego application.
func DelStaticPath(url string) *App {
if !strings.HasPrefix(url, "/") {
url = "/" + url
}
url = strings.TrimRight(url, "/")
delete(StaticDir, url)
return BeeApp
}

31
template.go
View File

@ -128,7 +128,7 @@ func AddTemplateExt(ext string) {
// build all template files in a directory.
// it makes beego can render any template file in view directory.
func BuildTemplate(dir string, files... string) error {
func BuildTemplate(dir string, files ...string) error {
if _, err := os.Stat(dir); err != nil {
if os.IsNotExist(err) {
return nil
@ -149,7 +149,7 @@ func BuildTemplate(dir string, files... string) error {
}
for _, v := range self.files {
for _, file := range v {
if (len(files) == 0 || utils.InSlice(file, files)) {
if len(files) == 0 || utils.InSlice(file, files) {
t, err := getTemplate(self.root, file, v...)
if err != nil {
Trace("parse template err:", file, err)
@ -263,3 +263,30 @@ func _getTemplate(t0 *template.Template, root string, submods [][]string, others
}
return
}
// SetViewsPath sets view directory path in beego application.
func SetViewsPath(path string) *App {
ViewsPath = path
return BeeApp
}
// SetStaticPath sets static directory path and proper url pattern in beego application.
// if beego.SetStaticPath("static","public"), visit /static/* to load static file in folder "public".
func SetStaticPath(url string, path string) *App {
if !strings.HasPrefix(url, "/") {
url = "/" + url
}
url = strings.TrimRight(url, "/")
StaticDir[url] = path
return BeeApp
}
// DelStaticPath removes the static folder setting in this url pattern in beego application.
func DelStaticPath(url string) *App {
if !strings.HasPrefix(url, "/") {
url = "/" + url
}
url = strings.TrimRight(url, "/")
delete(StaticDir, url)
return BeeApp
}