Some minor changes

This commit is contained in:
Unknwon 2016-03-06 16:40:04 -05:00
parent 12b5a76b0d
commit 58f0c68151
6 changed files with 90 additions and 107 deletions

View File

@ -1,6 +1,5 @@
[run] [run]
init_cmds = [ init_cmds = [
#["grep", "-rn", "FIXME", "."],
["make", "build-dev", "TAGS=sqlite"], ["make", "build-dev", "TAGS=sqlite"],
["./gogs", "web"] ["./gogs", "web"]
] ]

21
.gitignore vendored
View File

@ -8,31 +8,12 @@ data/
.idea/ .idea/
*.iml *.iml
public/img/avatar/ public/img/avatar/
files/
*.o
*.a
*.so
_obj
_test
[568vq].out
*.cgo1.go
*.cgo2.c
_cgo_defun.c
_cgo_gotypes.go
_cgo_export.*
_testmain.go
*.exe *.exe
*.exe~ *.exe~
/gogs /gogs
profile/ profile/
__pycache__
*.pem *.pem
output* output*
.brackets.json
docker/fig.yml
docker/docker/Dockerfile
docker/docker/init_gogs.sh
gogs.sublime-project gogs.sublime-project
gogs.sublime-workspace gogs.sublime-workspace
.tags* /release
release

View File

@ -53,3 +53,9 @@ clean-mac: clean
test: test:
go test -cover -race ./... go test -cover -race ./...
fixme:
grep -rnw "FIXME" routers models modules
todo:
grep -rnw "TODO" routers models modules

View File

@ -7,7 +7,6 @@ package cmd
import ( import (
"crypto/tls" "crypto/tls"
"fmt" "fmt"
gotmpl "html/template"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"net/http/fcgi" "net/http/fcgi"
@ -126,7 +125,7 @@ func newMacaron() *macaron.Macaron {
)) ))
m.Use(macaron.Renderer(macaron.RenderOptions{ m.Use(macaron.Renderer(macaron.RenderOptions{
Directory: path.Join(setting.StaticRootPath, "templates"), Directory: path.Join(setting.StaticRootPath, "templates"),
Funcs: []gotmpl.FuncMap{template.Funcs}, Funcs: template.NewFuncMap(),
IndentJSON: macaron.Env != macaron.PROD, IndentJSON: macaron.Env != macaron.PROD,
})) }))

View File

@ -1,7 +1,3 @@
Execute following command in ROOT directory when anything is changed: Execute following command in ROOT directory when anything is changed:
$ go-bindata -o=modules/bindata/bindata.go -ignore="\\.DS_Store|README.md" -pkg=bindata conf/... $ make bindata
Add -debug flag to make life easier in development(somehow isn't working):
$ go-bindata -debug -o=modules/bindata/bindata.go -ignore="\\.DS_Store|README.md" -pkg=bindata conf/...

View File

@ -22,86 +22,88 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
var Funcs template.FuncMap = map[string]interface{}{ func NewFuncMap() []template.FuncMap {
"GoVer": func() string { return []template.FuncMap{map[string]interface{}{
return strings.Title(runtime.Version()) "GoVer": func() string {
}, return strings.Title(runtime.Version())
"UseHTTPS": func() bool { },
return strings.HasPrefix(setting.AppUrl, "https") "UseHTTPS": func() bool {
}, return strings.HasPrefix(setting.AppUrl, "https")
"AppName": func() string { },
return setting.AppName "AppName": func() string {
}, return setting.AppName
"AppSubUrl": func() string { },
return setting.AppSubUrl "AppSubUrl": func() string {
}, return setting.AppSubUrl
"AppUrl": func() string { },
return setting.AppUrl "AppUrl": func() string {
}, return setting.AppUrl
"AppVer": func() string { },
return setting.AppVer "AppVer": func() string {
}, return setting.AppVer
"AppDomain": func() string { },
return setting.Domain "AppDomain": func() string {
}, return setting.Domain
"DisableGravatar": func() bool { },
return setting.DisableGravatar "DisableGravatar": func() bool {
}, return setting.DisableGravatar
"LoadTimes": func(startTime time.Time) string { },
return fmt.Sprint(time.Since(startTime).Nanoseconds()/1e6) + "ms" "LoadTimes": func(startTime time.Time) string {
}, return fmt.Sprint(time.Since(startTime).Nanoseconds()/1e6) + "ms"
"AvatarLink": base.AvatarLink, },
"Safe": Safe, "AvatarLink": base.AvatarLink,
"Str2html": Str2html, "Safe": Safe,
"TimeSince": base.TimeSince, "Str2html": Str2html,
"RawTimeSince": base.RawTimeSince, "TimeSince": base.TimeSince,
"FileSize": base.FileSize, "RawTimeSince": base.RawTimeSince,
"Subtract": base.Subtract, "FileSize": base.FileSize,
"Add": func(a, b int) int { "Subtract": base.Subtract,
return a + b "Add": func(a, b int) int {
}, return a + b
"ActionIcon": ActionIcon, },
"DateFmtLong": func(t time.Time) string { "ActionIcon": ActionIcon,
return t.Format(time.RFC1123Z) "DateFmtLong": func(t time.Time) string {
}, return t.Format(time.RFC1123Z)
"DateFmtShort": func(t time.Time) string { },
return t.Format("Jan 02, 2006") "DateFmtShort": func(t time.Time) string {
}, return t.Format("Jan 02, 2006")
"List": List, },
"Mail2Domain": func(mail string) string { "List": List,
if !strings.Contains(mail, "@") { "Mail2Domain": func(mail string) string {
return "try.gogs.io" if !strings.Contains(mail, "@") {
} return "try.gogs.io"
}
return strings.SplitN(mail, "@", 2)[1] return strings.SplitN(mail, "@", 2)[1]
}, },
"SubStr": func(str string, start, length int) string { "SubStr": func(str string, start, length int) string {
if len(str) == 0 { if len(str) == 0 {
return "" return ""
} }
end := start + length end := start + length
if length == -1 { if length == -1 {
end = len(str) end = len(str)
} }
if len(str) < end { if len(str) < end {
return str return str
} }
return str[start:end] return str[start:end]
}, },
"DiffTypeToStr": DiffTypeToStr, "DiffTypeToStr": DiffTypeToStr,
"DiffLineTypeToStr": DiffLineTypeToStr, "DiffLineTypeToStr": DiffLineTypeToStr,
"Sha1": Sha1, "Sha1": Sha1,
"ShortSha": base.ShortSha, "ShortSha": base.ShortSha,
"MD5": base.EncodeMD5, "MD5": base.EncodeMD5,
"ActionContent2Commits": ActionContent2Commits, "ActionContent2Commits": ActionContent2Commits,
"ToUtf8": ToUtf8, "ToUtf8": ToUtf8,
"EscapePound": func(str string) string { "EscapePound": func(str string) string {
return strings.Replace(strings.Replace(str, "%", "%25", -1), "#", "%23", -1) return strings.Replace(strings.Replace(str, "%", "%25", -1), "#", "%23", -1)
}, },
"RenderCommitMessage": RenderCommitMessage, "RenderCommitMessage": RenderCommitMessage,
"ThemeColorMetaTag": func() string { "ThemeColorMetaTag": func() string {
return setting.ThemeColorMetaTag return setting.ThemeColorMetaTag
}, },
}}
} }
func Safe(raw string) template.HTML { func Safe(raw string) template.HTML {