From f3852c37ed1c715125657a30a4c46f2b4b98a8e4 Mon Sep 17 00:00:00 2001
From: Andrew Thornton <art27@cantab.net>
Date: Mon, 28 Jun 2021 14:14:37 +0100
Subject: [PATCH] as per noerw

Signed-off-by: Andrew Thornton <art27@cantab.net>
---
 templates/repo/migrate/migrating.tmpl         | 34 +-----------------
 .../repo/settings/delete_repo_modal.tmpl      | 33 +++++++++++++++++
 templates/repo/settings/options.tmpl          | 35 +------------------
 3 files changed, 35 insertions(+), 67 deletions(-)
 create mode 100644 templates/repo/settings/delete_repo_modal.tmpl

diff --git a/templates/repo/migrate/migrating.tmpl b/templates/repo/migrate/migrating.tmpl
index cc12243205c15..e951040b4e3e7 100644
--- a/templates/repo/migrate/migrating.tmpl
+++ b/templates/repo/migrate/migrating.tmpl
@@ -41,37 +41,5 @@
 		</div>
 	</div>
 </div>
-<div class="ui small modal" id="delete-repo-modal">
-	<div class="header">
-		{{.i18n.Tr "repo.settings.delete"}}
-	</div>
-	<div class="content">
-		<div class="ui warning message text left">
-			{{.i18n.Tr "repo.settings.delete_notices_1" | Safe}}<br>
-			{{.i18n.Tr "repo.settings.delete_notices_2" .Repository.FullName | Safe}}
-			{{if .Repository.NumForks}}<br>
-			{{.i18n.Tr "repo.settings.delete_notices_fork_1"}}
-			{{end}}
-		</div>
-		<form class="ui form" action="{{.Link}}/settings" method="post">
-			{{.CsrfTokenHtml}}
-			<input type="hidden" name="action" value="delete">
-			<div class="field">
-				<label>
-					{{.i18n.Tr "repo.settings.transfer_form_title"}}
-					<span class="text red">{{.Repository.Name}}</span>
-				</label>
-			</div>
-			<div class="required field">
-				<label for="repo_name">{{.i18n.Tr "repo.repo_name"}}</label>
-				<input id="repo_name" name="repo_name" required>
-			</div>
-
-			<div class="text right actions">
-				<div class="ui cancel button">{{.i18n.Tr "settings.cancel"}}</div>
-				<button class="ui red button">{{.i18n.Tr "repo.settings.confirm_delete"}}</button>
-			</div>
-		</form>
-	</div>
-</div>
+{{template "repo/settings/delete_repo_modal" .}}
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/delete_repo_modal.tmpl b/templates/repo/settings/delete_repo_modal.tmpl
new file mode 100644
index 0000000000000..61ba3fb4e39cd
--- /dev/null
+++ b/templates/repo/settings/delete_repo_modal.tmpl
@@ -0,0 +1,33 @@
+<div class="ui small modal" id="delete-repo-modal">
+	<div class="header">
+		{{.i18n.Tr "repo.settings.delete"}}
+	</div>
+	<div class="content">
+		<div class="ui warning message text left">
+			{{.i18n.Tr "repo.settings.delete_notices_1" | Safe}}<br>
+			{{.i18n.Tr "repo.settings.delete_notices_2" .Repository.FullName | Safe}}
+			{{if .Repository.NumForks}}<br>
+			{{.i18n.Tr "repo.settings.delete_notices_fork_1"}}
+			{{end}}
+		</div>
+		<form class="ui form" action="{{.Link}}" method="post">
+			{{.CsrfTokenHtml}}
+			<input type="hidden" name="action" value="delete">
+			<div class="field">
+				<label>
+					{{.i18n.Tr "repo.settings.transfer_form_title"}}
+					<span class="text red">{{.Repository.Name}}</span>
+				</label>
+			</div>
+			<div class="required field">
+				<label for="repo_name">{{.i18n.Tr "repo.repo_name"}}</label>
+				<input id="repo_name" name="repo_name" required>
+			</div>
+
+			<div class="text right actions">
+				<div class="ui cancel button">{{.i18n.Tr "settings.cancel"}}</div>
+				<button class="ui red button">{{.i18n.Tr "repo.settings.confirm_delete"}}</button>
+			</div>
+		</form>
+	</div>
+</div>
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index eb76a3b720064..e0e231d00e2ac 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -761,40 +761,7 @@
 			</form>
 		</div>
 	</div>
-
-	<div class="ui small modal" id="delete-repo-modal">
-		<div class="header">
-			{{.i18n.Tr "repo.settings.delete"}}
-		</div>
-		<div class="content">
-			<div class="ui warning message text left">
-				{{.i18n.Tr "repo.settings.delete_notices_1" | Safe}}<br>
-				{{.i18n.Tr "repo.settings.delete_notices_2" .Repository.FullName | Safe}}
-				{{if .Repository.NumForks}}<br>
-				{{.i18n.Tr "repo.settings.delete_notices_fork_1"}}
-				{{end}}
-			</div>
-			<form class="ui form" action="{{.Link}}" method="post">
-				{{.CsrfTokenHtml}}
-				<input type="hidden" name="action" value="delete">
-				<div class="field">
-					<label>
-						{{.i18n.Tr "repo.settings.transfer_form_title"}}
-						<span class="text red">{{.Repository.Name}}</span>
-					</label>
-				</div>
-				<div class="required field">
-					<label for="repo_name">{{.i18n.Tr "repo.repo_name"}}</label>
-					<input id="repo_name" name="repo_name" required>
-				</div>
-
-				<div class="text right actions">
-					<div class="ui cancel button">{{.i18n.Tr "settings.cancel"}}</div>
-					<button class="ui red button">{{.i18n.Tr "repo.settings.confirm_delete"}}</button>
-				</div>
-			</form>
-		</div>
-	</div>
+	{{template "repo/settings/delete_repo_modal" .}}
 
 	{{if .Repository.UnitEnabled $.UnitTypeWiki}}
 	<div class="ui small modal" id="delete-wiki-modal">