From 4572edb6f3b020880fa6c06a40f75bb4c2e37d8d Mon Sep 17 00:00:00 2001
From: delvh <leon@kske.dev>
Date: Tue, 14 Mar 2023 10:47:52 +0100
Subject: [PATCH 1/3] Fix .locale.Tr function not found in delete modal

---
 templates/base/delete_modal_actions.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/base/delete_modal_actions.tmpl b/templates/base/delete_modal_actions.tmpl
index 29bf5f92fd53f..2f637e73b1725 100644
--- a/templates/base/delete_modal_actions.tmpl
+++ b/templates/base/delete_modal_actions.tmpl
@@ -1,10 +1,10 @@
 <div class="actions">
 	<button class="ui red basic inverted cancel button">
 		{{svg "octicon-x"}}
-		{{.locale.Tr "modal.no"}}
+		{{$.locale.Tr "modal.no"}}
 	</button>
 	<button class="ui green basic inverted ok button">
 		{{svg "octicon-check"}}
-		{{.locale.Tr "modal.yes"}}
+		{{$.locale.Tr "modal.yes"}}
 	</button>
 </div>

From 59a8e7618b7f97df2b7143fb8cd7f386e7d26734 Mon Sep 17 00:00:00 2001
From: delvh <leon@kske.dev>
Date: Tue, 14 Mar 2023 11:13:04 +0100
Subject: [PATCH 2/3] Pass `$` instead of `.`

---
 templates/base/delete_modal_actions.tmpl | 4 ++--
 templates/user/settings/repos.tmpl       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/base/delete_modal_actions.tmpl b/templates/base/delete_modal_actions.tmpl
index 2f637e73b1725..29bf5f92fd53f 100644
--- a/templates/base/delete_modal_actions.tmpl
+++ b/templates/base/delete_modal_actions.tmpl
@@ -1,10 +1,10 @@
 <div class="actions">
 	<button class="ui red basic inverted cancel button">
 		{{svg "octicon-x"}}
-		{{$.locale.Tr "modal.no"}}
+		{{.locale.Tr "modal.no"}}
 	</button>
 	<button class="ui green basic inverted ok button">
 		{{svg "octicon-check"}}
-		{{$.locale.Tr "modal.yes"}}
+		{{.locale.Tr "modal.yes"}}
 	</button>
 </div>
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 2e107ca7fa1a7..c87e2d7cb9eff 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -68,7 +68,7 @@
 														{{$.CsrfTokenHtml}}
 														<input type="hidden" name="id" value="{{$dir}}">
 														<input type="hidden" name="action" value="delete">
-														{{template "base/delete_modal_actions" .}}
+														{{template "base/delete_modal_actions" $}}
 													</form>
 												</div>
 											{{end}}

From f55a200c4177d6f54b4a4988d5f066887b84aa94 Mon Sep 17 00:00:00 2001
From: delvh <leon@kske.dev>
Date: Tue, 14 Mar 2023 18:25:31 +0100
Subject: [PATCH 3/3] De-convert deletion dialogues that are not targeting
 deletions

---
 templates/admin/repo/unadopted.tmpl | 22 ++++++++++++++++++++--
 templates/user/settings/repos.tmpl  | 11 ++++++++++-
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index 7ff41d503ad29..a8e04850d0dd3 100644
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -43,7 +43,16 @@
 												<input type="hidden" name="action" value="adopt">
 												<input type="hidden" name="q" value="{{$.Keyword}}">
 												<input type="hidden" name="page" value="{{$.CurrentPage}}">
-												{{template "base/delete_modal_actions" .}}
+												<div class="actions">
+													<button class="ui red basic inverted cancel button">
+														{{svg "octicon-trash" 16 "gt-mr-2"}}
+														{{$.locale.Tr "modal.no"}}
+													</button>
+													<button class="ui green basic inverted ok button">
+														{{svg "octicon-check" 16 "gt-mr-2"}}
+														{{$.locale.Tr "modal.yes"}}
+													</button>
+												</div>
 											</form>
 										</div>
 										<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
@@ -61,7 +70,16 @@
 												<input type="hidden" name="action" value="delete">
 												<input type="hidden" name="q" value="{{$.Keyword}}">
 												<input type="hidden" name="page" value="{{$.CurrentPage}}">
-												{{template "base/delete_modal_actions" .}}
+												<div class="actions">
+													<button class="ui red basic inverted cancel button">
+														{{svg "octicon-trash" 16 "gt-mr-2"}}
+														{{$.locale.Tr "modal.no"}}
+													</button>
+													<button class="ui green basic inverted ok button">
+														{{svg "octicon-check" 16 "gt-mr-2"}}
+														{{$.locale.Tr "modal.yes"}}
+													</button>
+												</div>
 											</form>
 										</div>
 									</div>
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index c87e2d7cb9eff..6742cb1671826 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -50,7 +50,16 @@
 														{{$.CsrfTokenHtml}}
 														<input type="hidden" name="id" value="{{$dir}}">
 														<input type="hidden" name="action" value="adopt">
-														{{template "base/delete_modal_actions" .}}
+														<div class="actions">
+															<button class="ui red basic inverted cancel button">
+																{{svg "octicon-x"}}
+																{{$.locale.Tr "modal.no"}}
+															</button>
+															<button class="ui green basic inverted ok button">
+																{{svg "octicon-check"}}
+																{{$.locale.Tr "modal.yes"}}
+															</button>
+														</div>
 													</form>
 												</div>
 											{{end}}