From 1f2e173a745da8e4b57f96b5561a3c10054d3b76 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sun, 24 Jul 2016 01:08:22 +0800 Subject: Refactor User.Id to User.ID --- templates/.VERSION | 2 +- templates/admin/base/page.tmpl | 2 +- templates/admin/base/search.tmpl | 2 +- templates/admin/org/list.tmpl | 2 +- templates/admin/user/edit.tmpl | 2 +- templates/admin/user/list.tmpl | 4 ++-- templates/explore/page.tmpl | 2 +- templates/explore/search.tmpl | 2 +- templates/mail/issue/mention.tmpl | 2 +- templates/org/home.tmpl | 4 ++-- templates/org/member/members.tmpl | 14 +++++++------- templates/org/team/members.tmpl | 4 ++-- templates/org/team/repositories.tmpl | 2 +- templates/org/team/sidebar.tmpl | 6 +++--- templates/org/team/teams.tmpl | 6 +++--- templates/repo/create.tmpl | 6 +++--- templates/repo/issue/list.tmpl | 2 +- templates/repo/issue/new_form.tmpl | 4 ++-- templates/repo/issue/view_content.tmpl | 14 +++++++------- templates/repo/issue/view_title.tmpl | 6 +++--- templates/repo/migrate.tmpl | 6 +++--- templates/repo/pulls/fork.tmpl | 8 ++++---- templates/repo/settings/collaboration.tmpl | 4 ++-- templates/repo/user_cards.tmpl | 2 +- templates/user/dashboard/navbar.tmpl | 4 ++-- templates/user/meta/followers.tmpl | 2 +- templates/user/meta/header.tmpl | 4 ++-- templates/user/profile.tmpl | 2 +- 28 files changed, 60 insertions(+), 60 deletions(-) (limited to 'templates') diff --git a/templates/.VERSION b/templates/.VERSION index 82c3ae6a..a02c7ea3 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.9.52.0723 \ No newline at end of file +0.9.53.0724 \ No newline at end of file diff --git a/templates/admin/base/page.tmpl b/templates/admin/base/page.tmpl index b689ed08..564d7dec 100644 --- a/templates/admin/base/page.tmpl +++ b/templates/admin/base/page.tmpl @@ -20,4 +20,4 @@ {{end}} - {{end}} \ No newline at end of file + {{end}} diff --git a/templates/admin/base/search.tmpl b/templates/admin/base/search.tmpl index 29026a11..22634354 100644 --- a/templates/admin/base/search.tmpl +++ b/templates/admin/base/search.tmpl @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index 8560d021..6b9423d0 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -27,7 +27,7 @@ {{range .Users}} - {{.Id}} + {{.ID}} {{.Name}} {{.NumTeams}} {{.NumMembers}} diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 78088d1a..bed3097a 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -102,7 +102,7 @@
-
{{.i18n.Tr "admin.users.delete_account"}}
+
{{.i18n.Tr "admin.users.delete_account"}}
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index 5b5048f8..8c7a0c9a 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -31,14 +31,14 @@ {{range .Users}} - {{.Id}} + {{.ID}} {{.Name}} {{.Email}} {{.NumRepos}} {{DateFmtShort .Created }} - + {{end}} diff --git a/templates/explore/page.tmpl b/templates/explore/page.tmpl index bb07f261..fd3e7a7a 100644 --- a/templates/explore/page.tmpl +++ b/templates/explore/page.tmpl @@ -18,4 +18,4 @@ {{end}} -{{end}} \ No newline at end of file +{{end}} diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl index f1864886..8d91f315 100644 --- a/templates/explore/search.tmpl +++ b/templates/explore/search.tmpl @@ -4,4 +4,4 @@ -
\ No newline at end of file +
diff --git a/templates/mail/issue/mention.tmpl b/templates/mail/issue/mention.tmpl index 53ff367e..e88b9abf 100644 --- a/templates/mail/issue/mention.tmpl +++ b/templates/mail/issue/mention.tmpl @@ -14,4 +14,4 @@ View it on Gogs.

