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

Jump to bottom

Add tooltips to Hide comment type settings where necessary #21306

Merged
merged 11 commits into from
Apr 12, 2023
Merged

Add tooltips to Hide comment type settings where necessary #21306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
197164a
Add tooltips to "Hide comment type" settings where necessary
delvh Sep 30, 2022
db4c573
Merge branch 'main' into feature/document-comment-type-hiding
silverwind Apr 9, 2023
4264d3a
Adapt tooltips to new format
delvh Apr 10, 2023
a5a59c0
Merge branch 'main' into feature/document-comment-type-hiding
delvh Apr 10, 2023
b630240
Merge branch 'main' into feature/document-comment-type-hiding
delvh Apr 10, 2023
1a20ed7
Replace topmost tooltip with a static help text instead
delvh Apr 11, 2023
4280142
Remove leftovers from previous commit
delvh Apr 11, 2023
dd64ca1
Use English '/' whitespace behavior instead of the German alternative
delvh Apr 11, 2023
d793e30
Rename tooltip to description and remove unnecessary `<div>`
delvh Apr 12, 2023
9a726b7
Revert unrelated changes
delvh Apr 12, 2023
82983a4
Merge branch 'main' into feature/document-comment-type-hiding
lunny Apr 12, 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
3 changes: 3 additions & 0 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,9 @@ cancel = Cancel
language = Language
ui = Theme
hidden_comment_types = Hidden comment types
hidden_comment_types_description = Comment types checked here will not be shown inside issue pages. Checking "Label" for example removes all "<user> added/removed <label>" comments.
hidden_comment_types.ref_tooltip = Comments where this issue was referenced from another issue/commit/…
hidden_comment_types.issue_ref_tooltip = Comments where the user changes the branch/tag associated with the issue
comment_type_group_reference = Reference
comment_type_group_label = Label
comment_type_group_milestone = Milestone
Expand Down
7 changes: 5 additions & 2 deletions templates/user/settings/appearance.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,13 @@
{{.locale.Tr "settings.hidden_comment_types"}}
</h4>
<div class="ui attached segment">
<p class="help">
{{.locale.Tr "settings.hidden_comment_types_description"}}
</p>
<form class="ui form" action="{{.Link}}/hidden_comments" method="post">
{{.CsrfTokenHtml}}
<div class="inline field">
<div class="ui checkbox">
<div class="ui checkbox" data-tooltip-content="{{.locale.Tr "settings.hidden_comment_types.ref_tooltip"}}">
<input name="reference" type="checkbox" {{if(call .IsCommentTypeGroupChecked "reference")}}checked{{end}}>
<label>{{.locale.Tr "settings.comment_type_group_reference"}}</label>
</div>
Expand Down Expand Up @@ -156,7 +159,7 @@
</div>
</div>
<div class="inline field">
<div class="ui checkbox">
<div class="ui checkbox" data-tooltip-content="{{.locale.Tr "settings.hidden_comment_types.issue_ref_tooltip"}}">
<input name="issue_ref" type="checkbox" {{if (call .IsCommentTypeGroupChecked "issue_ref")}}checked{{end}}>
<label>{{.locale.Tr "settings.comment_type_group_issue_ref"}}</label>
</div>
Expand Down