diff options
Diffstat (limited to 'templates/user')
| -rw-r--r-- | templates/user/auth/activate.tmpl | 4 | ||||
| -rw-r--r-- | templates/user/dashboard/navbar.tmpl | 6 | ||||
| -rw-r--r-- | templates/user/meta/header.tmpl | 4 | ||||
| -rw-r--r-- | templates/user/profile.tmpl | 8 | ||||
| -rw-r--r-- | templates/user/settings/avatar.tmpl | 6 | ||||
| -rw-r--r-- | templates/user/settings/password.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/settings/profile.tmpl | 4 | ||||
| -rw-r--r-- | templates/user/settings/repositories.tmpl | 2 |
8 files changed, 18 insertions, 18 deletions
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> |