From ac43eab51f9ac0d4c4bcc6db2bbc9ce3dbb34b7b Mon Sep 17 00:00:00 2001 From: Unknwon Date: Thu, 6 Apr 2017 23:48:49 -0400 Subject: Refactoring: rename Signed -> Logged --- templates/base/head.tmpl | 12 ++++++------ templates/explore/users.tmpl | 2 +- templates/org/member/members.tmpl | 6 +++--- templates/org/settings/options.tmpl | 2 +- templates/org/team/members.tmpl | 2 +- templates/org/team/sidebar.tmpl | 6 +++--- templates/org/team/teams.tmpl | 6 +++--- templates/repo/create.tmpl | 6 +++--- templates/repo/diff/page.tmpl | 2 +- templates/repo/editor/commit_form.tmpl | 2 +- templates/repo/header.tmpl | 2 +- templates/repo/issue/new_form.tmpl | 4 ++-- templates/repo/issue/view_content.tmpl | 8 ++++---- templates/repo/migrate.tmpl | 6 +++--- templates/repo/pulls/fork.tmpl | 8 ++++---- templates/repo/settings/nav.tmpl | 2 +- templates/repo/settings/navbar.tmpl | 2 +- templates/user/auth/activate.tmpl | 4 ++-- templates/user/dashboard/navbar.tmpl | 6 +++--- templates/user/meta/header.tmpl | 4 ++-- templates/user/profile.tmpl | 8 ++++---- templates/user/settings/avatar.tmpl | 6 +++--- templates/user/settings/password.tmpl | 2 +- templates/user/settings/profile.tmpl | 4 ++-- templates/user/settings/repositories.tmpl | 2 +- 25 files changed, 57 insertions(+), 57 deletions(-) (limited to 'templates') diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 33a58eae..71551ac7 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -90,7 +90,7 @@ - {{if .IsSigned}} + {{if .IsLogged}} {{.i18n.Tr "dashboard"}} {{.i18n.Tr "issues"}} {{.i18n.Tr "pull_requests"}} @@ -106,7 +106,7 @@ */}} - {{if .IsSigned}} + {{if .IsLogged}}
@@ -120,7 +120,7 @@ {{.i18n.Tr "new_migrate"}} - {{if .SignedUser.CanCreateOrganization}} + {{if .LoggedUser.CanCreateOrganization}} {{.i18n.Tr "new_org"}} @@ -130,17 +130,17 @@
- + {{.i18n.Tr "user_profile_and_more"}}
- {{.i18n.Tr "signed_in_as"}} {{.SignedUser.Name}} + {{.i18n.Tr "signed_in_as"}} {{.LoggedUser.Name}}
- + {{.i18n.Tr "your_profile"}} diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl index c13ccc69..6f1b2ee8 100644 --- a/templates/explore/users.tmpl +++ b/templates/explore/users.tmpl @@ -16,7 +16,7 @@ {{if .Location}} {{.Location}} {{end}} - {{if and .Email $.IsSigned}} + {{if and .Email $.IsLogged}} {{.Email}} {{end}} diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index d7514d8b..67ab1f76 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -28,10 +28,10 @@ {{ $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 $.LoggedUser.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 $.LoggedUser.ID .ID) $.IsOrganizationOwner}}({{$.i18n.Tr "org.members.private_helper"}}){{end}} {{end}}
@@ -45,7 +45,7 @@
- {{if eq $.SignedUser.ID .ID}} + {{if eq $.LoggedUser.ID .ID}} {{$.i18n.Tr "org.members.leave"}} {{else if $.IsOrganizationOwner}} {{$.i18n.Tr "org.members.remove"}} diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index dcd8d33b..fdf323c0 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -33,7 +33,7 @@
- {{if .SignedUser.IsAdmin}} + {{if .LoggedUser.IsAdmin}}
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index 1c707e93..ca5aceea 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -26,7 +26,7 @@
{{.CSRFTokenHTML}} - +
diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl index 02cb8d7d..12f989a6 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 $.LoggedUser.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 87141811..2b4445ca 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 $.LoggedUser.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 06daa360..25c8dc27 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -19,9 +19,9 @@
-
- - {{.SignedUser.ShortName 20}} +
+ + {{.LoggedUser.ShortName 20}}
{{range .Orgs}}
diff --git a/templates/repo/diff/page.tmpl b/templates/repo/diff/page.tmpl index 4d2f6bc1..eae67b7f 100644 --- a/templates/repo/diff/page.tmpl +++ b/templates/repo/diff/page.tmpl @@ -14,7 +14,7 @@
{{if .Author}} - {{.Commit.Author.Name}} {{if .IsSigned}}<{{.Commit.Author.Email}}>{{end}} + {{.Commit.Author.Name}} {{if .IsLogged}}<{{.Commit.Author.Email}}>{{end}} {{else}} {{.Commit.Author.Name}} diff --git a/templates/repo/editor/commit_form.tmpl b/templates/repo/editor/commit_form.tmpl index 96b0dcbd..6aee9f1d 100644 --- a/templates/repo/editor/commit_form.tmpl +++ b/templates/repo/editor/commit_form.tmpl @@ -1,5 +1,5 @@
- +

