Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve 'Privacy' section in profile settings #25309

Merged
merged 7 commits into from
Jun 22, 2023
Merged

Improve 'Privacy' section in profile settings #25309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
521882a
Move 'Hide Email Address' in Settings to Privacy
n0toose Jun 16, 2023
3f3c856
Make labels in Privacy section consistent
n0toose Jun 16, 2023
8c93070
Improve redirect to Privacy settings
n0toose Jun 16, 2023
60c8286
Fix label
n0toose Jun 20, 2023
1819643
Update options/locale/locale_en-US.ini
6543 Jun 22, 2023
d3996c5
Merge branch 'main' into move-hide-email
6543 Jun 22, 2023
979af43
Merge branch 'main' into move-hide-email
GiteaBot Jun 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ comment_type_group_project = Project
comment_type_group_issue_ref = Issue reference
saved_successfully = Your settings were saved successfully.
privacy = Privacy
keep_activity_private = Hide the activity from the profile page
keep_activity_private = Hide Activity from profile page
keep_activity_private_popup = Makes the activity visible only for you and the admins

lookup_avatar_by_mail = Look Up Avatar by Email Address
Expand Down
2 changes: 1 addition & 1 deletion templates/user/profile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<li>
{{svg "octicon-mail"}}
<a href="mailto:{{.ContextUser.Email}}" rel="nofollow">{{.ContextUser.Email}}</a>
<a href="{{AppSubUrl}}/user/settings#keep-email-private">
<a href="{{AppSubUrl}}/user/settings#privacy-user-settings">
{{if .ShowUserEmail}}
<i class="ui right" data-tooltip-content="{{.locale.Tr "user.email_visibility.limited"}}">
{{svg "octicon-unlock"}}
Expand Down
15 changes: 8 additions & 7 deletions templates/user/settings/profile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@
<label for="email">{{.locale.Tr "email"}}</label>
<p>{{.SignedUser.Email}}</p>
</div>
<div class="inline field">
<div class="ui checkbox" id="keep-email-private">
<label data-tooltip-content="{{.locale.Tr "settings.keep_email_private_popup"}}"><strong>{{.locale.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_Description}}error{{end}}">
<label for="description">{{$.locale.Tr "user.user_bio"}}</label>
<textarea id="description" name="description" rows="2" placeholder="{{.locale.Tr "settings.biography_placeholder"}}" maxlength="255">{{.SignedUser.Description}}</textarea>
Expand All @@ -47,7 +41,7 @@
<div class="ui divider"></div>
<!-- private block -->

<div class="field">
<div class="field" id="privacy-user-settings">
<label for="security-private"><strong>{{.locale.Tr "settings.privacy"}}</strong></label>
</div>

Expand Down Expand Up @@ -77,6 +71,13 @@
</div>
</div>

<div class="field">
<div class="ui checkbox">
<label data-tooltip-content="{{.locale.Tr "settings.keep_email_private_popup"}}"><strong>{{.locale.Tr "settings.keep_email_private"}}</strong></label>
<input name="keep_email_private" type="checkbox" {{if .SignedUser.KeepEmailPrivate}}checked{{end}}>
</div>
</div>

<div class="field">
<div class="ui checkbox" id="keep-activity-private">
<label data-tooltip-content="{{.locale.Tr "settings.keep_activity_private_popup"}}"><strong>{{.locale.Tr "settings.keep_activity_private"}}</strong></label>
Expand Down