summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorwxiaoguang <wxiaoguang@gmail.com>2024-03-22 19:42:41 +0800
committerGitHub <noreply@github.com>2024-03-22 19:42:41 +0800
commit24c66c5096560c78ead4e8f387fb8dee82a04277 (patch)
tree889f1c910c31153ca43a4e1d48d56879212eb596 /templates
parente1e88f9ad18e82a67a1a8621d4dc4e1608ad07e4 (diff)
downloadgitea-24c66c5096560c78ead4e8f387fb8dee82a04277.tar.gz
gitea-24c66c5096560c78ead4e8f387fb8dee82a04277.zip
Fix manual merge form and 404 page templates (#30000)
Partially backport #29985, fix some template errors. * fix the manual-merge form * fix the 404 page
Diffstat (limited to 'templates')
-rw-r--r--templates/repo/issue/view_content/pull.tmpl2
-rw-r--r--templates/status/404.tmpl8
2 files changed, 3 insertions, 7 deletions
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index 409af3a5d5..128a4cc03c 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -360,7 +360,7 @@
{{if and $.StillCanManualMerge (not $showGeneralMergeForm)}}
<div class="divider"></div>
<div class="ui form">
- <form action="{{.Link}}/merge" method="post">
+ <form class="form-fetch-action" action="{{.Link}}/merge" method="post">
{{.CsrfTokenHtml}}
<div class="field">
<input type="text" name="merge_commit_id" placeholder="{{ctx.Locale.Tr "repo.pulls.merge_commit_id"}}">
diff --git a/templates/status/404.tmpl b/templates/status/404.tmpl
index 74bb8762bd..86aa7587ff 100644
--- a/templates/status/404.tmpl
+++ b/templates/status/404.tmpl
@@ -1,14 +1,10 @@
{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content ui container center gt-w-screen {{if .IsRepo}}repository{{end}}">
+<div role="main" aria-label="{{.Title}}" class="page-content {{if .IsRepo}}repository{{end}}">
{{if .IsRepo}}{{template "repo/header" .}}{{end}}
<div class="ui container center">
- <p style="margin-top: 100px"><img src="{{AssetUrlPrefix}}/img/404.png" alt="404"></p>
+ <img style="margin: 50px 0; max-width: 80vw" src="{{AssetUrlPrefix}}/img/404.png" alt="404">
<p>{{if .NotFoundPrompt}}{{.NotFoundPrompt}}{{else}}{{ctx.Locale.Tr "error404" | Safe}}{{end}}</p>
{{if .NotFoundGoBackURL}}<a class="ui button green" href="{{.NotFoundGoBackURL}}">{{ctx.Locale.Tr "go_back"}}</a>{{end}}
-
- <div class="divider"></div>
- <br>
- {{if .ShowFooterVersion}}<p>{{ctx.Locale.Tr "admin.config.app_ver"}}: {{AppVer}}</p>{{end}}
</div>
</div>
{{template "base/footer" .}}