Change to vertical navbar layout for secondary navbar for repo/user/admin settings (#24246)

Co-Author: @wxiaoguang 

This is the first step of #24229. And this PR will only includes html
changes, and followed by other PRs that fine tune css and change to
submenus.

After:

Admin Level

<img width="1400" alt="Screen Shot 2023-04-21 at 10 07 16"
src="https://user-images.githubusercontent.com/17645053/233523870-f848b61d-056a-4b41-9760-a9a49fea1fe8.png">

User Level

<img width="1422" alt="Screen Shot 2023-04-21 at 10 07 23"
src="https://user-images.githubusercontent.com/17645053/233523878-979adb20-a657-43d9-99a6-ad414010c0ef.png">

Repo Level

<img width="1404" alt="Screen Shot 2023-04-21 at 10 07 07"
src="https://user-images.githubusercontent.com/17645053/233523863-337440bd-c03a-4dfd-87fa-cef40300bfe0.png">

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

contrib/upgrade.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # This is an update script for gitea installed via the binary distribution
-# from dl.gitea.io on linux as systemd service. It performs a backup and updates
+# from dl.gitea.com on linux as systemd service. It performs a backup and updates
 # Gitea in place.
 # NOTE: This adds the GPG Signing Key of the Gitea maintainers to the keyring.
 # Depends on: bash, curl, xz, sha256sum. optionally jq, gpg
@@ -69,7 +69,7 @@ require curl xz sha256sum "$sudocmd"
 # select version to install
 if [[ -z "${giteaversion:-}" ]]; then
   require jq
-  giteaversion=$(curl --connect-timeout 10 -sL https://dl.gitea.io/gitea/version.json | jq -r .latest.version)
+  giteaversion=$(curl --connect-timeout 10 -sL https://dl.gitea.com/gitea/version.json | jq -r .latest.version)
   echo "Latest available version is $giteaversion"
 fi
 
@@ -91,7 +91,7 @@ cd "$giteahome" # needed for gitea dump later
 
 # download new binary
 binname="gitea-${giteaversion}-${arch}"
-binurl="https://dl.gitea.io/gitea/${giteaversion}/${binname}.xz"
+binurl="https://dl.gitea.com/gitea/${giteaversion}/${binname}.xz"
 echo "Downloading $binurl..."
 curl --connect-timeout 10 --silent --show-error --fail --location -O "$binurl{,.sha256,.asc}"
 

modules/actions/workflows.go

@@ -29,6 +29,14 @@ func init() {
 	}
 }
 
+func IsWorkflow(path string) bool {
+	if (!strings.HasSuffix(path, ".yaml")) && (!strings.HasSuffix(path, ".yml")) {
+		return false
+	}
+
+	return strings.HasPrefix(path, ".gitea/workflows") || strings.HasPrefix(path, ".github/workflows")
+}
+
 func ListWorkflows(commit *git.Commit) (git.Entries, error) {
 	tree, err := commit.SubTree(".gitea/workflows")
 	if _, ok := err.(git.ErrNotExist); ok {

options/locale/locale_en-US.ini

@@ -462,6 +462,8 @@ team_invite.text_3 = Note: This invitation was intended for %[1]s. If you were n
 [modal]
 yes = Yes
 no = No
+confirm = Confirm
+cancel = Cancel
 modify = Update
 
 [form]

routers/web/repo/view.go

@@ -24,6 +24,7 @@ import (
 	repo_model "code.gitea.io/gitea/models/repo"
 	unit_model "code.gitea.io/gitea/models/unit"
 	user_model "code.gitea.io/gitea/models/user"
+	"code.gitea.io/gitea/modules/actions"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/charset"
 	"code.gitea.io/gitea/modules/container"
@@ -39,6 +40,8 @@ import (
 	"code.gitea.io/gitea/modules/typesniffer"
 	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/routers/web/feed"
+
+	"github.com/nektos/act/pkg/model"
 )
 
 const (
@@ -348,6 +351,15 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
 		if issueConfigErr != nil {
 			ctx.Data["FileError"] = strings.TrimSpace(issueConfigErr.Error())
 		}
+	} else if actions.IsWorkflow(ctx.Repo.TreePath) {
+		content, err := actions.GetContentFromEntry(entry)
+		if err != nil {
+			log.Error("actions.GetContentFromEntry: %v", err)
+		}
+		_, workFlowErr := model.ReadWorkflow(bytes.NewReader(content))
+		if workFlowErr != nil {
+			ctx.Data["FileError"] = ctx.Locale.Tr("actions.runs.invalid_workflow_helper", workFlowErr.Error())
+		}
 	}
 
 	isDisplayingSource := ctx.FormString("display") == "source"

templates/admin/applications/list.tmpl

@@ -1,14 +1,8 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin config">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		<div class="twelve wide column content">
-			{{template "base/alert" .}}
-			<h4 class="ui top attached header">
-					{{.locale.Tr "settings.applications"}}
-			</h4>
-			{{template "user/settings/applications_oauth2_list" .}}
-		</div>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
+	<div class="admin-setting-content">
+		<h4 class="ui top attached header">
+				{{.locale.Tr "settings.applications"}}
+		</h4>
+		{{template "user/settings/applications_oauth2_list" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}

templates/admin/applications/oauth2_edit.tmpl

@@ -1,7 +1,6 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin config">
-	{{template "admin/navbar" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
+	<div class="admin-setting-content">
 
-	{{template "user/settings/applications_oauth2_edit_form" .}}
-</div>
-{{template "base/footer" .}}
+		{{template "user/settings/applications_oauth2_edit_form" .}}
+	</div>
+{{template "admin/layout_footer" .}}

templates/admin/auth/edit.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin edit authentication">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin edit authentication")}}
+	<div class="admin-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.auths.edit"}}
 		</h4>
@@ -438,16 +435,16 @@
 			</form>
 		</div>
 	</div>
-</div>
 
-<div class="ui small basic delete modal">
-	<div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "admin.auths.delete_auth_title"}}
 	</div>
 	<div class="content">
 		<p>{{.locale.Tr "admin.auths.delete_auth_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
-{{template "base/footer" .}}
+
+{{template "admin/layout_footer" .}}

templates/admin/auth/list.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin authentication">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin authentication")}}
+	<div class="admin-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.auths.auth_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
 			<div class="ui right">
@@ -38,5 +35,4 @@
 			</table>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}

templates/admin/auth/new.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin new authentication">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin new authentication")}}
+	<div class="admin-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.auths.new"}}
 		</h4>
@@ -122,5 +119,4 @@
 			</div>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}

templates/admin/config.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin config">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
+	<div class="admin-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.config.server_config"}}
 		</h4>
@@ -426,5 +423,4 @@
 			</dl>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}

templates/admin/dashboard.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin dashboard">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin dashboard")}}
+	<div class="admin-setting-content">
 		{{if .NeedUpdate}}
 			<div class="ui negative message flash-error">
 				<p>{{(.locale.Tr "admin.dashboard.new_version_hint" .RemoteVersion AppVer) | Str2html}}</p>
@@ -145,5 +142,4 @@
 			</dl>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}

templates/admin/emails/list.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin user">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
+	<div class="admin-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.emails.email_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
 		</h4>
@@ -73,11 +70,11 @@
 
 		{{template "base/paginate" .}}
 
-		<div class="ui basic modal" id="change-email-modal">
-			<div class="ui icon header">
+		<div class="ui gitea-confirm-modal modal" id="change-email-modal">
+			<div class="header">
 				{{.locale.Tr "admin.emails.change_email_header"}}
 			</div>
-			<div class="content center">
+			<div class="content">
 				<p class="center">{{.locale.Tr "admin.emails.change_email_text"}}</p>
 
 				<form class="ui form" id="email-action-form" action="{{AppSubUrl}}/admin/emails/activate" method="post">
