From 50422f1fc226d71fe2f5f701c7ebdd1a5f2d143e Mon Sep 17 00:00:00 2001 From: Unknwon Date: Fri, 5 Aug 2016 12:12:54 -0700 Subject: [PATCH] #3348 always use relative avatar link in the template --- .github/ISSUE_TEMPLATE.md | 7 ++++--- README.md | 2 +- conf/locale/TRANSLATORS | 1 + gogs.go | 2 +- models/action.go | 2 +- models/user.go | 4 ++-- routers/user/home.go | 2 +- templates/.VERSION | 2 +- templates/base/head.tmpl | 2 +- templates/explore/users.tmpl | 2 +- templates/org/header.tmpl | 2 +- templates/org/home.tmpl | 4 ++-- templates/org/member/members.tmpl | 2 +- templates/org/team/members.tmpl | 2 +- templates/org/team/teams.tmpl | 2 +- templates/repo/commits_table.tmpl | 2 +- templates/repo/create.tmpl | 6 +++--- templates/repo/diff.tmpl | 2 +- templates/repo/forks.tmpl | 2 +- templates/repo/issue/list.tmpl | 4 ++-- templates/repo/issue/new_form.tmpl | 6 +++--- templates/repo/issue/view_content.tmpl | 18 +++++++++--------- templates/repo/migrate.tmpl | 6 +++--- templates/repo/pulls/fork.tmpl | 6 +++--- templates/repo/release/list.tmpl | 2 +- templates/repo/settings/collaboration.tmpl | 2 +- templates/repo/user_cards.tmpl | 2 +- templates/repo/view_list.tmpl | 2 +- templates/user/dashboard/issues.tmpl | 2 +- templates/user/dashboard/navbar.tmpl | 6 +++--- templates/user/meta/header.tmpl | 3 +-- templates/user/profile.tmpl | 6 +++--- 32 files changed, 58 insertions(+), 57 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index a99857436f..da434e203c 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,8 +1,9 @@ The issue will be closed without any reasons if it does not satisfy any of following requirements: -1. Please do NOT post questions or config/deploy problems on GitHub, please use our forum: https://discuss.gogs.io -2. Please take a moment to search that an issue doesn't already exist. -3. Please give all relevant information below for bug reports; incomplete details considered invalid report. +1. Please speak English, we have forum in [Chinese](https://discuss.gogs.io/c/getting-help/getting-help-chinese). +2. Please post questions or config/deploy problems on our forum: https://discuss.gogs.io, here are bugs and feature requests only. +3. Please take a moment to search that an issue doesn't already exist. +4. Please give all relevant information below for bug reports; incomplete details considered invalid report. **You MUST delete above content including this line before posting; too lazy to take this action considered invalid report.** diff --git a/README.md b/README.md index ce80c414de..fe7d0bb352 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) -##### Current tip version: 0.9.61 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions) +##### Current tip version: 0.9.62 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions) | Web | UI | Preview | |:-------------:|:-------:|:-------:| diff --git a/conf/locale/TRANSLATORS b/conf/locale/TRANSLATORS index fc1bc20d88..d353897135 100644 --- a/conf/locale/TRANSLATORS +++ b/conf/locale/TRANSLATORS @@ -31,6 +31,7 @@ ilko Ilya Makarov Jamie Mansfield Jean THOMAS +Joubert RedRat Juraj Bubniak Lafriks Lauri Ojansivu diff --git a/gogs.go b/gogs.go index 6a6328db23..dcb92ad2a7 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.9.61.0804" +const APP_VER = "0.9.62.0805" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/action.go b/models/action.go index 6e2234fda5..081f96bb2a 100644 --- a/models/action.go +++ b/models/action.go @@ -288,7 +288,7 @@ func (push *PushCommits) AvatarLink(email string) string { log.Error(4, "GetUserByEmail: %v", err) } } else { - push.avatars[email] = u.AvatarLink() + push.avatars[email] = u.RelAvatarLink() } } diff --git a/models/user.go b/models/user.go index 5e9b60addb..ac3d2e819b 100644 --- a/models/user.go +++ b/models/user.go @@ -254,11 +254,11 @@ func (u *User) RelAvatarLink() string { return setting.GravatarSource + u.Avatar } -// AvatarLink returns user avatar link. +// AvatarLink returns user avatar absolute link. func (u *User) AvatarLink() string { link := u.RelAvatarLink() if link[0] == '/' && link[1] != '/' { - return strings.TrimSuffix(setting.AppUrl, "/") + link + return setting.AppUrl + link[1:] } return link } diff --git a/routers/user/home.go b/routers/user/home.go index dab30eb5d2..95d0b582b5 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -77,7 +77,7 @@ func retrieveFeeds(ctx *context.Context, ctxUser *models.User, userID, offset in ctx.Handle(500, "GetUserByName", err) return } - unameAvatars[act.ActUserName] = u.AvatarLink() + unameAvatars[act.ActUserName] = u.RelAvatarLink() } act.ActAvatar = unameAvatars[act.ActUserName] diff --git a/templates/.VERSION b/templates/.VERSION index f60bbf6177..ef9982da04 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.9.61.0804 \ No newline at end of file +0.9.62.0805 \ No newline at end of file diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 1fb91e9aa2..5357bc2a77 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -90,7 +90,7 @@
- + {{.i18n.Tr "user_profile_and_more"}} diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl index b7eca4b024..c13ccc6977 100644 --- a/templates/explore/users.tmpl +++ b/templates/explore/users.tmpl @@ -9,7 +9,7 @@
{{range .Users}}
- +
{{.Name}} {{.FullName}}
diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl index 8fa1c2b269..0192ad7d82 100644 --- a/templates/org/header.tmpl +++ b/templates/org/header.tmpl @@ -3,7 +3,7 @@
- + {{.DisplayName}}
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index eaea98bf52..17b0ade8c9 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -3,7 +3,7 @@
- +
{{.Org.DisplayName}} @@ -48,7 +48,7 @@ {{$isMember := .IsOrganizationMember}} {{range .Members}} {{if or $isMember (.IsPublicMember $.Org.ID)}} - + {{end}} {{end}}
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index 85f7cc9048..d7514d8ba7 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -14,7 +14,7 @@ {{range .Members}}
- +
{{.Name}}
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index cd50ee4ff0..c9240beb2b 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -16,7 +16,7 @@ {{$.i18n.Tr "org.members.remove"}} {{end}} - + {{.DisplayName}}
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index 62acc2f2b0..8714181140 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -26,7 +26,7 @@
{{range .Members}} - + {{end}}
diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index 8b22228d07..03e8591f68 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -30,7 +30,7 @@ {{if .User}} -   {{.Author.Name}} +   {{.Author.Name}} {{else}}   {{.Author.Name}} {{end}} diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index c203f9508c..4b5c2eee3f 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -14,18 +14,18 @@
- + {{.ContextUser.ShortName 20}}
- + {{.SignedUser.ShortName 20}}
{{range .Orgs}}
- + {{.ShortName 20}}
{{end}} diff --git a/templates/repo/diff.tmpl b/templates/repo/diff.tmpl index 192d6fdd22..e9f12ab932 100644 --- a/templates/repo/diff.tmpl +++ b/templates/repo/diff.tmpl @@ -13,7 +13,7 @@
{{if .Author}} - + {{.Commit.Author.Name}} {{if .IsSigned}}<{{.Commit.Author.Email}}>{{end}} {{else}} diff --git a/templates/repo/forks.tmpl b/templates/repo/forks.tmpl index e8b57e1af3..461ac89c89 100644 --- a/templates/repo/forks.tmpl +++ b/templates/repo/forks.tmpl @@ -8,7 +8,7 @@
{{range .Forks}}
- +
{{.Owner.Name}} / diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index eebb0b15b0..5d4ed4fe51 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -61,7 +61,7 @@
{{.i18n.Tr "repo.issues.filter_assginee_no_select"}} {{range .Assignees}} - {{.Name}} + {{.Name}} {{end}}
@@ -121,7 +121,7 @@ {{end}} {{if .Assignee}} - + {{end}}

diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index b001e3a644..bfb97da2da 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -9,7 +9,7 @@
- +
@@ -104,7 +104,7 @@
{{.i18n.Tr "repo.issues.new.clear_assignee"}}
{{range .Assignees}} -
{{.Name}}
+
{{.Name}}
{{end}}
@@ -112,7 +112,7 @@ {{.i18n.Tr "repo.issues.new.no_assignee"}}
{{if .Assignee}} - {{.Assignee.Name}} + {{.Assignee.Name}} {{end}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index ada98d3090..b8d18205d8 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -13,7 +13,7 @@
- +
@@ -56,7 +56,7 @@ {{if eq .Type 0}}
- +
@@ -107,7 +107,7 @@
- + {{.Poster.Name}} {{$.i18n.Tr "repo.issues.reopened_at" .EventTag $createdStr | Safe}}
@@ -115,7 +115,7 @@
- + {{.Poster.Name}} {{$.i18n.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}}
@@ -123,7 +123,7 @@
- + {{.Poster.Name}} {{$.i18n.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}} @@ -199,7 +199,7 @@ {{if .IsSigned}}
- +
@@ -309,7 +309,7 @@
{{.i18n.Tr "repo.issues.new.clear_assignee"}}
{{range .Assignees}} -
{{.Name}}
+
{{.Name}}
{{end}}
@@ -317,7 +317,7 @@ {{.i18n.Tr "repo.issues.new.no_assignee"}}
{{if .Issue.Assignee}} - {{.Issue.Assignee.Name}} + {{.Issue.Assignee.Name}} {{end}}
@@ -329,7 +329,7 @@
{{range .Participants}} - + {{end}}
diff --git a/templates/repo/migrate.tmpl b/templates/repo/migrate.tmpl index 30716ee6ad..2ac3915272 100644 --- a/templates/repo/migrate.tmpl +++ b/templates/repo/migrate.tmpl @@ -39,18 +39,18 @@
- + {{.ContextUser.ShortName 20}}
- + {{.SignedUser.ShortName 20}}
{{range .Orgs}}
- + {{.ShortName 20}}
{{end}} diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl index 9cd84b3d44..431f6df236 100644 --- a/templates/repo/pulls/fork.tmpl +++ b/templates/repo/pulls/fork.tmpl @@ -14,19 +14,19 @@
- + {{.ContextUser.ShortName 20}}
- + {{.SignedUser.ShortName 20}}
{{range .Orgs}} {{if .IsOwnedBy $.SignedUser.ID}}
- + {{.ShortName 20}}
{{end}} diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index f2cdfc1ca3..b9b1b7c2f4 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -41,7 +41,7 @@

- + {{.Publisher.Name}} {{if .Created}}{{TimeSince .Created $.Lang}}{{end}} diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index f6daab5dae..edf269b471 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -14,7 +14,7 @@

- + {{.DisplayName}}
diff --git a/templates/repo/user_cards.tmpl b/templates/repo/user_cards.tmpl index 82086a6fa7..b89bbc6834 100644 --- a/templates/repo/user_cards.tmpl +++ b/templates/repo/user_cards.tmpl @@ -6,7 +6,7 @@ {{range .Cards}}
  • - +

    {{.DisplayName}}

    diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index 82fd5c92d9..4377335911 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -3,7 +3,7 @@ {{if .LastCommitUser}} - + {{.LastCommit.Author.Name}} {{else}} diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index c8d17b3cdd..38ead6127f 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -72,7 +72,7 @@ {{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.HomeLink .Poster.Name | Safe}} {{if .Assignee}} - + {{end}}

    diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index a078006ccc..02f21048ff 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -1,7 +1,7 @@
    - + {{.ContextUser.ShortName 20}} @@ -11,12 +11,12 @@
    - + {{.SignedUser.Name}} {{range .Orgs}} - + {{.ShortName 20}} {{end}} diff --git a/templates/user/meta/header.tmpl b/templates/user/meta/header.tmpl index 4982c7506a..36072e8aa1 100644 --- a/templates/user/meta/header.tmpl +++ b/templates/user/meta/header.tmpl @@ -1,13 +1,12 @@ {{with .Owner}}
    - + {{.Name}} {{with .FullName}}({{.}}){{end}}
    - {{if or $.PageIsFollowers $.PageIsFollowing}} {{if and $.IsSigned (ne $.SignedUserName .Name)}}
  • {{range .Orgs}} - + {{end}}
    • {{end}}