{{.i18n.Tr "repo.editor.commit_changes"}}

diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 3a2d48f4..cce2dbfc 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -33,7 +33,7 @@
{{if .CanBeForked}}
- + {{$.i18n.Tr "repo.fork"}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 2bbb81bb..d3f9f710 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -8,8 +8,8 @@
- - + +
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 2bb40409..88f66ef9 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -79,7 +79,7 @@ {{end}}
{{end}} - {{if or $.IsRepositoryAdmin (eq .Poster.ID $.SignedUserID)}} + {{if or $.IsRepositoryAdmin (eq .Poster.ID $.LoggedUserID)}}
@@ -216,10 +216,10 @@
{{end}} - {{if .IsSigned}} + {{if .IsLogged}}
- - + +
diff --git a/templates/repo/migrate.tmpl b/templates/repo/migrate.tmpl index 608f0ca3..e10b07cd 100644 --- a/templates/repo/migrate.tmpl +++ b/templates/repo/migrate.tmpl @@ -50,9 +50,9 @@
-
- - {{.SignedUser.ShortName 20}} +
+ + {{.LoggedUser.ShortName 20}}
{{range .Orgs}}
diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl index eda3d027..f10c2aa8 100644 --- a/templates/repo/pulls/fork.tmpl +++ b/templates/repo/pulls/fork.tmpl @@ -19,12 +19,12 @@
-
- - {{.SignedUser.ShortName 20}} +
+ + {{.LoggedUser.ShortName 20}}
{{range .Orgs}} - {{if .IsOwnedBy $.SignedUser.ID}} + {{if .IsOwnedBy $.LoggedUser.ID}}
{{.ShortName 20}} diff --git a/templates/repo/settings/nav.tmpl b/templates/repo/settings/nav.tmpl index 97df429f..81d0fdf1 100644 --- a/templates/repo/settings/nav.tmpl +++ b/templates/repo/settings/nav.tmpl @@ -5,7 +5,7 @@
  • {{.i18n.Tr "repo.settings.options"}}
  • {{.i18n.Tr "repo.settings.collaboration"}}
  • {{.i18n.Tr "repo.settings.hooks"}}
    • - {{if or .SignedUser.AllowGitHook .SignedUser.IsAdmin}} + {{if or .LoggedUser.AllowGitHook .LoggedUser.IsAdmin}}
  • {{.i18n.Tr "repo.settings.githooks"}}
    • {{end}}
  • {{.i18n.Tr "repo.settings.deploy_keys"}}
    • diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index f43b3caf..9d3e33ca 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -15,7 +15,7 @@ {{.i18n.Tr "repo.settings.hooks"}} - {{if .SignedUser.CanEditGitHook}} + {{if .LoggedUser.CanEditGitHook}} {{.i18n.Tr "repo.settings.githooks"}} diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl index 35fdc1ba..471d3fcd 100644 --- a/templates/user/auth/activate.tmpl +++ b/templates/user/auth/activate.tmpl @@ -15,7 +15,7 @@ {{else if .ResendLimited}}

    {{.i18n.Tr "auth.resent_limit_prompt"}}

    {{else}} -

    {{.i18n.Tr "auth.confirmation_mail_sent_prompt" .SignedUser.Email .Hours | Str2html}}

    +

    {{.i18n.Tr "auth.confirmation_mail_sent_prompt" .LoggedUser.Email .Hours | Str2html}}

    {{end}} {{else}} {{if .IsSendRegisterMail}} @@ -23,7 +23,7 @@ {{else if .IsActivateFailed}}

    {{.i18n.Tr "auth.invalid_code"}}

    {{else}} -

    {{.i18n.Tr "auth.has_unconfirmed_mail" .SignedUser.Name .SignedUser.Email | Str2html}}

    +

    {{.i18n.Tr "auth.has_unconfirmed_mail" .LoggedUser.Name .LoggedUser.Email | Str2html}}

    diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index d2600168..88d69c8f 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -10,9 +10,9 @@ {{.i18n.Tr "home.switch_dashboard_context"}}
    - - - {{.SignedUser.Name}} + + + {{.LoggedUser.Name}} {{range .Orgs}} diff --git a/templates/user/meta/header.tmpl b/templates/user/meta/header.tmpl index 36072e8a..3d1fce03 100644 --- a/templates/user/meta/header.tmpl +++ b/templates/user/meta/header.tmpl @@ -8,9 +8,9 @@
    {{if or $.PageIsFollowers $.PageIsFollowing}} - {{if and $.IsSigned (ne $.SignedUserName .Name)}} + {{if and $.IsLogged (ne $.LoggedUserName .Name)}}