diff options
| author | Unknwon <u@gogs.io> | 2015-02-22 22:51:25 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-02-22 22:51:25 -0500 |
| commit | 7ccab9cd09eca8fa60fdd519c97c259d4b521abd (patch) | |
| tree | 914ea87da32fd27d889b2145f559c0fdad8c62af /templates/org/base | |
| parent | 25f5a8d7986a710cef01d02725071d2de0a6b143 (diff) | |
| parent | 2369881808a906f3072c935ab0575f08bd358821 (diff) | |
Merge branch 'dev' of github.com:gogits/gogs into access
Conflicts:
gogs.go
models/models.go
models/user.go
templates/.VERSION
templates/org/home.tmpl
Diffstat (limited to 'templates/org/base')
| -rw-r--r-- | templates/org/base/header.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/org/base/header.tmpl b/templates/org/base/header.tmpl index 1bbb092b..1649b920 100644 --- a/templates/org/base/header.tmpl +++ b/templates/org/base/header.tmpl @@ -2,7 +2,7 @@ <div class="container"> <a class="text-black left" href="{{AppSubUrl}}/org/{{.Org.LowerName}}"> <img class="avatar-48 left" src="{{.Org.AvatarLink}}?s=100"> - <span class="org-name">{{.Org.FullName}}</span> + <span class="org-name">{{if .Org.FullName}}{{.Org.FullName}}{{else}}{{.Org.Name}}{{end}}</span> </a> <ul class="menu menu-line container"> <li class="right"> |