diff options
author | Unknwon <u@gogs.io> | 2017-04-06 23:48:49 -0400 |
---|---|---|
committer | Unknwon <u@gogs.io> | 2017-04-06 23:48:49 -0400 |
commit | ac43eab51f9ac0d4c4bcc6db2bbc9ce3dbb34b7b (patch) | |
tree | 4e5fd54b821ef1af312e4d1f1c1a9befad7054a7 /templates | |
parent | 8d0417497b39aa196400d39c99bbd79cfb364f9f (diff) |
Refactoring: rename Signed -> Logged
Diffstat (limited to 'templates')
25 files changed, 57 insertions, 57 deletions
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 @@ <img class="ui mini image" src="{{AppSubURL}}/img/favicon.png"> </a> - {{if .IsSigned}} + {{if .IsLogged}} <a class="item{{if .PageIsDashboard}} active{{end}}" href="{{AppSubURL}}/">{{.i18n.Tr "dashboard"}}</a> <a class="item{{if .PageIsIssues}} active{{end}}" href="{{AppSubURL}}/issues">{{.i18n.Tr "issues"}}</a> <a class="item{{if .PageIsPulls}} active{{end}}" href="{{AppSubURL}}/pulls">{{.i18n.Tr "pull_requests"}}</a> @@ -106,7 +106,7 @@ </div> </div>*/}} - {{if .IsSigned}} + {{if .IsLogged}} <div class="right menu"> <div class="ui dropdown head link jump item poping up" data-content="{{.i18n.Tr "create_new"}}" data-variation="tiny inverted"> <span class="text"> @@ -120,7 +120,7 @@ <a class="item" href="{{AppSubURL}}/repo/migrate"> <i class="octicon octicon-repo-clone"></i> {{.i18n.Tr "new_migrate"}} </a> - {{if .SignedUser.CanCreateOrganization}} + {{if .LoggedUser.CanCreateOrganization}} <a class="item" href="{{AppSubURL}}/org/create"> <i class="octicon octicon-organization"></i> {{.i18n.Tr "new_org"}} </a> @@ -130,17 +130,17 @@ <div class="ui dropdown head link jump item poping up" tabindex="-1" data-content="{{.i18n.Tr "user_profile_and_more"}}" data-variation="tiny inverted"> <span class="text avatar"> - <img class="ui small rounded image" src="{{.SignedUser.RelAvatarLink}}"> + <img class="ui small rounded image" src="{{.LoggedUser.RelAvatarLink}}"> <span class="sr-only">{{.i18n.Tr "user_profile_and_more"}}</span> <i class="octicon octicon-triangle-down" tabindex="-1"></i> </span> <div class="menu" tabindex="-1"> <div class="ui header"> - {{.i18n.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong> + {{.i18n.Tr "signed_in_as"}} <strong>{{.LoggedUser.Name}}</strong> </div> <div class="divider"></div> - <a class="item" href="{{AppSubURL}}/{{.SignedUser.Name}}"> + <a class="item" href="{{AppSubURL}}/{{.LoggedUser.Name}}"> <i class="octicon octicon-person"></i> {{.i18n.Tr "your_profile"}}<!-- Your profile --> </a> 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}} <i class="octicon octicon-location"></i> {{.Location}} {{end}} - {{if and .Email $.IsSigned}} + {{if and .Email $.IsLogged}} <i class="octicon octicon-mail"></i> <a href="mailto:{{.Email}}" rel="nofollow">{{.Email}}</a> {{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}} <strong>{{$.i18n.Tr "org.members.public"}}</strong> - {{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}(<a href="{{$.OrgLink}}/members/action/private?uid={{.ID}}">{{$.i18n.Tr "org.members.public_helper"}}</a>){{end}} + {{if or (eq $.LoggedUser.ID .ID) $.IsOrganizationOwner}}(<a href="{{$.OrgLink}}/members/action/private?uid={{.ID}}">{{$.i18n.Tr "org.members.public_helper"}}</a>){{end}} {{else}} <strong>{{$.i18n.Tr "org.members.private"}}</strong> - {{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}(<a href="{{$.OrgLink}}/members/action/public?uid={{.ID}}">{{$.i18n.Tr "org.members.private_helper"}}</a>){{end}} + {{if or (eq $.LoggedUser.ID .ID) $.IsOrganizationOwner}}(<a href="{{$.OrgLink}}/members/action/public?uid={{.ID}}">{{$.i18n.Tr "org.members.private_helper"}}</a>){{end}} {{end}} </div> </div> @@ -45,7 +45,7 @@ </div> <div class="ui four wide column"> <div class="text right"> - {{if eq $.SignedUser.ID .ID}} + {{if eq $.LoggedUser.ID .ID}} <a class="ui red small button" href="{{$.OrgLink}}/members/action/leave?uid={{.ID}}">{{$.i18n.Tr "org.members.leave"}}</a> {{else if $.IsOrganizationOwner}} <a class="ui red small button" href="{{$.OrgLink}}/members/action/remove?uid={{.ID}}">{{$.i18n.Tr "org.members.remove"}}</a> 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 @@ <input id="location" name="location" value="{{.Org.Location}}"> </div> - {{if .SignedUser.IsAdmin}} + {{if .LoggedUser.IsAdmin}} <div class="ui divider"></div> <div class="inline field {{if .Err_MaxRepoCreation}}error{{end}}"> 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 @@ <div class="ui bottom attached segment"> <form class="ui form" id="add-member-form" action="{{$.OrgLink}}/teams/{{$.Team.LowerName}}/action/add" method="post"> {{.CSRFTokenHTML}} - <input type="hidden" name="uid" value="{{.SignedUser.ID}}"> + <input type="hidden" name="uid" value="{{.LoggedUser.ID}}"> <div class="inline field ui left"> <div id="search-user-box"> <div class="ui input"> 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 @@ <h4 class="ui top attached header"> <strong>{{.Team.Name}}</strong> <div class="ui right"> - {{if .Team.IsMember $.SignedUser.ID}} - <a class="ui red tiny button" href="{{.OrgLink}}/teams/{{.Team.LowerName}}/action/leave?uid={{$.SignedUser.ID}}&page=team">{{$.i18n.Tr "org.teams.leave"}}</a> + {{if .Team.IsMember $.LoggedUser.ID}} + <a class="ui red tiny button" href="{{.OrgLink}}/teams/{{.Team.LowerName}}/action/leave?uid={{$.LoggedUser.ID}}&page=team">{{$.i18n.Tr "org.teams.leave"}}</a> {{else if .IsOrganizationOwner}} - <a class="ui blue tiny button" href="{{.OrgLink}}/teams/{{.Team.LowerName}}/action/join?uid={{$.SignedUser.ID}}&page=team">{{$.i18n.Tr "org.teams.join"}}</a> + <a class="ui blue tiny button" href="{{.OrgLink}}/teams/{{.Team.LowerName}}/action/join?uid={{$.LoggedUser.ID}}&page=team">{{$.i18n.Tr "org.teams.join"}}</a> {{end}} </div> </h4> 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 @@ <div class="ui top attached header"> <a class="text black" href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong>{{.Name}}</strong></a> <div class="ui right"> - {{if .IsMember $.SignedUser.ID}} - <a class="ui red small button" href="{{$.OrgLink}}/teams/{{.LowerName}}/action/leave?uid={{$.SignedUser.ID}}">{{$.i18n.Tr "org.teams.leave"}}</a> + {{if .IsMember $.LoggedUser.ID}} + <a class="ui red small button" href="{{$.OrgLink}}/teams/{{.LowerName}}/action/leave?uid={{$.LoggedUser.ID}}">{{$.i18n.Tr "org.teams.leave"}}</a> {{else if $.IsOrganizationOwner}} - <a class="ui blue small button" href="{{$.OrgLink}}/teams/{{.LowerName}}/action/join?uid={{$.SignedUser.ID}}">{{$.i18n.Tr "org.teams.join"}}</a> + <a class="ui blue small button" href="{{$.OrgLink}}/teams/{{.LowerName}}/action/join?uid={{$.LoggedUser.ID}}">{{$.i18n.Tr "org.teams.join"}}</a> {{end}} </div> </div> 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 @@ </span> <i class="dropdown icon"></i> <div class="menu"> - <div class="item" data-value="{{.SignedUser.ID}}"> - <img class="ui mini image" src="{{.SignedUser.RelAvatarLink}}"> - {{.SignedUser.ShortName 20}} + <div class="item" data-value="{{.LoggedUser.ID}}"> + <img class="ui mini image" src="{{.LoggedUser.RelAvatarLink}}"> + {{.LoggedUser.ShortName 20}} </div> {{range .Orgs}} <div class="item" data-value="{{.ID}}"> 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 @@ <div class="ui attached info segment"> {{if .Author}} <img class="ui avatar image" src="{{.Author.RelAvatarLink}}" /> - <a href="{{.Author.HomeLink}}"><strong>{{.Commit.Author.Name}}</strong></a> {{if .IsSigned}}<{{.Commit.Author.Email}}>{{end}} + <a href="{{.Author.HomeLink}}"><strong>{{.Commit.Author.Name}}</strong></a> {{if .IsLogged}}<{{.Commit.Author.Email}}>{{end}} {{else}} <img class="ui avatar image" src="{{AvatarLink .Commit.Author.Email}}" /> <strong>{{.Commit.Author.Name}}</strong> 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 @@ <div class="commit-form-wrapper"> - <img width="48" height="48" class="ui image commit-avatar" src="{{.SignedUser.RelAvatarLink}}"> + <img width="48" height="48" class="ui image commit-avatar" src="{{.LoggedUser.RelAvatarLink}}"> <div class="commit-form"> <h3>{{.i18n.Tr "repo.editor.commit_changes"}}</h3> <div class="field"> 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 @@ </div> {{if .CanBeForked}} <div class="ui labeled button" tabindex="0"> - <a class="ui basic button {{if eq .OwnerID $.SignedUserID}}poping up{{end}}" href="{{AppSubURL}}/repo/fork/{{.ID}}"> + <a class="ui basic button {{if eq .OwnerID $.LoggedUserID}}poping up{{end}}" href="{{AppSubURL}}/repo/fork/{{.ID}}"> <i class="octicon octicon-repo-forked"></i>{{$.i18n.Tr "repo.fork"}} </a> <a class="ui basic label" href="{{.Link}}/forks"> 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 @@ <div class="twelve wide column"> <div class="ui comments"> <div class="comment"> - <a class="avatar" href="{{.SignedUser.HomeLink}}"> - <img src="{{.SignedUser.RelAvatarLink}}"> + <a class="avatar" href="{{.LoggedUser.HomeLink}}"> + <img src="{{.LoggedUser.RelAvatarLink}}"> </a> <div class="ui segment content"> <div class="field"> 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}} </div> {{end}} - {{if or $.IsRepositoryAdmin (eq .Poster.ID $.SignedUserID)}} + {{if or $.IsRepositoryAdmin (eq .Poster.ID $.LoggedUserID)}} <div class="item action"> <a class="edit-content" href="#"><i class="octicon octicon-pencil"></i></a> <a class="delete-comment" href="#" data-comment-id={{.HashTag}} data-url="{{$.RepoLink}}/comments/{{.ID}}/delete" data-locale="{{$.i18n.Tr "repo.issues.delete_comment_confirm"}}"><i class="octicon octicon-x"></i></a> @@ -216,10 +216,10 @@ </div> {{end}} - {{if .IsSigned}} + {{if .IsLogged}} <div class="comment form"> - <a class="avatar" href="{{.SignedUser.HomeLink}}"> - <img src="{{.SignedUser.RelAvatarLink}}"> + <a class="avatar" href="{{.LoggedUser.HomeLink}}"> + <img src="{{.LoggedUser.RelAvatarLink}}"> </a> <div class="content"> <form class="ui segment form" id="comment-form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/comments" method="post"> 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 @@ </span> <i class="dropdown icon"></i> <div class="menu"> - <div class="item" data-value="{{.SignedUser.ID}}"> - <img class="ui mini image" src="{{.SignedUser.RelAvatarLink}}"> - {{.SignedUser.ShortName 20}} + <div class="item" data-value="{{.LoggedUser.ID}}"> + <img class="ui mini image" src="{{.LoggedUser.RelAvatarLink}}"> + {{.LoggedUser.ShortName 20}} </div> {{range .Orgs}} <div class="item" data-value="{{.ID}}"> 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 @@ </span> <i class="dropdown icon"></i> <div class="menu"> - <div class="item" data-value="{{.SignedUser.ID}}"> - <img class="ui mini image" src="{{.SignedUser.RelAvatarLink}}"> - {{.SignedUser.ShortName 20}} + <div class="item" data-value="{{.LoggedUser.ID}}"> + <img class="ui mini image" src="{{.LoggedUser.RelAvatarLink}}"> + {{.LoggedUser.ShortName 20}} </div> {{range .Orgs}} - {{if .IsOwnedBy $.SignedUser.ID}} + {{if .IsOwnedBy $.LoggedUser.ID}} <div class="item" data-value="{{.ID}}"> <img class="ui mini image" src="{{.RelAvatarLink}}"> {{.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 @@ <li {{if .PageIsSettingsOptions}}class="current"{{end}}><a href="{{.RepoLink}}/settings">{{.i18n.Tr "repo.settings.options"}}</a></li> <li {{if .PageIsSettingsCollaboration}}class="current"{{end}}><a href="{{.RepoLink}}/settings/collaboration">{{.i18n.Tr "repo.settings.collaboration"}}</a></li> <li {{if .PageIsSettingsHooks}}class="current"{{end}}><a href="{{.RepoLink}}/settings/hooks">{{.i18n.Tr "repo.settings.hooks"}}</a></li> - {{if or .SignedUser.AllowGitHook .SignedUser.IsAdmin}} + {{if or .LoggedUser.AllowGitHook .LoggedUser.IsAdmin}} <li {{if .PageIsSettingsGitHooks}}class="current"{{end}}><a href="{{.RepoLink}}/settings/hooks/git">{{.i18n.Tr "repo.settings.githooks"}}</a></li> {{end}} <li {{if .PageIsSettingsKeys}}class="current"{{end}}><a href="{{.RepoLink}}/settings/keys">{{.i18n.Tr "repo.settings.deploy_keys"}}</a></li> 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 @@ <a class="{{if .PageIsSettingsHooks}}active{{end}} item" href="{{.RepoLink}}/settings/hooks"> {{.i18n.Tr "repo.settings.hooks"}} </a> - {{if .SignedUser.CanEditGitHook}} + {{if .LoggedUser.CanEditGitHook}} <a class="{{if .PageIsSettingsGitHooks}}active{{end}} item" href="{{.RepoLink}}/settings/hooks/git"> {{.i18n.Tr "repo.settings.githooks"}} </a> 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}} <p class="center">{{.i18n.Tr "auth.resent_limit_prompt"}}</p> {{else}} - <p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .SignedUser.Email .Hours | Str2html}}</p> + <p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .LoggedUser.Email .Hours | Str2html}}</p> {{end}} {{else}} {{if .IsSendRegisterMail}} @@ -23,7 +23,7 @@ {{else if .IsActivateFailed}} <p>{{.i18n.Tr "auth.invalid_code"}}</p> {{else}} - <p>{{.i18n.Tr "auth.has_unconfirmed_mail" .SignedUser.Name .SignedUser.Email | Str2html}}</p> + <p>{{.i18n.Tr "auth.has_unconfirmed_mail" .LoggedUser.Name .LoggedUser.Email | Str2html}}</p> <div class="ui divider"></div> <div class="text right"> <button class="ui blue button">{{.i18n.Tr "auth.resend_mail"}}</button> 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"}} </div> <div class="items"> - <a class="{{if eq .ContextUser.ID .SignedUser.ID}}active selected{{end}} item" href="{{AppSubURL}}/{{if .PageIsIssues}}issues{{else if .PageIsPulls}}pulls{{end}}"> - <img class="ui avatar image" src="{{.SignedUser.RelAvatarLink}}"> - {{.SignedUser.Name}} + <a class="{{if eq .ContextUser.ID .LoggedUser.ID}}active selected{{end}} item" href="{{AppSubURL}}/{{if .PageIsIssues}}issues{{else if .PageIsPulls}}pulls{{end}}"> + <img class="ui avatar image" src="{{.LoggedUser.RelAvatarLink}}"> + {{.LoggedUser.Name}} </a> {{range .Orgs}} <a class="{{if eq $.ContextUser.ID .ID}}active selected{{end}} item" href="{{AppSubURL}}/org/{{.Name}}/{{if $.PageIsIssues}}issues{{else if $.PageIsPulls}}pulls{{else}}dashboard{{end}}"> 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 @@ <div class="ui right"> {{if or $.PageIsFollowers $.PageIsFollowing}} - {{if and $.IsSigned (ne $.SignedUserName .Name)}} + {{if and $.IsLogged (ne $.LoggedUserName .Name)}} <div class="follow"> - {{if $.SignedUser.IsFollowing .ID}} + {{if $.LoggedUser.IsFollowing .ID}} <a class="ui small basic red button" href="{{.HomeLink}}/action/unfollow?redirect_to={{$.Link}}"><i class="octicon octicon-person"></i> {{$.i18n.Tr "user.unfollow"}}</a> {{else}} <a class="ui small basic green button" href="{{.HomeLink}}/action/follow?redirect_to={{$.Link}}"><i class="octicon octicon-person"></i> {{$.i18n.Tr "user.follow"}}</a> diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 4dced1d4..27c30db5 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -4,7 +4,7 @@ <div class="ui grid"> <div class="ui five wide column"> <div class="ui card"> - {{if eq .SignedUserName .Owner.Name}} + {{if eq .LoggedUserName .Owner.Name}} <a class="image poping up" href="{{AppSubURL}}/user/settings/avatar" id="profile-avatar" data-content="{{.i18n.Tr "user.change_avatar"}}" data-variation="inverted tiny" data-position="bottom center"> <img src="{{.Owner.RelAvatarLink}}?s=290" title="{{.Owner.Name}}"/> </a> @@ -22,7 +22,7 @@ {{if .Owner.Location}} <li><i class="octicon octicon-location"></i> {{.Owner.Location}}</li> {{end}} - {{if and .Owner.Email .IsSigned}} + {{if and .Owner.Email .IsLogged}} <li> <i class="octicon octicon-mail"></i> <a href="mailto:{{.Owner.Email}}" rel="nofollow">{{.Owner.Email}}</a> @@ -60,9 +60,9 @@ {{end}} </li> {{end}} - {{if and .IsSigned (ne .SignedUserName .Owner.Name)}} + {{if and .IsLogged (ne .LoggedUserName .Owner.Name)}} <li class="follow"> - {{if .SignedUser.IsFollowing .Owner.ID}} + {{if .LoggedUser.IsFollowing .Owner.ID}} <a class="ui basic red button" href="{{.Link}}/action/unfollow?redirect_to={{$.Link}}"><i class="octicon octicon-person"></i> {{.i18n.Tr "user.unfollow"}}</a> {{else}} <a class="ui basic green button" href="{{.Link}}/action/follow?redirect_to={{$.Link}}"><i class="octicon octicon-person"></i> {{.i18n.Tr "user.follow"}}</a> diff --git a/templates/user/settings/avatar.tmpl b/templates/user/settings/avatar.tmpl index 7ab9c274..ee1300c8 100644 --- a/templates/user/settings/avatar.tmpl +++ b/templates/user/settings/avatar.tmpl @@ -15,19 +15,19 @@ {{if not DisableGravatar}} <div class="inline field"> <div class="ui radio checkbox"> - <input name="source" value="lookup" type="radio" {{if not .SignedUser.UseCustomAvatar}}checked{{end}}> + <input name="source" value="lookup" type="radio" {{if not .LoggedUser.UseCustomAvatar}}checked{{end}}> <label>{{.i18n.Tr "settings.lookup_avatar_by_mail"}}</label> </div> </div> <div class="field {{if .Err_Gravatar}}error{{end}}"> <label for="gravatar">Avatar {{.i18n.Tr "email"}}</label> - <input id="gravatar" name="gravatar" value="{{.SignedUser.AvatarEmail}}" /> + <input id="gravatar" name="gravatar" value="{{.LoggedUser.AvatarEmail}}" /> </div> {{end}} <div class="inline field"> <div class="ui radio checkbox"> - <input name="source" value="local" type="radio" {{if .SignedUser.UseCustomAvatar}}checked{{end}}> + <input name="source" value="local" type="radio" {{if .LoggedUser.UseCustomAvatar}}checked{{end}}> <label>{{.i18n.Tr "settings.enable_custom_avatar"}}</label> </div> </div> diff --git a/templates/user/settings/password.tmpl b/templates/user/settings/password.tmpl index 8d702f59..acab4958 100644 --- a/templates/user/settings/password.tmpl +++ b/templates/user/settings/password.tmpl @@ -9,7 +9,7 @@ {{.i18n.Tr "settings.change_password"}} </h4> <div class="ui attached segment"> - {{if .SignedUser.IsLocal}} + {{if .LoggedUser.IsLocal}} <form class="ui form" action="{{.Link}}" method="post"> {{.CSRFTokenHTML}} <div class="required field {{if .Err_OldPassword}}error{{end}}"> diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl index 2952907d..12f21c8f 100644 --- a/templates/user/settings/profile.tmpl +++ b/templates/user/settings/profile.tmpl @@ -14,8 +14,8 @@ {{.CSRFTokenHTML}} <div class="required field {{if .Err_Name}}error{{end}}"> <label for="username">{{.i18n.Tr "username"}}<span class="text red {{if eq .name .origin_name}}hide{{end}}" id="name-change-prompt"> {{.i18n.Tr "settings.change_username_prompt"}}</span></label> - <input id="username" name="name" value="{{.name}}" data-name="{{.origin_name}}" autofocus required {{if not .SignedUser.IsLocal}}readonly{{end}}> - {{if not .SignedUser.IsLocal}} + <input id="username" name="name" value="{{.name}}" data-name="{{.origin_name}}" autofocus required {{if not .LoggedUser.IsLocal}}readonly{{end}}> + {{if not .LoggedUser.IsLocal}} <p class="help text blue">{{$.i18n.Tr "settings.password_username_disabled"}}</p> {{end}} </div> diff --git a/templates/user/settings/repositories.tmpl b/templates/user/settings/repositories.tmpl index 416deca5..1537f449 100644 --- a/templates/user/settings/repositories.tmpl +++ b/templates/user/settings/repositories.tmpl @@ -28,7 +28,7 @@ {{.Owner.Name}}/{{.Name}} </a> <span class="ui text light grey">{{.Size | FileSize}}</span> - {{if not (eq .OwnerID $.SignedUserID)}} + {{if not (eq .OwnerID $.LoggedUserID)}} <div class="right floated content"> <a class="ui red tiny button inline text-thin delete-button" href="" data-url="{{$.Link}}/leave" data-id="{{.ID}}">{{$.i18n.Tr "settings.repos.leave"}}</a> </div> |