- \ No newline at end of file + diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 474c8795..921e3667 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -27,7 +27,7 @@
{{if .IsOrganizationOwner}}
- {{.i18n.Tr "new_repo"}} + {{.i18n.Tr "new_repo"}}
{{end}} @@ -46,7 +46,7 @@
{{$isMember := .IsOrganizationMember}} {{range .Members}} - {{if or $isMember (.IsPublicMember $.Org.Id)}} + {{if or $isMember (.IsPublicMember $.Org.ID)}} {{end}} {{end}} diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index ddd341af..85f7cc90 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -25,13 +25,13 @@ {{$.i18n.Tr "org.members.membership_visibility"}}
- {{ $isPublic := .IsPublicMember $.Org.Id}} + {{ $isPublic := .IsPublicMember $.Org.ID}} {{if $isPublic}} {{$.i18n.Tr "org.members.public"}} - {{if or (eq $.SignedUser.Id .Id) $.IsOrganizationOwner}}({{$.i18n.Tr "org.members.public_helper"}}){{end}} + {{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}({{$.i18n.Tr "org.members.public_helper"}}){{end}} {{else}} {{$.i18n.Tr "org.members.private"}} - {{if or (eq $.SignedUser.Id .Id) $.IsOrganizationOwner}}({{$.i18n.Tr "org.members.private_helper"}}){{end}} + {{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}({{$.i18n.Tr "org.members.private_helper"}}){{end}} {{end}}
@@ -40,15 +40,15 @@ {{$.i18n.Tr "org.members.member_role"}}
- {{if .IsUserOrgOwner $.Org.Id}} {{$.i18n.Tr "org.members.owner"}}{{else}}{{$.i18n.Tr "org.members.member"}}{{end}} + {{if .IsUserOrgOwner $.Org.ID}} {{$.i18n.Tr "org.members.owner"}}{{else}}{{$.i18n.Tr "org.members.member"}}{{end}}
- {{if eq $.SignedUser.Id .Id}} - {{$.i18n.Tr "org.members.leave"}} + {{if eq $.SignedUser.ID .ID}} + {{$.i18n.Tr "org.members.leave"}} {{else if $.IsOrganizationOwner}} - {{$.i18n.Tr "org.members.remove"}} + {{$.i18n.Tr "org.members.remove"}} {{end}}
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index 3f070b74..cd50ee4f 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -13,7 +13,7 @@ {{range .Team.Members}}
{{if $.IsOrganizationOwner}} - {{$.i18n.Tr "org.members.remove"}} + {{$.i18n.Tr "org.members.remove"}} {{end}} @@ -26,7 +26,7 @@
{{.CsrfTokenHtml}} - +
diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index b8110081..cc79dd18 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -28,7 +28,7 @@ {{.CsrfTokenHtml}}
-
+
diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl index d1726159..02cb8d7d 100644 --- a/templates/org/team/sidebar.tmpl +++ b/templates/org/team/sidebar.tmpl @@ -2,10 +2,10 @@

{{.Team.Name}}
- {{if .Team.IsMember $.SignedUser.Id}} - {{$.i18n.Tr "org.teams.leave"}} + {{if .Team.IsMember $.SignedUser.ID}} + {{$.i18n.Tr "org.teams.leave"}} {{else if .IsOrganizationOwner}} - {{$.i18n.Tr "org.teams.join"}} + {{$.i18n.Tr "org.teams.join"}} {{end}}

diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index a5ad5d48..62acc2f2 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -16,10 +16,10 @@
{{.Name}}
- {{if .IsMember $.SignedUser.Id}} - {{$.i18n.Tr "org.teams.leave"}} + {{if .IsMember $.SignedUser.ID}} + {{$.i18n.Tr "org.teams.leave"}} {{else if $.IsOrganizationOwner}} - {{$.i18n.Tr "org.teams.join"}} + {{$.i18n.Tr "org.teams.join"}} {{end}}
diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 8cd466f3..c203f950 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -12,19 +12,19 @@
- + {{.ContextUser.ShortName 20}}
-
+
{{.SignedUser.ShortName 20}}
{{range .Orgs}} -
+
{{.ShortName 20}}
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 6b3fc660..6db997ca 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}}
diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 77c6d126..b001e3a6 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -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 67560d20..1d03b53d 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -12,12 +12,12 @@
- +
- {{.Issue.Poster.Name}} {{.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}} + {{.Issue.Poster.Name}} {{.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}}
{{if .IsIssueOwner}} @@ -53,12 +53,12 @@ {{if eq .Type 0}}
- +
- {{.Poster.Name}} {{$.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}} + {{.Poster.Name}} {{$.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}}
{{if gt .ShowTag 0}}
@@ -71,7 +71,7 @@ {{end}}
{{end}} - {{if or $.IsRepositoryAdmin (eq .Poster.Id $.SignedUserID)}} + {{if or $.IsRepositoryAdmin (eq .Poster.ID $.SignedUserID)}} {{end}}
@@ -304,7 +304,7 @@
{{.i18n.Tr "repo.issues.new.clear_assignee"}}
{{range .Assignees}} -
{{.Name}}
+
{{.Name}}
{{end}}
@@ -312,7 +312,7 @@ {{.i18n.Tr "repo.issues.new.no_assignee"}}
{{if .Issue.Assignee}} - {{.Issue.Assignee.Name}} + {{.Issue.Assignee.Name}} {{end}}
diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index a1b44054..28d29d9b 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -27,16 +27,16 @@ {{if .Issue.IsPull}} {{if .Issue.HasMerged}} {{ $mergedStr:= TimeSince .Issue.Merged $.Lang }} - {{.Issue.Merger.Name}} + {{.Issue.Merger.Name}} {{$.i18n.Tr "repo.pulls.merged_title_desc" .NumCommits .HeadTarget .BaseTarget $mergedStr | Safe}} {{else}} - {{.Issue.Poster.Name}} + {{.Issue.Poster.Name}} {{$.i18n.Tr "repo.pulls.title_desc" .NumCommits .HeadTarget .BaseTarget | Str2html}} {{end}} {{else}} {{ $createdStr:= TimeSince .Issue.Created $.Lang }} - {{if gt .Issue.Poster.Id 0}} + {{if gt .Issue.Poster.ID 0}} {{$.i18n.Tr "repo.issues.opened_by" $createdStr .Issue.Poster.HomeLink .Issue.Poster.Name | Safe}} {{else}} {{$.i18n.Tr "repo.issues.opened_by_fake" $createdStr .Issue.Poster.Name | Safe}} diff --git a/templates/repo/migrate.tmpl b/templates/repo/migrate.tmpl index 7973d585..30716ee6 100644 --- a/templates/repo/migrate.tmpl +++ b/templates/repo/migrate.tmpl @@ -37,19 +37,19 @@
- + {{.ContextUser.ShortName 20}}
-
+
{{.SignedUser.ShortName 20}}
{{range .Orgs}} -
+
{{.ShortName 20}}
diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl index e02ee180..9cd84b3d 100644 --- a/templates/repo/pulls/fork.tmpl +++ b/templates/repo/pulls/fork.tmpl @@ -12,20 +12,20 @@
- + {{.ContextUser.ShortName 20}}
-
+
{{.SignedUser.ShortName 20}}
{{range .Orgs}} - {{if .IsOwnedBy $.SignedUser.Id}} -
+ {{if .IsOwnedBy $.SignedUser.ID}} +
{{.ShortName 20}}
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 104e92ce..f6daab5d 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -23,7 +23,7 @@
{{$.i18n.Tr .Collaboration.ModeI18nKey}}
-
+
{{$.i18n.Tr "repo.settings.collaboration.admin"}}
{{$.i18n.Tr "repo.settings.collaboration.write"}}
{{$.i18n.Tr "repo.settings.collaboration.read"}}
@@ -31,7 +31,7 @@
-
diff --git a/templates/repo/user_cards.tmpl b/templates/repo/user_cards.tmpl index 6abbe5a1..82086a6f 100644 --- a/templates/repo/user_cards.tmpl +++ b/templates/repo/user_cards.tmpl @@ -44,4 +44,4 @@
{{end}} {{end}} -
\ No newline at end of file +
diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index ff05b151..a078006c 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -10,12 +10,12 @@ {{.i18n.Tr "home.switch_dashboard_context"}}
- + {{.SignedUser.Name}} {{range .Orgs}} - + {{.ShortName 20}} diff --git a/templates/user/meta/followers.tmpl b/templates/user/meta/followers.tmpl index 403a4e8a..40d7e950 100644 --- a/templates/user/meta/followers.tmpl +++ b/templates/user/meta/followers.tmpl @@ -3,4 +3,4 @@ {{template "user/meta/header" .}} {{template "repo/user_cards" .}}
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/user/meta/header.tmpl b/templates/user/meta/header.tmpl index 366d1e0b..4982c750 100644 --- a/templates/user/meta/header.tmpl +++ b/templates/user/meta/header.tmpl @@ -11,7 +11,7 @@ {{if or $.PageIsFollowers $.PageIsFollowing}} {{if and $.IsSigned (ne $.SignedUserName .Name)}}
{{end}} -
\ No newline at end of file +
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 8f68e932..36bd54b1 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -62,7 +62,7 @@ {{end}} {{if and .IsSigned (ne .SignedUserName .Owner.Name)}}