diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index 91b84e13b6..781f514af4 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -408,7 +408,10 @@
-
+
@@ -424,16 +427,4 @@
{{ctx.Locale.Tr "admin.auths.tips.oauth2.general.tip"}}
-
-
-
-
-
{{ctx.Locale.Tr "admin.auths.delete_auth_desc"}}
-
- {{template "base/modal_actions_confirm" .}}
-
-
{{template "admin/layout_footer" .}}
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index 985caf6bdf..4817f2681b 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -72,7 +72,12 @@
{{FileSize .CalculateBlobSize}} |
{{DateUtils.AbsoluteShort .Version.CreatedUnix}} |
- {{svg "octicon-trash"}} |
+
+ {{svg "octicon-trash"}}
+ |
{{else}}
{{ctx.Locale.Tr "no_results_found"}} |
@@ -84,15 +89,13 @@
{{template "base/paginate" .}}
-
+
{{template "admin/layout_footer" .}}
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index ce08d49656..2ad2de3a1d 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -84,7 +84,12 @@
{{FileSize .LFSSize}} |
{{DateUtils.AbsoluteShort .UpdatedUnix}} |
{{DateUtils.AbsoluteShort .CreatedUnix}} |
- {{svg "octicon-trash"}} |
+
+ {{svg "octicon-trash"}}
+ |
{{else}}
{{ctx.Locale.Tr "no_results_found"}} |
@@ -96,17 +101,15 @@
{{template "base/paginate" .}}
-
+
{{template "admin/layout_footer" .}}
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl
index f6d549a634..e769543f6a 100644
--- a/templates/projects/list.tmpl
+++ b/templates/projects/list.tmpl
@@ -67,7 +67,7 @@
{{else}}
{{svg "octicon-skip" 14}}{{ctx.Locale.Tr "repo.projects.close"}}
{{end}}
- {{svg "octicon-trash" 14}}{{ctx.Locale.Tr "repo.issues.label_delete"}}
+ {{svg "octicon-trash" 14}}{{ctx.Locale.Tr "repo.issues.label_delete"}}
{{end}}
@@ -81,14 +81,9 @@
{{if and $.CanWriteProjects (not $.Repository.IsArchived)}}
-
{{end}}
@@ -92,15 +92,11 @@
{{if or .CanWriteIssues .CanWritePulls}}
-
-
-
-
{{ctx.Locale.Tr "repo.milestones.deletion_desc"}}
-
+
+
+
{{ctx.Locale.Tr "repo.milestones.deletion_desc"}}
{{template "base/modal_actions_confirm" .}}
{{end}}
+
{{template "base/footer" .}}
diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl
index f61a8ef9e7..109a18fa0e 100644
--- a/templates/repo/release/new.tmpl
+++ b/templates/repo/release/new.tmpl
@@ -105,7 +105,7 @@
{{ctx.Locale.Tr "repo.release.cancel"}}
-
+
{{ctx.Locale.Tr "repo.release.delete_release"}}
{{if .IsDraft}}
@@ -129,15 +129,11 @@
{{if .PageIsEditRelease}}
-
-
-
-
{{ctx.Locale.Tr "repo.release.deletion_desc"}}
-
+
+
+
{{ctx.Locale.Tr "repo.release.deletion_desc"}}
{{template "base/modal_actions_confirm" .}}
{{end}}
+
{{template "base/footer" .}}
diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index ef4732540b..e8e7a3f1c2 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -49,8 +49,8 @@
@@ -65,14 +65,9 @@
{{end}}
-
-
-
-
{{ctx.Locale.Tr "repo.settings.protected_branch_deletion_desc"}}
-
+
+
+
{{ctx.Locale.Tr "repo.settings.protected_branch_deletion_desc"}}
{{template "base/modal_actions_confirm" .}}
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index e941a2c4b6..62903e1cfb 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -29,7 +29,7 @@
-