@@ -94,12 +91,11 @@
 					<input type="hidden" id="form-activate" name="activate" value="" required>
 
 					<div class="center">
-						{{template "base/delete_modal_actions" .}}
+						{{template "base/modal_actions_confirm" .}}
 					</div>
 				</form>
 			</div>
 		</div>
 
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}

templates/admin/hook_new.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin settings new webhook">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin settings new webhook")}}
+	<div class="admin-setting-content">
 		<h4 class="ui top attached header">
 			{{if .PageIsAdminDefaultHooksNew}}
 				{{.locale.Tr "admin.defaulthooks.add_webhook"}}
@@ -55,5 +52,4 @@
 
 		{{template "repo/settings/webhook/history" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}

templates/admin/hooks.tmpl

@@ -1,13 +1,9 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin hooks">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin hooks")}}
+	<div class="admin-setting-content">
 
 		{{template "repo/settings/webhook/base_list" .SystemWebhooks}}
 		{{template "repo/settings/webhook/base_list" .DefaultWebhooks}}
 
 		{{template "repo/settings/webhook/delete_modal" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}

templates/admin/layout_footer.tmpl

@@ -0,0 +1,11 @@
+{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
+<div class="page-content">
+	<div class="admin-layout-right">
+		<div>
+		{{/* block: admin-setting-content */}}
+{{end}}
+
+		</div>
+	</div>
+</div>
+{{template "base/footer" .}}

templates/admin/layout_head.tmpl

@@ -0,0 +1,13 @@
+{{template "base/head" .ctxData}}
+<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
+	<div class="ui container stackable grid">
+		{{template "admin/navbar" .ctxData}}
+		<div class="twelve wide column">
+			{{template "base/alert" .ctxData}}
+			{{/* block: admin-setting-content */}}
+
+{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
+		</div>
+	</div>
+</div>
+{{end}}

templates/admin/monitor.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin monitor">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
+	<div class="admin-setting-content">
 		{{template "admin/cron" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.monitor.queues"}}
@@ -26,7 +23,7 @@
 							<td>{{.Type}}</td>
 							<td>{{.ExemplarType}}</td>
 							<td>{{$sum := .NumberOfWorkers}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
-							<td>{{$sum := .NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
+							<td>{{$sum = .NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
 							<td><a href="{{$.Link}}/queue/{{.QID}}" class="button">{{if lt $sum 0}}{{$.locale.Tr "admin.monitor.queue.review"}}{{else}}{{$.locale.Tr "admin.monitor.queue.review_add"}}{{end}}</a>
 						</tr>
 					{{end}}
@@ -36,16 +33,16 @@
 
 		{{template "admin/process" .}}
 	</div>
-</div>
-<div class="ui small basic delete modal">
-	<div class="ui icon header">
-		{{svg "octicon-x" 16 "close inside"}}
+
+<div class="ui gitea-confirm-modal delete modal">
+	<div class="header">
 		{{.locale.Tr "admin.monitor.process.cancel"}}
 	</div>
 	<div class="content">
 		<p>{{$.locale.Tr "admin.monitor.process.cancel_notices" `<span class="name"></span>` | Safe}}</p>
 		<p>{{$.locale.Tr "admin.monitor.process.cancel_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
-{{template "base/footer" .}}
+
+{{template "admin/layout_footer" .}}

templates/admin/navbar.tmpl

@@ -1,5 +1,6 @@
-<div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar">
-	<div class="new-menu-inner">
+<div class="four wide column">
+	<div class="ui fluid vertical menu">
+		<div class="header item">{{.locale.Tr "settings"}}</div>
 		<a class="{{if .PageIsAdminDashboard}}active {{end}}item" href="{{AppSubUrl}}/admin">
 			{{.locale.Tr "admin.dashboard"}}
 		</a>

templates/admin/notice.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin notice">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin notice")}}
+	<div class="admin-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.notices.system_notice_list"}} ({{.locale.Tr "admin.total" .Total}})
 		</h4>
@@ -69,14 +66,13 @@
 
 		{{template "base/paginate" .}}
 	</div>
-</div>
 
 <div class="ui modal admin" id="detail-modal">
-	{{svg "octicon-x" 16 "close inside"}}
 	<div class="header">{{$.locale.Tr "admin.notices.view_detail_header"}}</div>
 	<div class="content">
 		<div class="sub header"></div>
 		<pre></pre>
 	</div>
 </div>
-{{template "base/footer" .}}
+
+{{template "admin/layout_footer" .}}

templates/admin/org/list.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin user">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
+	<div class="admin-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.orgs.org_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
 			<div class="ui right">
@@ -54,5 +51,4 @@
 
 		{{template "base/paginate" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}

templates/admin/packages/list.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin user">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
+	<div class="admin-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.packages.package_manage_panel"}} ({{.locale.Tr "admin.total" .TotalCount}},
 			{{.locale.Tr "admin.packages.total_size" (FileSize .TotalBlobSize)}},
@@ -78,16 +75,16 @@
 
 		{{template "base/paginate" .}}
 	</div>
-</div>
 
-<div class="ui small basic delete modal">
-	<div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "packages.settings.delete"}}
 	</div>
 	<div class="content">
 		{{.locale.Tr "packages.settings.delete.notice" `<span class="name"></span>` `<span class="dataVersion"></span>` | Safe}}
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
-{{template "base/footer" .}}
+
+{{template "admin/layout_footer" .}}

templates/admin/queue.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin monitor">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
+	<div class="admin-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.monitor.queue" .Queue.Name}}
 		</h4>
@@ -25,7 +22,7 @@
 						<td>{{.Queue.ExemplarType}}</td>
 						<td>{{$sum := .Queue.NumberOfWorkers}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
 						<td>{{if lt $sum 0}}-{{else}}{{.Queue.MaxNumberOfWorkers}}{{end}}</td>
-						<td>{{$sum := .Queue.NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
+						<td>{{$sum = .Queue.NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
 					</tr>
 				</tbody>
 			</table>
@@ -177,20 +174,19 @@
 			{{.locale.Tr "admin.monitor.queue.configuration"}}
 		</h4>
 		<div class="ui attached segment">
-			<pre>{{.Queue.Configuration | JsonPrettyPrint}}
+			<pre>{{.Queue.Configuration | JsonPrettyPrint}}</pre>
 		</div>
 	</div>
-</div>
-<div class="ui small basic delete modal">
-	<div class="ui icon header">
-		{{svg "octicon-x" 16 "close inside"}}
+
+<div class="ui gitea-confirm-modal delete modal">
+	<div class="header">
 		{{.locale.Tr "admin.monitor.queue.pool.cancel"}}
 	</div>
 	<div class="content">
 		<p>{{$.locale.Tr "admin.monitor.queue.pool.cancel_notices" `<span class="name"></span>` | Safe}}</p>
 		<p>{{$.locale.Tr "admin.monitor.queue.pool.cancel_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}

templates/admin/repo/list.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin user">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
+	<div class="admin-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.repos.repo_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
 			<div class="ui right">
@@ -93,10 +90,9 @@
 
 		{{template "base/paginate" .}}
 	</div>
-</div>
 
-<div class="ui small basic delete modal">
-	<div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.delete"}}
 	</div>
@@ -105,6 +101,7 @@
 		{{.locale.Tr "repo.settings.delete_notices_2" `<span class="name"></span>` | Safe}}<br>
 		{{.locale.Tr "repo.settings.delete_notices_fork_1"}}<br>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
-{{template "base/footer" .}}
+
+{{template "admin/layout_footer" .}}

templates/admin/repo/unadopted.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin user">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
+	<div class="admin-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.repos.unadopted"}}
 			<div class="ui right">
@@ -29,8 +26,7 @@
 									<span class="name">{{$dir}}</span>
 									<div class="right floated content">
 										<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>
-										<div class="ui basic modal" id="adopt-unadopted-modal-{{$dirI}}">
-											{{svg "octicon-x" 16 "close inside"}}
+										<div class="ui gitea-confirm-modal modal" id="adopt-unadopted-modal-{{$dirI}}">
 											<div class="header">
 												<span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
 											</div>
@@ -43,7 +39,7 @@
 												<input type="hidden" name="action" value="adopt">
 												<input type="hidden" name="q" value="{{$.Keyword}}">
 												<input type="hidden" name="page" value="{{$.CurrentPage}}">
-												<div class="actions">
+												<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
 													<button class="ui red basic inverted cancel button">
 														{{svg "octicon-trash" 16 "gt-mr-2"}}
 														{{$.locale.Tr "modal.no"}}
@@ -56,8 +52,7 @@
 											</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>
-										<div class="ui basic modal" id="delete-unadopted-modal-{{$dirI}}">
-											{{svg "octicon-x" 16 "close inside"}}
+										<div class="ui gitea-confirm-modal modal" id="delete-unadopted-modal-{{$dirI}}">
 											<div class="header">
 												<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
 											</div>
@@ -70,7 +65,7 @@
 												<input type="hidden" name="action" value="delete">
 												<input type="hidden" name="q" value="{{$.Keyword}}">
 												<input type="hidden" name="page" value="{{$.CurrentPage}}">
-												<div class="actions">
+												<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
 													<button class="ui red basic inverted cancel button">
 														{{svg "octicon-trash" 16 "gt-mr-2"}}
 														{{$.locale.Tr "modal.no"}}
@@ -97,6 +92,5 @@
 			</div>
 		{{end}}
 	</div>
-</div>
 
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}

templates/admin/runners/base.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div class="page-content admin runners">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin runners")}}
+	<div class="admin-setting-content">
 		{{template "shared/actions/runner_list" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}

templates/admin/runners/edit.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div class="page-content admin runners">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin runners")}}
+	<div class="admin-setting-content">
 		{{template "shared/actions/runner_edit" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}

templates/admin/stacktrace.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin monitor">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
+	<div class="admin-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.monitor.stacktrace"}}: {{.locale.Tr "admin.monitor.goroutines" .GoroutineCount}}
 			<div class="ui right">
@@ -17,17 +14,16 @@
 			</div>
 		</div>
 	</div>
-</div>
-<div class="ui small basic delete modal">
-	<div class="ui icon header">
-		{{svg "octicon-x" 16 "close inside"}}
+
+<div class="ui gitea-confirm-modal delete modal">
+	<div class="header">
 		{{.locale.Tr "admin.monitor.process.cancel"}}
 	</div>
 	<div class="content">
 		<p>{{$.locale.Tr "admin.monitor.process.cancel_notices" `<span class="name"></span>` | Safe}}</p>
 		<p>{{$.locale.Tr "admin.monitor.process.cancel_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}

templates/admin/user/edit.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin edit user">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin edit user")}}
+	<div class="admin-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.users.edit_account"}}
 		</h4>
@@ -194,10 +191,9 @@
 			</form>
 		</div>
 	</div>
-</div>
 
-<div class="ui small basic delete modal" id="delete-user-modal">
-	<div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal" id="delete-user-modal">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.delete_account_title"}}
 	</div>
@@ -213,7 +209,8 @@
 			</div>
 			<p class="help">{{.locale.Tr "admin.users.purge_help"}}</p>
 		</div>
-		{{template "base/delete_modal_actions" .}}
+		{{template "base/modal_actions_confirm" .}}
 	</form>
 </div>
-{{template "base/footer" .}}
+
+{{template "admin/layout_footer" .}}

templates/admin/user/list.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin user">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
+	<div class="admin-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.users.user_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
 			<div class="ui right">
@@ -109,5 +106,4 @@
 
 		{{template "base/paginate" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}

templates/admin/user/new.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin new user">
-	{{template "admin/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin new user")}}
+	<div class="admin-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.users.new_account"}}
 		</h4>
