diff options
Diffstat (limited to 'templates/user')
| -rw-r--r-- | templates/user/profile.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/settings/profile.tmpl | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 37f94d2b79..198a9e3b60 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -22,7 +22,7 @@ {{if .Owner.Location}} <li><i class="octicon octicon-location"></i> {{.Owner.Location}}</li> {{end}} - {{if and $.ShowUserEmail .Owner.Email .IsSigned}} + {{if or (and $.ShowUserEmail .Owner.Email .IsSigned) (and .Owner.Email .IsSigned (not .Owner.KeepEmailPrivate))}} <li> <i class="octicon octicon-mail"></i> <a href="mailto:{{.Owner.Email}}" rel="nofollow">{{.Owner.Email}}</a> diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl index a42d9c49c3..f01e6e9739 100644 --- a/templates/user/settings/profile.tmpl +++ b/templates/user/settings/profile.tmpl @@ -27,6 +27,12 @@ <label for="email">{{.i18n.Tr "email"}}</label> <input id="email" name="email" value="{{.SignedUser.Email}}"> </div> + <div class="inline field"> + <div class="ui checkbox" id="keep-email-private"> + <label class="poping up" data-content="{{.i18n.Tr "settings.keep_email_private_popup"}}"><strong>{{.i18n.Tr "settings.keep_email_private"}}</strong></label> + <input name="keep_email_private" type="checkbox" {{if .SignedUser.KeepEmailPrivate}}checked{{end}}> + </div> + </div> <div class="field {{if .Err_Website}}error{{end}}"> <label for="website">{{.i18n.Tr "settings.website"}}</label> <input id="website" name="website" type="url" value="{{.SignedUser.Website}}"> |