From 197164a9d095831bdebaa762bebd7999dcd0df1e Mon Sep 17 00:00:00 2001
From: delvh <leon@kske.dev>
Date: Sat, 1 Oct 2022 01:08:52 +0200
Subject: [PATCH 1/7] Add tooltips to "Hide comment type" settings where
 necessary

Previously, this setting was pretty confusing for users, especially the
difference between "reference" and "issue reference".
---
 options/locale/locale_en-US.ini         |   3 +
 templates/user/settings/appearance.tmpl | 162 ++++++++++++------------
 2 files changed, 85 insertions(+), 80 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 1dba1d71d8ffe..31d405a056731 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -559,6 +559,9 @@ cancel = Cancel
 language = Language
 ui = Theme
 hidden_comment_types = Hidden comment types
+hidden_comment_types_tooltip = 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
diff --git a/templates/user/settings/appearance.tmpl b/templates/user/settings/appearance.tmpl
index 233e682621bb9..b63a06aa66281 100644
--- a/templates/user/settings/appearance.tmpl
+++ b/templates/user/settings/appearance.tmpl
@@ -70,101 +70,103 @@
 		</div>
 
 		<!-- Shown comment event types -->
-		<h4 class="ui top attached header">
-			{{.locale.Tr "settings.hidden_comment_types"}}
-		</h4>
-		<div class="ui attached segment">
-			<form class="ui form" action="{{.Link}}/hidden_comments" method="post">
-				{{.CsrfTokenHtml}}
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="reference" type="checkbox" {{if(call .IsCommentTypeGroupChecked "reference")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_reference"}}</label>
+		<div class="ui header tooltip" data-content="{{.locale.Tr "settings.hidden_comment_types_tooltip"}}">
+			<h4 class="ui top attached header">
+				{{.locale.Tr "settings.hidden_comment_types"}}
+			</h4>
+			<div class="ui attached segment">
+				<form class="ui form" action="{{.Link}}/hidden_comments" method="post">
+					{{.CsrfTokenHtml}}
+					<div class="inline field">
+						<div class="ui checkbox tooltip" data-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>
 					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="label" type="checkbox" {{if (call .IsCommentTypeGroupChecked "label")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_label"}}</label>
+					<div class="inline field">
+						<div class="ui checkbox">
+							<input name="label" type="checkbox"{{if (call .IsCommentTypeGroupChecked "label")}} checked{{end}}>
+							<label>{{.locale.Tr "settings.comment_type_group_label"}}</label>
+						</div>
 					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="milestone" type="checkbox" {{if (call .IsCommentTypeGroupChecked "milestone")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_milestone"}}</label>
+					<div class="inline field">
+						<div class="ui checkbox">
+							<input name="milestone" type="checkbox"{{if (call .IsCommentTypeGroupChecked "milestone")}} checked{{end}}>
+							<label>{{.locale.Tr "settings.comment_type_group_milestone"}}</label>
+						</div>
 					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="assignee" type="checkbox" {{if (call .IsCommentTypeGroupChecked "assignee")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_assignee"}}</label>
+					<div class="inline field">
+						<div class="ui checkbox">
+							<input name="assignee" type="checkbox"{{if (call .IsCommentTypeGroupChecked "assignee")}} checked{{end}}>
+							<label>{{.locale.Tr "settings.comment_type_group_assignee"}}</label>
+						</div>
 					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="title" type="checkbox" {{if (call .IsCommentTypeGroupChecked "title")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_title"}}</label>
+					<div class="inline field">
+						<div class="ui checkbox">
+							<input name="title" type="checkbox"{{if (call .IsCommentTypeGroupChecked "title")}} checked{{end}}>
+							<label>{{.locale.Tr "settings.comment_type_group_title"}}</label>
+						</div>
 					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="branch" type="checkbox" {{if (call .IsCommentTypeGroupChecked "branch")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_branch"}}</label>
+					<div class="inline field">
+						<div class="ui checkbox">
+							<input name="branch" type="checkbox"{{if (call .IsCommentTypeGroupChecked "branch")}} checked{{end}}>
+							<label>{{.locale.Tr "settings.comment_type_group_branch"}}</label>
+						</div>
 					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="time_tracking" type="checkbox" {{if (call .IsCommentTypeGroupChecked "time_tracking")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_time_tracking"}}</label>
+					<div class="inline field">
+						<div class="ui checkbox">
+							<input name="time_tracking" type="checkbox"{{if (call .IsCommentTypeGroupChecked "time_tracking")}} checked{{end}}>
+							<label>{{.locale.Tr "settings.comment_type_group_time_tracking"}}</label>
+						</div>
 					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="deadline" type="checkbox" {{if (call .IsCommentTypeGroupChecked "deadline")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_deadline"}}</label>
+					<div class="inline field">
+						<div class="ui checkbox">
+							<input name="deadline" type="checkbox"{{if (call .IsCommentTypeGroupChecked "deadline")}} checked{{end}}>
+							<label>{{.locale.Tr "settings.comment_type_group_deadline"}}</label>
+						</div>
 					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="dependency" type="checkbox" {{if (call .IsCommentTypeGroupChecked "dependency")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_dependency"}}</label>
+					<div class="inline field">
+						<div class="ui checkbox">
+							<input name="dependency" type="checkbox"{{if (call .IsCommentTypeGroupChecked "dependency")}} checked{{end}}>
+							<label>{{.locale.Tr "settings.comment_type_group_dependency"}}</label>
+						</div>
 					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="lock" type="checkbox" {{if (call .IsCommentTypeGroupChecked "lock")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_lock"}}</label>
+					<div class="inline field">
+						<div class="ui checkbox">
+							<input name="lock" type="checkbox"{{if (call .IsCommentTypeGroupChecked "lock")}} checked{{end}}>
+							<label>{{.locale.Tr "settings.comment_type_group_lock"}}</label>
+						</div>
 					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="review_request" type="checkbox" {{if (call .IsCommentTypeGroupChecked "review_request")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_review_request"}}</label>
+					<div class="inline field">
+						<div class="ui checkbox">
+							<input name="review_request" type="checkbox"{{if (call .IsCommentTypeGroupChecked "review_request")}} checked{{end}}>
+							<label>{{.locale.Tr "settings.comment_type_group_review_request"}}</label>
+						</div>
 					</div>
-				</div>
 
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="pull_request_push" type="checkbox" {{if (call .IsCommentTypeGroupChecked "pull_request_push")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_pull_request_push"}}</label>
+					<div class="inline field">
+						<div class="ui checkbox">
+							<input name="pull_request_push" type="checkbox"{{if (call .IsCommentTypeGroupChecked "pull_request_push")}} checked{{end}}>
+							<label>{{.locale.Tr "settings.comment_type_group_pull_request_push"}}</label>
+						</div>
 					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="project" type="checkbox" {{if (call .IsCommentTypeGroupChecked "project")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_project"}}</label>
+					<div class="inline field">
+						<div class="ui checkbox">
+							<input name="project" type="checkbox"{{if (call .IsCommentTypeGroupChecked "project")}} checked{{end}}>
+							<label>{{.locale.Tr "settings.comment_type_group_project"}}</label>
+						</div>
 					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="issue_ref" type="checkbox" {{if (call .IsCommentTypeGroupChecked "issue_ref")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_issue_ref"}}</label>
+					<div class="inline field">
+						<div class="ui checkbox tooltip" data-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>
 					</div>
-				</div>
-				<div class="field">
-					<button class="ui green button">{{$.locale.Tr "save"}}</button>
-				</div>
-			</form>
+					<div class="field">
+						<button class="ui green button">{{$.locale.Tr "save"}}</button>
+					</div>
+				</form>
+			</div>
 		</div>
 	</div>
 </div>

From 4264d3a2eb08e27ae02453092cebb5ac4b2019b4 Mon Sep 17 00:00:00 2001
From: delvh <leon@kske.dev>
Date: Tue, 11 Apr 2023 01:50:58 +0200
Subject: [PATCH 2/7] Adapt tooltips to new format

---
 templates/user/settings/appearance.tmpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/user/settings/appearance.tmpl b/templates/user/settings/appearance.tmpl
index 09c49a59af15d..cbe44ad4a5cb2 100644
--- a/templates/user/settings/appearance.tmpl
+++ b/templates/user/settings/appearance.tmpl
@@ -70,7 +70,7 @@
 		</div>
 
 		<!-- Shown comment event types -->
-		<div class="ui header tooltip" data-content="{{.locale.Tr "settings.hidden_comment_types_tooltip"}}">
+		<div class="ui header" data-tooltip-content="{{.locale.Tr "settings.hidden_comment_types_tooltip"}}" data-tooltip-placement="top">
 			<h4 class="ui top attached header">
 				{{.locale.Tr "settings.hidden_comment_types"}}
 			</h4>
@@ -78,7 +78,7 @@
 				<form class="ui form" action="{{.Link}}/hidden_comments" method="post">
 					{{.CsrfTokenHtml}}
 					<div class="inline field">
-						<div class="ui checkbox tooltip" data-content="{{.locale.Tr "settings.hidden_comment_types.ref_tooltip"}}">
+						<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>
@@ -157,7 +157,7 @@
 						</div>
 					</div>
 					<div class="inline field">
-						<div class="ui checkbox tooltip" data-content="{{.locale.Tr "settings.hidden_comment_types.issue_ref_tooltip"}}">
+						<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>

From 1a20ed7174806be13bda5af8f6ef9647620d2a0e Mon Sep 17 00:00:00 2001
From: delvh <leon@kske.dev>
Date: Wed, 12 Apr 2023 00:38:05 +0200
Subject: [PATCH 3/7] Replace topmost tooltip with a static help text instead

---
 templates/user/settings/appearance.tmpl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/templates/user/settings/appearance.tmpl b/templates/user/settings/appearance.tmpl
index cbe44ad4a5cb2..b3ee89450497d 100644
--- a/templates/user/settings/appearance.tmpl
+++ b/templates/user/settings/appearance.tmpl
@@ -70,11 +70,14 @@
 		</div>
 
 		<!-- Shown comment event types -->
-		<div class="ui header" data-tooltip-content="{{.locale.Tr "settings.hidden_comment_types_tooltip"}}" data-tooltip-placement="top">
+		<div class="ui header" data-tooltip-content="" data-tooltip-placement="top">
 			<h4 class="ui top attached header">
 				{{.locale.Tr "settings.hidden_comment_types"}}
 			</h4>
 			<div class="ui attached segment">
+				<p class="help">
+					{{.locale.Tr "settings.hidden_comment_types_tooltip"}}
+				</p>
 				<form class="ui form" action="{{.Link}}/hidden_comments" method="post">
 					{{.CsrfTokenHtml}}
 					<div class="inline field">

From 428014223ec8abea0398b1e68b2955555b3d029a Mon Sep 17 00:00:00 2001
From: delvh <leon@kske.dev>
Date: Wed, 12 Apr 2023 00:39:15 +0200
Subject: [PATCH 4/7] Remove leftovers from previous commit

---
 templates/user/settings/appearance.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/user/settings/appearance.tmpl b/templates/user/settings/appearance.tmpl
index b3ee89450497d..d56a5bd74f759 100644
--- a/templates/user/settings/appearance.tmpl
+++ b/templates/user/settings/appearance.tmpl
@@ -70,7 +70,7 @@
 		</div>
 
 		<!-- Shown comment event types -->
-		<div class="ui header" data-tooltip-content="" data-tooltip-placement="top">
+		<div class="ui header">
 			<h4 class="ui top attached header">
 				{{.locale.Tr "settings.hidden_comment_types"}}
 			</h4>

From dd64ca1fddd397d9098d58232b4887fc67ef106d Mon Sep 17 00:00:00 2001
From: delvh <leon@kske.dev>
Date: Wed, 12 Apr 2023 00:40:24 +0200
Subject: [PATCH 5/7] Use English '/' whitespace behavior instead of the German
 alternative

---
 options/locale/locale_en-US.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index dc5cfa7d357b3..8bbd8e324fc7f 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -597,9 +597,9 @@ cancel = Cancel
 language = Language
 ui = Theme
 hidden_comment_types = Hidden comment types
-hidden_comment_types_tooltip = 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
+hidden_comment_types_tooltip = 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

From d793e30b590e35fddddbedf183fd75c5d6000251 Mon Sep 17 00:00:00 2001
From: delvh <leon@kske.dev>
Date: Wed, 12 Apr 2023 11:07:31 +0200
Subject: [PATCH 6/7] Rename tooltip to description and remove unnecessary
 `<div>`

---
 options/locale/locale_en-US.ini         |   2 +-
 templates/user/settings/appearance.tmpl | 168 ++++++++++++------------
 2 files changed, 84 insertions(+), 86 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 8bbd8e324fc7f..7ca90f0947b9e 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -597,7 +597,7 @@ cancel = Cancel
 language = Language
 ui = Theme
 hidden_comment_types = Hidden comment types
-hidden_comment_types_tooltip = 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_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
diff --git a/templates/user/settings/appearance.tmpl b/templates/user/settings/appearance.tmpl
index d56a5bd74f759..c98caf632d301 100644
--- a/templates/user/settings/appearance.tmpl
+++ b/templates/user/settings/appearance.tmpl
@@ -70,106 +70,104 @@
 		</div>
 
 		<!-- Shown comment event types -->
-		<div class="ui header">
-			<h4 class="ui top attached header">
-				{{.locale.Tr "settings.hidden_comment_types"}}
-			</h4>
-			<div class="ui attached segment">
-				<p class="help">
-					{{.locale.Tr "settings.hidden_comment_types_tooltip"}}
-				</p>
-				<form class="ui form" action="{{.Link}}/hidden_comments" method="post">
-					{{.CsrfTokenHtml}}
-					<div class="inline field">
-						<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>
+		<h4 class="ui top attached header">
+			{{.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" 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>
-					<div class="inline field">
-						<div class="ui checkbox">
-							<input name="label" type="checkbox"{{if (call .IsCommentTypeGroupChecked "label")}} checked{{end}}>
-							<label>{{.locale.Tr "settings.comment_type_group_label"}}</label>
-						</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="label" type="checkbox"{{if (call .IsCommentTypeGroupChecked "label")}} checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_label"}}</label>
 					</div>
-					<div class="inline field">
-						<div class="ui checkbox">
-							<input name="milestone" type="checkbox"{{if (call .IsCommentTypeGroupChecked "milestone")}} checked{{end}}>
-							<label>{{.locale.Tr "settings.comment_type_group_milestone"}}</label>
-						</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="milestone" type="checkbox"{{if (call .IsCommentTypeGroupChecked "milestone")}} checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_milestone"}}</label>
 					</div>
-					<div class="inline field">
-						<div class="ui checkbox">
-							<input name="assignee" type="checkbox"{{if (call .IsCommentTypeGroupChecked "assignee")}} checked{{end}}>
-							<label>{{.locale.Tr "settings.comment_type_group_assignee"}}</label>
-						</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="assignee" type="checkbox"{{if (call .IsCommentTypeGroupChecked "assignee")}} checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_assignee"}}</label>
 					</div>
-					<div class="inline field">
-						<div class="ui checkbox">
-							<input name="title" type="checkbox"{{if (call .IsCommentTypeGroupChecked "title")}} checked{{end}}>
-							<label>{{.locale.Tr "settings.comment_type_group_title"}}</label>
-						</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="title" type="checkbox"{{if (call .IsCommentTypeGroupChecked "title")}} checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_title"}}</label>
 					</div>
-					<div class="inline field">
-						<div class="ui checkbox">
-							<input name="branch" type="checkbox"{{if (call .IsCommentTypeGroupChecked "branch")}} checked{{end}}>
-							<label>{{.locale.Tr "settings.comment_type_group_branch"}}</label>
-						</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="branch" type="checkbox"{{if (call .IsCommentTypeGroupChecked "branch")}} checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_branch"}}</label>
 					</div>
-					<div class="inline field">
-						<div class="ui checkbox">
-							<input name="time_tracking" type="checkbox"{{if (call .IsCommentTypeGroupChecked "time_tracking")}} checked{{end}}>
-							<label>{{.locale.Tr "settings.comment_type_group_time_tracking"}}</label>
-						</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="time_tracking" type="checkbox"{{if (call .IsCommentTypeGroupChecked "time_tracking")}} checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_time_tracking"}}</label>
 					</div>
-					<div class="inline field">
-						<div class="ui checkbox">
-							<input name="deadline" type="checkbox"{{if (call .IsCommentTypeGroupChecked "deadline")}} checked{{end}}>
-							<label>{{.locale.Tr "settings.comment_type_group_deadline"}}</label>
-						</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="deadline" type="checkbox"{{if (call .IsCommentTypeGroupChecked "deadline")}} checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_deadline"}}</label>
 					</div>
-					<div class="inline field">
-						<div class="ui checkbox">
-							<input name="dependency" type="checkbox"{{if (call .IsCommentTypeGroupChecked "dependency")}} checked{{end}}>
-							<label>{{.locale.Tr "settings.comment_type_group_dependency"}}</label>
-						</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="dependency" type="checkbox"{{if (call .IsCommentTypeGroupChecked "dependency")}} checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_dependency"}}</label>
 					</div>
-					<div class="inline field">
-						<div class="ui checkbox">
-							<input name="lock" type="checkbox"{{if (call .IsCommentTypeGroupChecked "lock")}} checked{{end}}>
-							<label>{{.locale.Tr "settings.comment_type_group_lock"}}</label>
-						</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="lock" type="checkbox"{{if (call .IsCommentTypeGroupChecked "lock")}} checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_lock"}}</label>
 					</div>
-					<div class="inline field">
-						<div class="ui checkbox">
-							<input name="review_request" type="checkbox"{{if (call .IsCommentTypeGroupChecked "review_request")}} checked{{end}}>
-							<label>{{.locale.Tr "settings.comment_type_group_review_request"}}</label>
-						</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="review_request" type="checkbox"{{if (call .IsCommentTypeGroupChecked "review_request")}} checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_review_request"}}</label>
 					</div>
+				</div>
 
-					<div class="inline field">
-						<div class="ui checkbox">
-							<input name="pull_request_push" type="checkbox"{{if (call .IsCommentTypeGroupChecked "pull_request_push")}} checked{{end}}>
-							<label>{{.locale.Tr "settings.comment_type_group_pull_request_push"}}</label>
-						</div>
-					</div>
-					<div class="inline field">
-						<div class="ui checkbox">
-							<input name="project" type="checkbox"{{if (call .IsCommentTypeGroupChecked "project")}} checked{{end}}>
-							<label>{{.locale.Tr "settings.comment_type_group_project"}}</label>
-						</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="pull_request_push" type="checkbox"{{if (call .IsCommentTypeGroupChecked "pull_request_push")}} checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_pull_request_push"}}</label>
 					</div>
-					<div class="inline field">
-						<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>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="project" type="checkbox"{{if (call .IsCommentTypeGroupChecked "project")}} checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_project"}}</label>
 					</div>
-					<div class="field">
-						<button class="ui green button">{{$.locale.Tr "save"}}</button>
+				</div>
+				<div class="inline field">
+					<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>
-				</form>
-			</div>
+				</div>
+				<div class="field">
+					<button class="ui green button">{{$.locale.Tr "save"}}</button>
+				</div>
+			</form>
 		</div>
 	</div>
 </div>

From 9a726b73718a3893e3a49b88e37674bd2676e0ce Mon Sep 17 00:00:00 2001
From: delvh <leon@kske.dev>
Date: Wed, 12 Apr 2023 11:19:20 +0200
Subject: [PATCH 7/7] Revert unrelated changes

---
 templates/user/settings/appearance.tmpl | 28 ++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/templates/user/settings/appearance.tmpl b/templates/user/settings/appearance.tmpl
index c98caf632d301..c78caedc96b3a 100644
--- a/templates/user/settings/appearance.tmpl
+++ b/templates/user/settings/appearance.tmpl
@@ -81,86 +81,86 @@
 				{{.CsrfTokenHtml}}
 				<div class="inline field">
 					<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}}>
+						<input name="reference" type="checkbox" {{if(call .IsCommentTypeGroupChecked "reference")}}checked{{end}}>
 						<label>{{.locale.Tr "settings.comment_type_group_reference"}}</label>
 					</div>
 				</div>
 				<div class="inline field">
 					<div class="ui checkbox">
-						<input name="label" type="checkbox"{{if (call .IsCommentTypeGroupChecked "label")}} checked{{end}}>
+						<input name="label" type="checkbox" {{if (call .IsCommentTypeGroupChecked "label")}}checked{{end}}>
 						<label>{{.locale.Tr "settings.comment_type_group_label"}}</label>
 					</div>
 				</div>
 				<div class="inline field">
 					<div class="ui checkbox">
-						<input name="milestone" type="checkbox"{{if (call .IsCommentTypeGroupChecked "milestone")}} checked{{end}}>
+						<input name="milestone" type="checkbox" {{if (call .IsCommentTypeGroupChecked "milestone")}}checked{{end}}>
 						<label>{{.locale.Tr "settings.comment_type_group_milestone"}}</label>
 					</div>
 				</div>
 				<div class="inline field">
 					<div class="ui checkbox">
-						<input name="assignee" type="checkbox"{{if (call .IsCommentTypeGroupChecked "assignee")}} checked{{end}}>
+						<input name="assignee" type="checkbox" {{if (call .IsCommentTypeGroupChecked "assignee")}}checked{{end}}>
 						<label>{{.locale.Tr "settings.comment_type_group_assignee"}}</label>
 					</div>
 				</div>
 				<div class="inline field">
 					<div class="ui checkbox">
-						<input name="title" type="checkbox"{{if (call .IsCommentTypeGroupChecked "title")}} checked{{end}}>
+						<input name="title" type="checkbox" {{if (call .IsCommentTypeGroupChecked "title")}}checked{{end}}>
 						<label>{{.locale.Tr "settings.comment_type_group_title"}}</label>
 					</div>
 				</div>
 				<div class="inline field">
 					<div class="ui checkbox">
-						<input name="branch" type="checkbox"{{if (call .IsCommentTypeGroupChecked "branch")}} checked{{end}}>
+						<input name="branch" type="checkbox" {{if (call .IsCommentTypeGroupChecked "branch")}}checked{{end}}>
 						<label>{{.locale.Tr "settings.comment_type_group_branch"}}</label>
 					</div>
 				</div>
 				<div class="inline field">
 					<div class="ui checkbox">
-						<input name="time_tracking" type="checkbox"{{if (call .IsCommentTypeGroupChecked "time_tracking")}} checked{{end}}>
+						<input name="time_tracking" type="checkbox" {{if (call .IsCommentTypeGroupChecked "time_tracking")}}checked{{end}}>
 						<label>{{.locale.Tr "settings.comment_type_group_time_tracking"}}</label>
 					</div>
 				</div>
 				<div class="inline field">
 					<div class="ui checkbox">
-						<input name="deadline" type="checkbox"{{if (call .IsCommentTypeGroupChecked "deadline")}} checked{{end}}>
+						<input name="deadline" type="checkbox" {{if (call .IsCommentTypeGroupChecked "deadline")}}checked{{end}}>
 						<label>{{.locale.Tr "settings.comment_type_group_deadline"}}</label>
 					</div>
 				</div>
 				<div class="inline field">
 					<div class="ui checkbox">
-						<input name="dependency" type="checkbox"{{if (call .IsCommentTypeGroupChecked "dependency")}} checked{{end}}>
+						<input name="dependency" type="checkbox" {{if (call .IsCommentTypeGroupChecked "dependency")}}checked{{end}}>
 						<label>{{.locale.Tr "settings.comment_type_group_dependency"}}</label>
 					</div>
 				</div>
 				<div class="inline field">
 					<div class="ui checkbox">
-						<input name="lock" type="checkbox"{{if (call .IsCommentTypeGroupChecked "lock")}} checked{{end}}>
+						<input name="lock" type="checkbox" {{if (call .IsCommentTypeGroupChecked "lock")}}checked{{end}}>
 						<label>{{.locale.Tr "settings.comment_type_group_lock"}}</label>
 					</div>
 				</div>
 				<div class="inline field">
 					<div class="ui checkbox">
-						<input name="review_request" type="checkbox"{{if (call .IsCommentTypeGroupChecked "review_request")}} checked{{end}}>
+						<input name="review_request" type="checkbox" {{if (call .IsCommentTypeGroupChecked "review_request")}}checked{{end}}>
 						<label>{{.locale.Tr "settings.comment_type_group_review_request"}}</label>
 					</div>
 				</div>
 
 				<div class="inline field">
 					<div class="ui checkbox">
-						<input name="pull_request_push" type="checkbox"{{if (call .IsCommentTypeGroupChecked "pull_request_push")}} checked{{end}}>
+						<input name="pull_request_push" type="checkbox" {{if (call .IsCommentTypeGroupChecked "pull_request_push")}}checked{{end}}>
 						<label>{{.locale.Tr "settings.comment_type_group_pull_request_push"}}</label>
 					</div>
 				</div>
 				<div class="inline field">
 					<div class="ui checkbox">
-						<input name="project" type="checkbox"{{if (call .IsCommentTypeGroupChecked "project")}} checked{{end}}>
+						<input name="project" type="checkbox" {{if (call .IsCommentTypeGroupChecked "project")}}checked{{end}}>
 						<label>{{.locale.Tr "settings.comment_type_group_project"}}</label>
 					</div>
 				</div>
 				<div class="inline field">
 					<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}}>
+						<input name="issue_ref" type="checkbox" {{if (call .IsCommentTypeGroupChecked "issue_ref")}}checked{{end}}>
 						<label>{{.locale.Tr "settings.comment_type_group_issue_ref"}}</label>
 					</div>
 				</div>