@@ -90,5 +87,4 @@
 			</form>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}

templates/base/delete_modal_actions.tmpl

@@ -1,10 +0,0 @@
-<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>

templates/base/modal_actions_confirm.tmpl

@@ -0,0 +1,21 @@
+{{/*
+Template Attributes:
+* locale
+* ModalButtonStyle: "yes" (default) or "confirm"
+* ModalButtonCancelText
+* ModalButtonOkText
+
+The ".ok.button" and ".cancel.button" selectors are also used by Fomantic Modal internally
+*/}}
+<div class="actions">
+	{{$textNegitive := .locale.Tr "modal.no"}}
+	{{$textPositive := .locale.Tr "modal.yes"}}
+	{{if eq .ModalButtonStyle "confirm"}}
+		{{$textNegitive = .locale.Tr "modal.cancel"}}
+		{{$textPositive = .locale.Tr "modal.confirm"}}
+	{{end}}
+	{{if .ModalButtonCancelText}}{{$textNegitive = .ModalButtonCancelText}}{{end}}
+	{{if .ModalButtonOkText}}{{$textPositive = .ModalButtonOkText}}{{end}}
+	<button class="ui red cancel button">{{svg "octicon-x"}} {{$textNegitive}}</button>
+	<button class="ui green ok button">{{svg "octicon-check"}} {{$textPositive}}</button>
+</div>

templates/org/member/members.tmpl

@@ -81,25 +81,23 @@
 		{{template "base/paginate" .}}
 	</div>
 </div>
-<div class="ui small basic delete modal" id="leave-organization">
-	<div class="ui icon header">
-		{{svg "octicon-x" 16 "close inside"}}
+<div class="ui gitea-confirm-modal delete modal" id="leave-organization">
+	<div class="header">
 		{{$.locale.Tr "org.members.leave"}}
 	</div>
 	<div class="content">
 		<p>{{$.locale.Tr "org.members.leave.detail" `<span class="dataOrganizationName"></span>` | Safe}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
-<div class="ui small basic delete modal" id="remove-organization-member">
-	<div class="ui icon header">
-		{{svg "octicon-x" 16 "close inside"}}
+<div class="ui gitea-confirm-modal delete modal" id="remove-organization-member">
+	<div class="header">
 		{{$.locale.Tr "org.members.remove"}}
 	</div>
 	<div class="content">
 		<p>{{$.locale.Tr "org.members.remove.detail" `<span class="name"></span>` `<span class="dataOrganizationName"></span>` | Safe}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
 {{template "base/footer" .}}

templates/org/settings/applications.tmpl

@@ -1,18 +1,9 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings options">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings options")}}
+			<div class="org-setting-content">
 				<h4 class="ui top attached header">
 					{{.locale.Tr "settings.applications"}}
 				</h4>
 
 				{{template "user/settings/applications_oauth2_list" .}}
 			</div>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}

templates/org/settings/applications_oauth2_edit.tmpl

@@ -1,7 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings options">
-	{{template "org/header" .}}
-
-	{{template "user/settings/applications_oauth2_edit_form" .}}
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings options")}}
+			<div class="org-setting-content">
+				{{template "user/settings/applications_oauth2_edit_form" .}}
+			</div>
+{{template "org/settings/layout_footer" .}}

templates/org/settings/delete.tmpl

@@ -1,11 +1,6 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings delete">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings delete")}}
+
+			<div class="org-setting-content">
 				<h4 class="ui top attached error header">
 					{{.locale.Tr "org.settings.delete_account"}}
 				</h4>
@@ -25,18 +20,16 @@
 					</form>
 				</div>
 			</div>
-		</div>
-	</div>
-</div>
 
-<div class="ui small basic delete modal">
-	<div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "org.settings.delete_org_title"}}
 	</div>
 	<div class="content">
 		<p>{{.locale.Tr "org.settings.delete_org_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
-{{template "base/footer" .}}
+
+{{template "org/settings/layout_footer" .}}

templates/org/settings/hook_new.tmpl

@@ -1,11 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings new webhook">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings new webhook")}}
+			<div class="org-setting-content">
 				<h4 class="ui top attached header">
 					{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
 					<div class="ui right">
@@ -50,7 +44,5 @@
 
 				{{template "repo/settings/webhook/history" .}}
 			</div>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}
+
+{{template "org/settings/layout_footer" .}}

templates/org/settings/hooks.tmpl

@@ -1,13 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings webhooks">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings webhooks")}}
+			<div class="org-setting-content">
 				{{template "repo/settings/webhook/list" .}}
 			</div>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}

templates/org/settings/labels.tmpl

@@ -1,10 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings labels">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-				<div class="ui twelve wide column content">
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings labels")}}
+				<div class="org-setting-content">
 					<div class="ui grid">
 						<div class="left floated twelve wide column">
 							{{$.locale.Tr "org.settings.labels_desc" | Str2html}}
@@ -17,13 +12,8 @@
 					</div>
 					<div class="ui divider"></div>
 					{{template "repo/issue/labels/label_new" .}}
-					{{template "base/alert" .}}
 					{{template "repo/issue/labels/label_list" .}}
 				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
 {{template "repo/issue/labels/edit_delete_label" .}}
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
+

templates/org/settings/layout_footer.tmpl

@@ -0,0 +1,11 @@
+{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
+<div class="page-content">
+	<div class="org-layout-right">
+		<div>
+		{{/* block: org-setting-content */}}
+{{end}}
+
+		</div>
+	</div>
+</div>
+{{template "base/footer" .}}

templates/org/settings/layout_head.tmpl

@@ -0,0 +1,14 @@
+{{template "base/head" .ctxData}}
+<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
+	{{template "org/header" .ctxData}}
+	<div class="ui container stackable grid">
+		{{template "org/settings/navbar" .ctxData}}
+		<div class="twelve wide column">
+			{{template "base/alert" .ctxData}}
+			{{/* block: org-setting-content */}}
+
+{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
+		</div>
+	</div>
+</div>
+{{end}}

templates/org/settings/options.tmpl

@@ -1,11 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings options">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings options")}}
+			<div class="org-setting-content">
 				<h4 class="ui top attached header">
 					{{.locale.Tr "org.settings.options"}}
 				</h4>
@@ -101,7 +95,4 @@
 					</form>
 				</div>
 			</div>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}

templates/org/settings/packages.tmpl

@@ -1,15 +1,6 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings packages">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings packages")}}
+			<div class="org-setting-content">
 				{{template "package/shared/cleanup_rules/list" .}}
 				{{template "package/shared/cargo" .}}
 			</div>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}

templates/org/settings/packages_cleanup_rules_edit.tmpl

@@ -1,14 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings packages">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings packages")}}
+			<div class="org-setting-content">
 				{{template "package/shared/cleanup_rules/edit" .}}
 			</div>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}

templates/org/settings/packages_cleanup_rules_preview.tmpl

@@ -1,13 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings packages admin">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings packages")}}
+			<div class="org-setting-content">
 				{{template "package/shared/cleanup_rules/preview" .}}
 			</div>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}

templates/org/settings/runners.tmpl

@@ -1,13 +1,5 @@
-{{template "base/head" .}}
-<div class="page-content organization settings runners">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings runners")}}
+			<div class="org-setting-content">
 				{{template "shared/actions/runner_list" .}}
 			</div>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}

templates/org/settings/runners_edit.tmpl

@@ -1,13 +1,5 @@
-{{template "base/head" .}}
-<div class="page-content organization settings runners">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings runners")}}
+			<div class="org-setting-content">
 				{{template "shared/actions/runner_edit" .}}
 			</div>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}

templates/org/settings/secrets.tmpl

@@ -1,15 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings webhooks">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="ui twelve wide column content">
-				{{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings secrets")}}
+			<div class="org-setting-content">
 				{{template "shared/secrets/add_list" .}}
 			</div>
-		</div>
-	</div>
-</div>
-
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}

templates/org/team/members.tmpl

@@ -64,14 +64,13 @@
 		</div>
 	</div>
 </div>
-<div class="ui small basic delete modal" id="remove-team-member">
-	<div class="ui icon header">
-		{{svg "octicon-x" 16 "close inside"}}
+<div class="ui gitea-confirm-modal delete modal" id="remove-team-member">
+	<div class="header">
 		{{$.locale.Tr "org.members.remove"}}
 	</div>
 	<div class="content">
 		<p>{{$.locale.Tr "org.members.remove.detail" `<span class="name"></span>` `<span class="dataTeamName"></span>` | Safe}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}

templates/org/team/new.tmpl

@@ -148,14 +148,14 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal">
-	<div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "org.teams.delete_team_title"}}
 	</div>
 	<div class="content">
 		<p>{{.locale.Tr "org.teams.delete_team_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}

templates/org/team/repositories.tmpl

@@ -64,26 +64,26 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal" id="org-team-remove-all-repo">
-	<div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal" id="org-team-remove-all-repo">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "org.teams.remove_all_repos_title"}}
 	</div>
 	<div class="content">
 		<p>{{.locale.Tr "org.teams.remove_all_repos_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
-<div class="ui small basic addall modal" id="org-team-add-all-repo">
-	<div class="ui icon header">
+<div class="ui gitea-confirm-modal addall modal" id="org-team-add-all-repo">
+	<div class="header">
 		{{svg "octicon-globe"}}
 		{{.locale.Tr "org.teams.add_all_repos_title"}}
 	</div>
 	<div class="content">
 		<p>{{.locale.Tr "org.teams.add_all_repos_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
 {{template "base/footer" .}}

templates/org/team/sidebar.tmpl

@@ -83,13 +83,12 @@
 		</div>
 	{{end}}
 </div>
-<div class="ui small basic delete modal" id="leave-team-sidebar">
-	<div class="ui icon header">
-		{{svg "octicon-x" 16 "close inside"}}
+<div class="ui gitea-confirm-modal delete modal" id="leave-team-sidebar">
+	<div class="header">
 		{{$.locale.Tr "org.teams.leave"}}
 	</div>
 	<div class="content">
 		<p>{{$.locale.Tr "org.teams.leave.detail" `<span class="name"></span>` | Safe}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>

templates/org/team/teams.tmpl

@@ -43,14 +43,13 @@
 		</div>
 	</div>
 </div>
-<div class="ui small basic delete modal" id="leave-team">
-	<div class="ui icon header">
-		{{svg "octicon-x" 16 "close inside"}}
+<div class="ui gitea-confirm-modal delete modal" id="leave-team">
+	<div class="header">
 		{{$.locale.Tr "org.teams.leave"}}
 	</div>
 	<div class="content">
 		<p>{{$.locale.Tr "org.teams.leave.detail" `<span class="name"></span>` | Safe}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 {{template "base/footer" .}}

templates/package/settings.tmpl

@@ -57,7 +57,7 @@
 						<form class="ui form" action="{{.Link}}" method="post">
 							{{.CsrfTokenHtml}}
 							<input type="hidden" name="action" value="delete">
-							{{template "base/delete_modal_actions" .}}
+							{{template "base/modal_actions_confirm" .}}
 						</form>
 					</div>
 				</div>

templates/projects/list.tmpl

@@ -76,14 +76,14 @@
 </div>
 
 {{if $.CanWriteProjects}}
-<div class="ui small basic delete modal">
-	<div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.projects.deletion"}}
 	</div>
 	<div class="content">
 		<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 {{end}}

templates/projects/view.tmpl

@@ -99,7 +99,6 @@
 									data-modal="#default-project-board-modal-{{.ID}}"
 									data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.set_default"}}"
 									data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.set_default_desc"}}"
-									data-modal-default-project-board-submit="{{$.locale.Tr "repo.projects.column.set_default"}}"
 									data-url="{{$.Link}}/{{.ID}}/default">
 										{{svg "octicon-pin"}}
 										{{$.locale.Tr "repo.projects.column.set_default"}}
@@ -109,13 +108,15 @@
 									data-modal="#default-project-board-modal-{{.ID}}"
 									data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.unset_default"}}"
 									data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.unset_default_desc"}}"
-									data-modal-default-project-board-submit="{{$.locale.Tr "repo.projects.column.unset_default"}}"
 									data-url="{{$.Link}}/{{.ID}}/unsetdefault">
 										{{svg "octicon-pin"}}
 										{{$.locale.Tr "repo.projects.column.unset_default"}}
 									</a>
 								{{end}}
-								<a class="item show-modal button" data-modal="#delete-board-modal-{{.ID}}">
+								<a class="item show-modal button show-delete-column-modal"
+									data-modal="#delete-board-modal-{{.ID}}"
+									data-url="{{$.Link}}/{{.ID}}"
+								>
 									{{svg "octicon-trash"}}
 									{{$.locale.Tr "repo.projects.column.delete"}}
 								</a>
@@ -149,32 +150,26 @@
 									</div>
 								</div>
 
-								<div class="ui basic modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
-									<div class="ui icon header">
+								<div class="ui gitea-confirm-modal modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
+									<div class="header">
 										<span id="default-project-board-header"></span>
 									</div>
-									<div class="content center">
+									<div class="content">
 										<label id="default-project-board-content"></label>
 									</div>
-									<div class="text right actions">
-										<button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button>
-										<button class="ui primary button default-project-board-button" id="default-project-board-submit"></button>
-									</div>
+									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
 								</div>
 
-								<div class="ui basic modal" id="delete-board-modal-{{.ID}}">
-									<div class="ui icon header">
+								<div class="ui gitea-confirm-modal modal" id="delete-board-modal-{{.ID}}">
+									<div class="header">
 										{{$.locale.Tr "repo.projects.column.delete"}}
 									</div>
-									<div class="content center">
+									<div class="content">
 										<label>
 											{{$.locale.Tr "repo.projects.column.deletion_desc"}}
 										</label>
 									</div>
-									<div class="text right actions">{{/* TODO: convert to base/delete_modal_actions.tmpl */}}
-										<button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button>
-										<button class="ui red button delete-project-board" data-url="{{$.Link}}/{{.ID}}">{{$.locale.Tr "repo.projects.column.delete"}}</button>
-									</div>
+									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
 								</div>
 							</div>
 						</div>
@@ -277,14 +272,14 @@
 </div>
 
 {{if .CanWriteProjects}}
-	<div class="ui small basic delete modal">
-		<div class="ui icon header">
+	<div class="ui gitea-confirm-modal delete modal">
+		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.projects.deletion"}}
 		</div>
 		<div class="content">
 			<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
 		</div>
-		{{template "base/delete_modal_actions" .}}
+		{{template "base/modal_actions_confirm" .}}
 	</div>
 {{end}}

templates/repo/branch/list.tmpl

@@ -147,15 +147,15 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal">
-	<div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.branch.delete_html"}} <span class="name"></span>
 	</div>
 	<div class="content">
 		<p>{{.locale.Tr "repo.branch.delete_desc" | Str2html}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
 <div class="ui small modal" id="create-branch-modal">

templates/repo/commit_page.tmpl

@@ -59,11 +59,11 @@
 										data-modal-cherry-pick-header="{{$.locale.Tr "repo.commit.cherry-pick-header" (ShortSha .CommitID)}}"
 										data-modal-cherry-pick-content="{{$.locale.Tr "repo.commit.cherry-pick-content"}}"
 										data-modal-cherry-pick-submit="{{.locale.Tr "repo.commit.cherry-pick"}}">{{.locale.Tr "repo.commit.cherry-pick"}}</div>
-									<div class="ui basic modal" id="cherry-pick-modal">
-										<div class="ui icon header">
+									<div class="ui gitea-confirm-modal modal" id="cherry-pick-modal">
+										<div class="header">
 											<span id="cherry-pick-header"></span>
 										</div>
-										<div class="content center">
+										<div class="content">
 											<p id="cherry-pick-content" class="branch-dropdown"></p>
 											{{template "repo/branch_dropdown" dict "root" .
 												"noTag" true "disableCreateBranch" true

templates/repo/editor/edit.tmpl

@@ -56,8 +56,8 @@
 	</div>
 
 
-	<div class="ui small basic modal" id="edit-empty-content-modal">
-		<div class="ui icon header">
+	<div class="ui gitea-confirm-modal modal" id="edit-empty-content-modal">
+		<div class="header">
 			{{svg "octicon-file"}}
 			{{.locale.Tr "repo.editor.commit_empty_file_header"}}
 		</div>

templates/repo/editor/patch.tmpl

@@ -36,8 +36,8 @@
 		</form>
 	</div>
 
-	<div class="ui small basic modal" id="edit-empty-content-modal">
-		<div class="ui icon header">
+	<div class="ui gitea-confirm-modal modal" id="edit-empty-content-modal">
+		<div class="header">
 			{{svg "octicon-file"}}
 			{{.locale.Tr "repo.editor.commit_empty_file_header"}}
 		</div>

templates/repo/header.tmpl

@@ -118,7 +118,6 @@
 								{{svg "octicon-repo-forked"}}{{$.locale.Tr "repo.fork"}}
 							</a>
 							<div class="ui small modal" id="fork-repo-modal">
-								{{svg "octicon-x" 16 "close inside"}}
 								<div class="header">
 									{{$.locale.Tr "repo.already_forked" .Name}}
 								</div>

templates/repo/issue/labels/edit_delete_label.tmpl

@@ -1,12 +1,12 @@
-<div class="ui small basic delete modal">
-	<div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.issues.label_deletion"}}
 	</div>
 	<div class="content">
 		<p>{{.locale.Tr "repo.issues.label_deletion_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
 <div class="ui small edit-label modal">

templates/repo/issue/milestones.tmpl

@@ -116,15 +116,15 @@
 </div>
 
 {{if or .CanWriteIssues .CanWritePulls}}
-	<div class="ui small basic delete modal">
-		<div class="ui icon header">
+	<div class="ui gitea-confirm-modal delete modal">
+		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.milestones.deletion"}}
 		</div>
 		<div class="content">
 			<p>{{.locale.Tr "repo.milestones.deletion_desc"}}</p>
 		</div>
-		{{template "base/delete_modal_actions" .}}
+		{{template "base/modal_actions_confirm" .}}
 	</div>
 {{end}}
 {{template "base/footer" .}}

templates/repo/issue/view_content.tmpl

@@ -197,13 +197,13 @@
 	<span class="no-content">{{.locale.Tr "repo.issues.no_content"}}</span>
 </div>
 
-<div class="ui small basic delete modal">
-	<div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.branch.delete" .HeadTarget}}
 	</div>
 	<div class="content">
 		<p>{{.locale.Tr "repo.branch.delete_desc" | Str2html}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>

templates/repo/issue/view_content/comments_delete_time.tmpl

@@ -7,7 +7,7 @@
 						{{.ctxData.CsrfTokenHtml}}
 					</form>
 					<div class="header">{{.ctxData.locale.Tr "repo.issues.del_time"}}</div>
-					{{template "base/delete_modal_actions" .}}
+					{{template "base/modal_actions_confirm" .}}
 				</div>
 				<button class="ui icon button compact mini issue-delete-time" data-id="{{.comment.Time.ID}}" data-tooltip-content="{{.ctxData.locale.Tr "repo.issues.del_time"}}">
 					{{svg "octicon-trash"}}

templates/repo/issue/view_content/sidebar.tmpl

@@ -542,8 +542,8 @@
 			{{if and .CanCreateIssueDependencies (not .Repository.IsArchived)}}
 				<input type="hidden" id="crossRepoSearch" value="{{.AllowCrossRepositoryDependencies}}">
 
-				<div class="ui basic modal remove-dependency">
-					<div class="ui icon header">
+				<div class="ui gitea-confirm-modal modal remove-dependency">
+					<div class="header">
 						{{svg "octicon-trash"}}
 						{{.locale.Tr "repo.issues.dependency.remove_header"}}
 					</div>
@@ -559,16 +559,9 @@
 							{{.locale.Tr "repo.issues.dependency.issue_remove_text"}}
 						{{end}}</p>
 					</div>
-					<div class="actions">
-						<button class="ui red cancel inverted button">
-							{{svg "octicon-x"}}
-							{{.locale.Tr "repo.issues.dependency.cancel"}}
-						</button>
-						<button class="ui green ok inverted button">
-							{{svg "octicon-check"}}
-							{{.locale.Tr "repo.issues.dependency.remove"}}
-						</button>
-					</div>
+					{{$ModalButtonCancelText := .locale.Tr "repo.issues.dependency.cancel"}}
+					{{$ModalButtonOkText := .locale.Tr "repo.issues.dependency.remove"}}
+					{{template "base/modal_actions_confirm" (dict "." . "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}}
 				</div>
 			{{end}}
 		{{end}}
@@ -663,15 +656,15 @@
 				{{svg "octicon-trash"}}
 				{{.locale.Tr "repo.issues.delete"}}
 			</button>
-			<div class="ui basic modal" id="delete">
-				<div class="ui icon header">
+			<div class="ui gitea-confirm-modal modal" id="delete">
+				<div class="header">
 					{{if .Issue.IsPull}}
 						{{.locale.Tr "repo.pulls.delete.title"}}
 					{{else}}
 						{{.locale.Tr "repo.issues.delete.title"}}
 					{{end}}
 				</div>
-				<div class="content center">
+				<div class="content">
 					<p>
 						{{if .Issue.IsPull}}
 							{{.locale.Tr "repo.pulls.delete.text"}}
@@ -682,10 +675,7 @@
 				</div>
 				<form action="{{.Issue.Link}}/delete" method="post">
 					{{.CsrfTokenHtml}}
-					<div class="center actions">
-						<button class="ui basic cancel inverted button">{{.locale.Tr "settings.cancel"}}</button>
-						<button class="ui basic red inverted button">{{.locale.Tr "modal.yes"}}</button>
-					</div>
+					{{template "base/modal_actions_confirm" .}}
 				</form>
 			</div>
 		{{end}}

templates/repo/projects/list.tmpl

@@ -78,15 +78,15 @@
 </div>
 
 {{if .CanWriteProjects}}
-<div class="ui small basic delete modal">
-	<div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.projects.deletion"}}
 	</div>
 	<div class="content">
 		<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 {{end}}
 {{template "base/footer" .}}

templates/repo/projects/view.tmpl

@@ -103,7 +103,6 @@
 									data-modal="#default-project-board-modal-{{.ID}}"
 									data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.set_default"}}"
 									data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.set_default_desc"}}"
-									data-modal-default-project-board-submit="{{$.locale.Tr "repo.projects.column.set_default"}}"
 									data-type="set_default"
 									data-url="{{$.Link}}/{{.ID}}/default">
 										{{svg "octicon-pin"}}
@@ -114,14 +113,16 @@
 									data-modal="#default-project-board-modal-{{.ID}}"
 									data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.unset_default"}}"
 									data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.unset_default_desc"}}"
-									data-modal-default-project-board-submit="{{$.locale.Tr "repo.projects.column.unset_default"}}"
 									data-type="unset_default"
 									data-url="{{$.Link}}/{{.ID}}/unsetdefault">
 										{{svg "octicon-pin"}}
 										{{$.locale.Tr "repo.projects.column.unset_default"}}
 									</a>
 								{{end}}
-								<a class="item show-modal button" data-modal="#delete-board-modal-{{.ID}}">
+								<a class="item show-modal button show-delete-column-modal"
+									data-modal="#delete-board-modal-{{.ID}}"
+									data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}"
+								>
 									{{svg "octicon-trash"}}
 									{{$.locale.Tr "repo.projects.column.delete"}}
 								</a>
@@ -155,32 +156,26 @@
 									</div>
 								</div>
 
-								<div class="ui basic modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
-									<div class="ui icon header">
+								<div class="ui gitea-confirm-modal modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
+									<div class="header">
 										<span id="default-project-board-header"></span>
 									</div>
-									<div class="content center">
+									<div class="content">
 										<label id="default-project-board-content"></label>
 									</div>
-									<div class="text right actions">
-										<button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button>
-										<button class="ui primary button default-project-board-button" id="default-project-board-submit"></button>
-									</div>
+									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
 								</div>
 
-								<div class="ui basic modal" id="delete-board-modal-{{.ID}}">
-									<div class="ui icon header">
+								<div class="ui gitea-confirm-modal modal" id="delete-board-modal-{{.ID}}">
+									<div class="header">
 										{{$.locale.Tr "repo.projects.column.delete"}}
 									</div>
-									<div class="content center">
+									<div class="content">
 										<label>
 											{{$.locale.Tr "repo.projects.column.deletion_desc"}}
 										</label>
 									</div>
-									<div class="text right actions">{{/* TODO: Convert to base/delete_modal_actions.tmpl? */}}
-										<button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button>
-										<button class="ui red button delete-project-board" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}">{{$.locale.Tr "repo.projects.column.delete"}}</button>
-									</div>
+									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
 								</div>
 							</div>
 						</div>
@@ -283,15 +278,15 @@
 </div>
 
 {{if or .CanWriteIssues .CanWritePulls}}
-	<div class="ui small basic delete modal">
-		<div class="ui icon header">
+	<div class="ui gitea-confirm-modal delete modal">
+		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.projects.deletion"}}
 		</div>
 		<div class="content">
 			<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
 		</div>
-		{{template "base/delete_modal_actions" .}}
+		{{template "base/modal_actions_confirm" .}}
 	</div>
 {{end}}
 

templates/repo/release/list.tmpl

@@ -184,15 +184,15 @@
 </div>
 
 {{if (and ($.Permission.CanWrite $.UnitTypeCode) .PageIsTagList)}}
-	<div class="ui small basic delete modal">
-		<div class="ui header">
-			{{svg "octicon-trash" 16 "gt-mr-2"}}
+	<div class="ui gitea-confirm-modal delete modal">
+		<div class="header">
+			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.release.delete_tag"}}
 		</div>
 		<div class="content">
 			<p>{{.locale.Tr "repo.release.deletion_tag_desc"}}</p>
 		</div>
-		{{template "base/delete_modal_actions" .}}
+		{{template "base/modal_actions_confirm" .}}
 	</div>
 {{end}}
 

templates/repo/release/new.tmpl

@@ -138,15 +138,15 @@
 </div>
 
 {{if .PageIsEditRelease}}
-	<div class="ui small basic delete modal">
-		<div class="ui icon header">
+	<div class="ui gitea-confirm-modal delete modal">
+		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.release.deletion"}}
 		</div>
 		<div class="content">
 			<p>{{.locale.Tr "repo.release.deletion_desc"}}</p>
 		</div>
-		{{template "base/delete_modal_actions" .}}
+		{{template "base/modal_actions_confirm" .}}
 	</div>
 {{end}}
 {{template "base/footer" .}}

templates/repo/settings/branches.tmpl

@@ -1,9 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings edit">
-	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings edit")}}
+	<div class="repo-setting-content">
 		{{if .Repository.IsArchived}}
 			<div class="ui warning message">
 				{{.locale.Tr "repo.settings.archive.branchsettings_unavailable"}}
@@ -94,17 +90,16 @@
 			{{end}}
 		{{end}}
 	</div>
-</div>
 
-<div class="ui small basic delete modal">
-	<div class="ui header">
-		{{svg "octicon-trash" 16 "gt-mr-2"}}
+<div class="ui gitea-confirm-modal delete modal">
+	<div class="header">
+		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.protected_branch_deletion"}}
 	</div>
 	<div class="content">
 		<p>{{.locale.Tr "repo.settings.protected_branch_deletion_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}

templates/repo/settings/collaboration.tmpl

@@ -1,9 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings collaboration">
-	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings collaboration")}}
+	<div class="repo-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.collaboration"}}
 		</h4>
@@ -110,16 +106,16 @@
 		</div>
 		{{end}}
 	</div>
-</div>
 
-<div class="ui small basic delete modal">
-	<div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.collaborator_deletion"}}
 	</div>
 	<div class="content">
 		<p>{{.locale.Tr "repo.settings.collaborator_deletion_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
-{{template "base/footer" .}}
+
+{{template "repo/settings/layout_footer" .}}

templates/repo/settings/deploy_keys.tmpl

@@ -1,9 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings">
-	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings")}}
+	<div class="repo-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.deploy_keys"}}
 			<div class="ui right">
@@ -75,16 +71,16 @@
 			{{end}}
 		</div>
 	</div>
-</div>
 
-<div class="ui small basic delete modal">
-	<div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.deploy_key_deletion"}}
 	</div>
 	<div class="content">
 		<p>{{.locale.Tr "repo.settings.deploy_key_deletion_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
-{{template "base/footer" .}}
+
+{{template "repo/settings/layout_footer" .}}

templates/repo/settings/githook_edit.tmpl

@@ -1,9 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings edit githook">
-	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings edit githook")}}
+	<div class="repo-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.githooks"}}
 		</h4>
@@ -28,5 +24,4 @@
 			</form>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}

templates/repo/settings/githooks.tmpl

@@ -1,9 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings githooks">
-	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings githooks")}}
+	<div class="repo-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.githooks"}}
 		</h4>
@@ -24,5 +20,4 @@
 			</div>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}

templates/repo/settings/layout_footer.tmpl

@@ -0,0 +1,11 @@
+{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
+<div class="page-content">
+	<div class="repo-layout-right">
+		<div>
+		{{/* block: repo-setting-content */}}
+{{end}}
+
+		</div>
+	</div>
+</div>
+{{template "base/footer" .}}

templates/repo/settings/layout_head.tmpl

@@ -0,0 +1,14 @@
+{{template "base/head" .ctxData}}
+<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
+	{{template "repo/header" .ctxData}}
+	<div class="ui container stackable grid">
+		{{template "repo/settings/navbar" .ctxData}}
+		<div class="twelve wide column">
+			{{template "base/alert" .ctxData}}
+			{{/* block: repo-setting-content */}}
+
+{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
+		</div>
+	</div>
+</div>
+{{end}}

templates/repo/settings/lfs.tmpl

@@ -1,9 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings lfs">
-	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
+	<div class="repo-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.lfs_filelist"}} ({{.locale.Tr "admin.total" .Total}})
 			<div class="ui right">
@@ -40,17 +36,17 @@
 		</table>
 		{{template "base/paginate" .}}
 		{{range .LFSFiles}}
-			<div class="ui basic modal" id="delete-{{.Oid}}">
-				<div class="ui icon header">
+			<div class="ui gitea-confirm-modal modal" id="delete-{{.Oid}}">
+				<div class="header">
 					{{$.locale.Tr "repo.settings.lfs_delete" .Oid}}
 				</div>
-				<div class="content center">
+				<div class="content">
 					<p>
 						{{$.locale.Tr "repo.settings.lfs_delete_warning"}}
 					</p>
 					<form class="ui form" action="{{$.Link}}/delete/{{.Oid}}" method="post">
 						{{$.CsrfTokenHtml}}
-						<div class="center actions">{{/* TODO: Convert to base/delete_modal_actions */}}
+						<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
 							<button class="ui basic cancel inverted button">{{$.locale.Tr "settings.cancel"}}</button>
 							<button class="ui basic inverted yellow button">{{$.locale.Tr "modal.yes"}}</button>
 						</div>
@@ -60,4 +56,4 @@
 		{{end}}
 	</div>
 </div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}

templates/repo/settings/lfs_file.tmpl

@@ -1,9 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings lfs">
-	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container repository file list">
-		{{template "base/alert" .}}
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
+	<div class="user-main-content twelve wide column content repository file list">
 		<div class="tab-size-8 non-diff-file-content">
 			<h4 class="ui top attached header">
 				<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / <span class="truncate sha">{{.LFSFile.Oid}}</span>
@@ -58,5 +54,4 @@
 			</div>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}

templates/repo/settings/lfs_file_find.tmpl

@@ -1,9 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings lfs">
-	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container repository file list">
-		{{template "base/alert" .}}
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
+	<div class="user-main-content twelve wide column content repository file list">
 		<div class="tab-size-8 non-diff-file-content">
 			<h4 class="ui top attached header">
 				<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / <span class="truncate sha">{{.Oid}}</span>
@@ -48,5 +44,4 @@
 			</table>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}

templates/repo/settings/lfs_locks.tmpl

@@ -1,9 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings lfs">
-	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container repository file list">
-		{{template "base/alert" .}}
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
+	<div class="user-main-content twelve wide column content repository file list">
 		<div class="tab-size-8 non-diff-file-content">
 			<h4 class="ui top attached header">
 				<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / {{.locale.Tr "repo.settings.lfs_locks"}} ({{.locale.Tr "admin.total" .Total}})
@@ -57,5 +53,4 @@
 			{{template "base/paginate" .}}
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}

templates/repo/settings/lfs_pointers.tmpl

@@ -1,9 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings lfs">
-	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
+	<div class="repo-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.lfs_pointers.found" .NumPointers .NumAssociated .NumNotAssociated .NumNoExist}}
 			{{if gt .NumAssociatable 0}}
@@ -67,5 +63,4 @@
 			</table>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}

templates/repo/settings/navbar.tmpl

@@ -1,5 +1,6 @@
-<div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar shadow-body">
-	<div class="new-menu-inner">
+<div class="four wide column">
+	<div class="ui fluid vertical menu">
+		<div class="header item">{{.locale.Tr "org.settings"}}</div>
 		<a class="{{if .PageIsSettingsOptions}}active {{end}}item" href="{{.RepoLink}}/settings">
 			{{.locale.Tr "repo.settings.options"}}
 		</a>

templates/repo/settings/options.tmpl

@@ -1,9 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings options">
-	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings options")}}
+	<div class="user-main-content twelve wide column">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.basic_settings"}}
 		</h4>
@@ -798,7 +794,7 @@
 		</div>
 		{{end}}
 	</div>
-</div>
+{{template "repo/settings/layout_footer" .}}
 
 {{if .Permission.IsOwner}}
 	{{if .Repository.IsMirror}}
@@ -967,15 +963,15 @@
 	{{end}}
 
 	{{if not .Repository.IsMirror}}
-		<div class="ui basic modal" id="archive-repo-modal">
-			<div class="ui icon header">
+		<div class="ui gitea-confirm-modal modal" id="archive-repo-modal">
+			<div class="header">
 				{{if .Repository.IsArchived}}
 					{{.locale.Tr "repo.settings.unarchive.header"}}
 				{{else}}
 					{{.locale.Tr "repo.settings.archive.header"}}
 				{{end}}
 			</div>
-			<div class="content center">
+			<div class="content">
 				<p>
 					{{if .Repository.IsArchived}}
 						{{.locale.Tr "repo.settings.unarchive.text"}}
@@ -988,10 +984,8 @@
 				{{.CsrfTokenHtml}}
 				<input type="hidden" name="action" value="{{if .Repository.IsArchived}}unarchive{{else}}archive{{end}}">
 				<input type="hidden" name="repo_id" value="{{.Repository.ID}}">
-				{{template "base/delete_modal_actions" .}}
+				{{template "base/modal_actions_confirm" .}}
 			</form>
 		</div>
 	{{end}}
 {{end}}
-
-{{template "base/footer" .}}

templates/repo/settings/protected_branch.tmpl

@@ -1,9 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings branches">
-	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings branches")}}
+	<div class="repo-setting-content">
 		<form class="ui form" action="{{.Link}}" method="post">
 			<h4 class="ui top attached header">
 				{{.locale.Tr "repo.settings.branch_protection" (.Rule.RuleName|Escape) | Str2html}}
@@ -260,5 +256,4 @@
 			</div>
 		</form>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}

templates/repo/settings/runner_edit.tmpl

@@ -1,9 +1,5 @@
-{{template "base/head" .}}
-<div class="page-content repository settings runners">
-	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container">
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings runners")}}
+	<div class="repo-setting-content">
 		{{template "shared/actions/runner_edit" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}

templates/repo/settings/runners.tmpl

@@ -1,9 +1,5 @@
-{{template "base/head" .}}
-<div class="page-content repository settings runners">
-	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container">
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings runners")}}
+	<div class="repo-setting-content">
 		{{template "shared/actions/runner_list" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}

templates/repo/settings/secrets.tmpl

@@ -1,10 +1,5 @@
-{{template "base/head" .}}
-<div class="page-content repository settings">
-	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings")}}
+	<div class="repo-setting-content">
 		{{template "shared/secrets/add_list" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}

templates/repo/settings/tags.tmpl

@@ -1,9 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings edit">
-	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings edit")}}
+	<div class="repo-setting-content">
 		{{if .Repository.IsArchived}}
 			<div class="ui warning message">
 				{{.locale.Tr "repo.settings.archive.tagsettings_unavailable"}}
@@ -127,5 +123,4 @@
 			</div>
 		{{end}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}

templates/repo/settings/webhook/base.tmpl

@@ -1,9 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings webhooks">
-	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container">
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings webhooks")}}
+	<div class="repo-setting-content">
 		{{template "repo/settings/webhook/list" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}

templates/repo/settings/webhook/delete_modal.tmpl

@@ -1,10 +1,10 @@
-<div class="ui small basic delete modal">
-	<div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.webhook_deletion"}}
 	</div>
 	<div class="content">
 		<p>{{.locale.Tr "repo.settings.webhook_deletion_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>

templates/repo/settings/webhook/list.tmpl

@@ -1,4 +1,3 @@
-{{template "base/alert" .}}
 
 {{template "repo/settings/webhook/base_list" .}}
 

templates/repo/settings/webhook/new.tmpl

@@ -1,9 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings new webhook">
-	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings webhook")}}
+	<div class="repo-setting-content">
 		<h4 class="ui top attached header">
 			{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
 			<div class="ui right">
@@ -48,5 +44,4 @@
 
 		{{template "repo/settings/webhook/history" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}

templates/repo/wiki/view.tmpl

@@ -99,15 +99,15 @@
 	</div>
 </div>
 
-<div class="ui small basic delete modal">
-	<div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.wiki.delete_page_button"}}
 	</div>
 	<div class="content">
 		<p>{{.locale.Tr "repo.wiki.delete_page_notice_1" ($title|Escape) | Safe}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
 {{template "base/footer" .}}

templates/shared/actions/runner_edit.tmpl

@@ -1,5 +1,4 @@
 <div class="runner-container">
-	{{template "base/alert" .}}
 	<h4 class="ui top attached header">
 		{{.locale.Tr "actions.runners.runner_title"}} {{.Runner.ID}} {{.Runner.Name}}
 	</h4>
@@ -89,14 +88,14 @@
 		</table>
 		{{template "base/paginate" .}}
 	</div>
-	<div class="ui small basic delete modal" id="runner-delete-modal">
-		<div class="ui icon header">
+	<div class="ui gitea-confirm-modal delete modal" id="runner-delete-modal">
+		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "actions.runners.delete_runner_header"}}
 		</div>
 		<div class="content">
 			<p>{{.locale.Tr "actions.runners.delete_runner_notice" | Safe}}</p>
 		</div>
-		{{template "base/delete_modal_actions" .}}
+		{{template "base/modal_actions_confirm" .}}
 	</div>
 </div>

templates/shared/actions/runner_list.tmpl

@@ -1,5 +1,4 @@
 <div class="runner-container">
-	{{template "base/alert" .}}
 
 	<h4 class="ui top attached header">
 		{{.locale.Tr "actions.runners.runner_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})

templates/shared/secrets/add_list.tmpl

@@ -56,13 +56,13 @@
 		{{.locale.Tr "secrets.none"}}
 	{{end}}
 </div>
-<div class="ui small basic delete modal">
-	<div class="ui header">
-		{{svg "octicon-trash" 16 "gt-mr-2"}}
+<div class="ui gitea-confirm-modal delete modal">
+	<div class="header">
+		{{svg "octicon-trash"}}
 		{{.locale.Tr "secrets.deletion"}}
 	</div>
 	<div class="content">
 		<p>{{.locale.Tr "secrets.deletion.description"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>

templates/user/settings/account.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content user settings account">
-	{{template "user/settings/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings account")}}
+	<div class="user-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "settings.password"}}
 		</h4>
@@ -159,28 +156,27 @@
 			</form>
 		</div>
 	</div>
-</div>
 
-<div class="ui small basic delete modal" id="delete-email">
-	<div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal" id="delete-email">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.email_deletion"}}
 	</div>
 	<div class="content">
 		<p>{{.locale.Tr "settings.email_deletion_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
-<div class="ui small basic delete modal" id="delete-account">
-	<div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal" id="delete-account">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.delete_account_title"}}
 	</div>
 	<div class="content">
 		<p>{{.locale.Tr "settings.delete_account_desc"}}</p>
 	</div>
-	{{template "base/delete_modal_actions" .}}
+	{{template "base/modal_actions_confirm" .}}
 </div>
 
-{{template "base/footer" .}}
+{{template "user/settings/layout_footer" .}}

templates/user/settings/appearance.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content user settings sshkeys">
-	{{template "user/settings/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings sshkeys")}}
+	<div class="user-setting-content">
 
 		<!-- Theme -->
 		<h4 class="ui top attached header">
@@ -170,6 +167,4 @@
 			</form>
 		</div>
 	</div>
-</div>
-
-{{template "base/footer" .}}
+{{template "user/settings/layout_footer" .}}

templates/user/settings/applications.tmpl

@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content user settings applications">
-	{{template "user/settings/navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings applications")}}
+	<div class="user-setting-content">
 		<h4 class="ui top attached header">
 			{{.locale.Tr "settings.manage_access_token"}}
 		</h4>
@@ -266,10 +263,9 @@
 			{{template "user/settings/applications_oauth2" .}}
 		{{end}}
 	</div>
-</div>
 
-<div class="ui small basic delete modal" id="delete-token">
-	<div class="ui icon header">
+<div class="ui gitea-confirm-modal delete modal" id="delete-token">
+	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.access_token_deletion"}}
 	</div>
@@ -277,7 +273,7 @@
 		<p>{{.locale.Tr "settings.access_token_deletion_desc"}}</p>
 	</div>
 
-	<div class="actions">{{/* TODO: Convert to base/delete_modal_actions.tmpl */}}
+	<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm.tmpl */}}
 		<button class="ui green basic inverted cancel button">
 			{{svg "octicon-x"}}
 			{{.locale.Tr "settings.access_token_deletion_cancel_action"}}
@@ -289,5 +285,4 @@
 	</div>
 </div>
 
-
-{{template "base/footer" .}}
+{{template "user/settings/layout_footer" .}}