From 428d9e956345607bb721d3fa2a496d9b3fb57ead Mon Sep 17 00:00:00 2001
From: zhaoliangyu <zhaoliangyu@jinshuju.net>
Date: Fri, 16 Oct 2026 11:59:30 +0800
Subject: [PATCH 1/2] PR files: github.com commit box with Prev / Next for a
 single commit

When a PR's Files changed tab shows one commit, github.com puts the
commit's message box above the diff: title, body, a Prev / Next
ButtonGroup to step through the PR's commits, Browse files, and an
author row with the short SHA. Gitea only shows the "showing only
changes of commit X" banner. The custom footer renders the box from
CompareInfo.Commits and replaces that banner (no box.tmpl override,
which differs between 1.27 and 28). github-* themes only.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 src/code/diff.css            | 115 +++++++++++++++++++++++++++++++++++
 templates/custom/footer.tmpl | 105 ++++++++++++++++++++++++++++++++
 2 files changed, 220 insertions(+)

diff --git a/src/code/diff.css b/src/code/diff.css
index c2d5027..dcbb3fc 100644
--- a/src/code/diff.css
+++ b/src/code/diff.css
@@ -422,3 +422,118 @@
 .diff-file-body .data-table {
   background: var(--bgColor-default);
 }
+
+/* PR files for a single commit: github.com's commit message Box above the diff (templates/custom/footer.tmpl puts it
+   in place of Gitea's "showing only changes of commit X" banner). Measured on github.com 2026-10-16: muted band with
+   the 16px semibold title, 12px mono body and a row with the Prev / Next ButtonGroup left and "Browse files" right;
+   a default-background row below with the author sentence and "commit <sha>" + copy button in muted 12px. */
+.gh-pr-commit {
+  margin-bottom: var(--base-size-16);
+  overflow: hidden;
+  border: var(--borderWidth-thin) solid var(--borderColor-default);
+  border-radius: var(--borderRadius-medium);
+  background: var(--bgColor-default);
+}
+
+.gh-pr-commit-message {
+  display: flex;
+  flex-direction: column;
+  gap: var(--base-size-8);
+  padding: var(--base-size-16);
+  border-bottom: var(--borderWidth-thin) solid var(--borderColor-default);
+  background: var(--bgColor-muted);
+}
+
+.gh-pr-commit-title {
+  margin: 0;
+  color: var(--fgColor-default);
+  font-size: var(--text-title-size-small);
+  font-weight: var(--base-text-weight-semibold);
+  line-height: var(--text-title-lineHeight-small);
+  overflow-wrap: anywhere;
+}
+
+.gh-pr-commit-body {
+  margin: 0;
+  color: var(--fgColor-default);
+  font-family: var(--fontStack-monospace);
+  font-size: var(--text-body-size-small);
+  line-height: var(--text-body-lineHeight-small);
+  white-space: pre-wrap;
+  overflow-wrap: anywhere;
+}
+
+/* a body longer than 10 lines shows its first 8 and fades out over the last 2 (footer.tmpl adds .is-collapsed) */
+.gh-pr-commit-body.is-collapsed {
+  max-height: 8lh;
+  overflow: hidden;
+  mask-image: linear-gradient(to bottom, currentColor calc(100% - 2lh), transparent);
+}
+
+.gh-pr-commit-toggle {
+  display: inline-flex;
+  align-self: flex-start;
+  padding: 0;
+  border: 0;
+  background: none;
+  color: var(--fgColor-accent);
+  font-size: var(--text-body-size-small);
+  cursor: pointer;
+}
+
+.gh-pr-commit-toggle:hover {
+  text-decoration: underline;
+}
+
+.gh-pr-commit-toggle > span {
+  display: inline-flex;
+  align-items: center;
+  gap: var(--base-size-4);
+}
+
+.gh-pr-commit-toggle[aria-expanded="true"] > .gh-pr-commit-toggle-more,
+.gh-pr-commit-toggle[aria-expanded="false"] > .gh-pr-commit-toggle-less {
+  display: none;
+}
+
+.gh-pr-commit-actions {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-between;
+  gap: var(--base-size-8);
+  margin-top: var(--base-size-8);
+}
+
+.gh-pr-commit-meta {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-between;
+  gap: var(--base-size-8);
+  padding: var(--base-size-8) var(--base-size-16);
+  color: var(--fgColor-muted);
+  font-size: var(--text-body-size-medium);
+}
+
+.gh-pr-commit-people .avatar {
+  margin-right: var(--base-size-4);
+  vertical-align: middle;
+}
+
+.gh-pr-commit-people strong {
+  color: var(--fgColor-default);
+  font-weight: var(--base-text-weight-semibold);
+}
+
+.gh-pr-commit-sha {
+  display: inline-flex;
+  align-items: center;
+  gap: var(--base-size-4);
+  font-family: var(--fontStack-monospace);
+  font-size: var(--text-body-size-small);
+}
+
+.gh-pr-commit-sha > a {
+  color: var(--fgColor-default);
+}
diff --git a/templates/custom/footer.tmpl b/templates/custom/footer.tmpl
index 9b50227..20d18f4 100644
--- a/templates/custom/footer.tmpl
+++ b/templates/custom/footer.tmpl
@@ -15,4 +15,109 @@
     .observe(document.body, {childList: true, subtree: true});
 })();
 </script>
+{{- /* PR "Files changed" for a single commit (/pulls/N/commits/<sha>): github.com shows the commit's message box
+     (title, body, Prev / Next ButtonGroup, Browse files; author row with the short SHA) above the diff. Gitea only has
+     the "showing only changes of commit X" banner (repo/diff/box.tmpl, same in 1.27.3 and 28.1.0), so the box is
+     rendered here and replaces that banner instead of overriding box.tmpl (which differs between the two versions).
+     CompareInfo.Commits is newest first (git log base..head): Prev = the item after the current one, Next = the item
+     before it. */ -}}
+{{- if and .PageIsPullFiles .IsShowingOnlySingleCommit .CompareInfo -}}
+{{- $prev := "" -}}{{- $next := "" -}}{{- $newer := "" -}}{{- $cur := false -}}
+{{- range .CompareInfo.Commits -}}
+	{{- $id := .ID.String -}}
+	{{- if and $cur (not $prev) -}}{{- $prev = $id -}}{{- end -}}
+	{{- if eq $id $.AfterCommitID -}}{{- $cur = . -}}{{- $next = $newer -}}{{- end -}}
+	{{- $newer = $id -}}
+{{- end -}}
+{{- if $cur -}}
+{{- $query := print "?style=" (Iif $.IsSplitStyle "split" "unified") "&whitespace=" $.WhitespaceBehavior "&show-outdated=" $.ShowOutdatedComments -}}
+{{- $author := HTMLFormat "%s<strong>%s</strong>" (ctx.AvatarUtils.AvatarByEmail $cur.Author.Email $cur.Author.Email 20) $cur.Author.Name -}}
+{{- /* github.com's labels in English: Gitea's "Previous" reads "Prev"; other languages keep their translation */ -}}
+{{- $prevLabel := ctx.Locale.Tr "repo.issues.previous" -}}{{- if eq (print $prevLabel) "Previous" -}}{{- $prevLabel = "Prev" -}}{{- end -}}
+{{- /* likewise "Browse files" for Gitea's English "Browse Source" */ -}}
+{{- $browseLabel := ctx.Locale.Tr "repo.diff.browse_source" -}}{{- if eq (print $browseLabel) "Browse Source" -}}{{- $browseLabel = "Browse files" -}}{{- end -}}
+{{- $committerIsAuthor := and (eq $cur.Committer.Name $cur.Author.Name) (eq $cur.Committer.Email $cur.Author.Email) -}}
+<template id="gh-pr-commit"><div class="gh-pr-commit">
+	<div class="gh-pr-commit-message">
+		<h3 class="gh-pr-commit-title" title="{{$cur.MessageTitle}}">{{ctx.RenderUtils.RenderCommitMessage $cur.MessageUTF8 $.Repository}}</h3>
+		{{- if $cur.MessageBody}}
+		<pre class="gh-pr-commit-body">{{ctx.RenderUtils.RenderCommitBody $cur.MessageUTF8 $.Repository}}</pre>
+		{{- /* a body longer than 10 lines is folded to 8 (the script below decides after layout). Gitea has "Show more"
+		     (repo.diff.show_more) but no "Show less": the theme carries it for Gitea's default languages, English otherwise */ -}}
+		{{- $showMore := ctx.Locale.Tr "repo.diff.show_more" -}}{{- $isEn := or (eq (print $showMore) "Show More") (eq (print $showMore) "Show more") -}}
+		{{- $showLessByLang := dict "zh-CN" "收起" "zh-HK" "收起" "zh-TW" "收合" "ja-JP" "折りたたむ" "ko-KR" "접기"
+			"de-DE" "Weniger anzeigen" "fr-FR" "Afficher moins" "es-ES" "Mostrar menos" "pt-BR" "Mostrar menos" "pt-PT" "Mostrar menos"
+			"it-IT" "Mostra meno" "nl-NL" "Minder weergeven" "ru-RU" "Свернуть" "uk-UA" "Згорнути" "pl-PL" "Pokaż mniej"
+			"cs-CZ" "Zobrazit méně" "sv-SE" "Visa mindre" "fi-FI" "Näytä vähemmän" "tr-TR" "Daha az göster" "hu-HU" "Kevesebb megjelenítése"
+			"bg-BG" "Покажи по-малко" "el-GR" "Εμφάνιση λιγότερων" "lv-LV" "Rādīt mazāk" "id-ID" "Tampilkan lebih sedikit"
+			"fa-IR" "نمایش کمتر" "ga-IE" "Taispeáin níos lú" "ml-IN" "കുറച്ച് കാണിക്കുക" -}}
+		{{- $showLess := or (index $showLessByLang ctx.Locale.Language) "Show less" -}}
+		<button type="button" class="gh-pr-commit-toggle tw-hidden" aria-expanded="false">
+			<span class="gh-pr-commit-toggle-more">{{svg "octicon-chevron-down"}}{{if $isEn}}Show more{{else}}{{$showMore}}{{end}}</span>
+			<span class="gh-pr-commit-toggle-less">{{svg "octicon-chevron-up"}}{{$showLess}}</span>
+		</button>
+		{{- end}}
+		<div class="gh-pr-commit-actions">
+			<div class="ui small buttons gh-commit-nav">
+				{{- if $prev -}}
+				<a class="ui small button" href="{{$.Issue.Link}}/commits/{{$prev}}{{$query}}">{{svg "octicon-chevron-left"}}{{$prevLabel}}</a>
+				{{- else -}}
+				<span class="ui small disabled button" aria-disabled="true">{{svg "octicon-chevron-left"}}{{$prevLabel}}</span>
+				{{- end -}}
+				{{- if $next -}}
+				<a class="ui small button" href="{{$.Issue.Link}}/commits/{{$next}}{{$query}}">{{ctx.Locale.Tr "repo.issues.next"}}{{svg "octicon-chevron-right"}}</a>
+				{{- else -}}
+				<span class="ui small disabled button" aria-disabled="true">{{ctx.Locale.Tr "repo.issues.next"}}{{svg "octicon-chevron-right"}}</span>
+				{{- end -}}
+			</div>
+			<a class="ui small button" href="{{$.Repository.Link}}/src/commit/{{PathEscape $.AfterCommitID}}">{{svg "octicon-file-code"}}{{$browseLabel}}</a>
+		</div>
+	</div>
+	<div class="gh-pr-commit-meta">
+		<span class="gh-pr-commit-people">
+			{{- /* 28.x has github.com's "A authored and B committed <time>" sentence; 1.27.x has only "committed by" */ -}}
+			{{- if StringUtils.HasPrefix AppVer "1." -}}
+			{{$author}}
+			{{- if not $committerIsAuthor}} {{ctx.Locale.Tr "repo.diff.committed_by"}} {{HTMLFormat "%s<strong>%s</strong>" (ctx.AvatarUtils.AvatarByEmail $cur.Committer.Email $cur.Committer.Email 20) $cur.Committer.Name}}{{end}}
+			{{DateUtils.TimeSince $cur.Committer.When}}
+			{{- else if $committerIsAuthor -}}
+			{{ctx.Locale.Tr "repo.diff.committed_at" $author (DateUtils.TimeSince $cur.Committer.When)}}
+			{{- else -}}
+			{{ctx.Locale.Tr "repo.diff.authored_committed_at" $author (HTMLFormat "%s<strong>%s</strong>" (ctx.AvatarUtils.AvatarByEmail $cur.Committer.Email $cur.Committer.Email 20) $cur.Committer.Name) (DateUtils.TimeSince $cur.Committer.When)}}
+			{{- end -}}
+		</span>
+		<span class="gh-pr-commit-sha">{{ctx.Locale.Tr "repo.diff.commit"}} <a href="{{$.Repository.Link}}/commit/{{PathEscape $.AfterCommitID}}">{{printf "%.7s" $.AfterCommitID}}</a>
+			<button type="button" class="btn interact-fg" data-tooltip-content="{{ctx.Locale.Tr "copy_hash"}}" data-clipboard-text="{{$.AfterCommitID}}">{{svg "octicon-copy"}}</button>
+		</span>
+	</div>
+</div></template>
+<script nonce="{{ctx.CspScriptNonce}}">
+(() => {
+  const banner = document.querySelector('.diff-detail-box ~ .ui.info.message');
+  if (!banner) return;
+  const box = document.querySelector('#gh-pr-commit').content.firstElementChild;
+  banner.replaceWith(box);
+  const body = box.querySelector('.gh-pr-commit-body');
+  const toggle = box.querySelector('.gh-pr-commit-toggle');
+  if (!body || !toggle) return;
+  // fold only when the body is longer than 10 lines; re-measured on resize until the reader expands it
+  const measure = () => {
+    if (toggle.getAttribute('aria-expanded') === 'true') return;
+    body.classList.remove('is-collapsed');
+    const long = body.scrollHeight > parseFloat(getComputedStyle(body).lineHeight) * 10 + 1;
+    body.classList.toggle('is-collapsed', long);
+    toggle.classList.toggle('tw-hidden', !long);
+  };
+  measure();
+  window.addEventListener('resize', measure);
+  toggle.addEventListener('click', () => {
+    const expand = toggle.getAttribute('aria-expanded') !== 'true';
+    toggle.setAttribute('aria-expanded', String(expand));
+    body.classList.toggle('is-collapsed', !expand);
+    if (!expand && box.getBoundingClientRect().top < 0) box.scrollIntoView({block: 'start'});
+  });
+})();
+</script>
+{{- end -}}
+{{- end -}}
 {{- end -}}

From a2d675de99d4ec40e63a74b6410b5ad178143a39 Mon Sep 17 00:00:00 2001
From: zhaoliangyu <zhaoliangyu@jinshuju.net>
Date: Fri, 16 Oct 2026 11:59:30 +0800
Subject: [PATCH 2/2] PR commits: open the commit inside the PR from its title
 too

On a PR's Commits tab Gitea links the SHA to /pulls/N/commits/<sha> but
the title to the repository's /commit/<sha> page, which is outside the PR
(no Prev / Next). github.com opens the PR commit view from both. github-*
themes only; the repository commit list is unchanged.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 templates/repo/commits_list.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl
index a64ae35..8500c53 100644
--- a/templates/repo/commits_list.tmpl
+++ b/templates/repo/commits_list.tmpl
@@ -36,7 +36,7 @@
 								{{$gitCommit.MessageTitle | ctx.RenderUtils.RenderEmoji}}
 							</span>
 						{{else}}
-							{{$commitLink:= printf "%s/commit/%s" $commitRepoLink (PathEscape $commitID)}}
+							{{$commitLink:= printf "%s/commit/%s" $commitRepoLink (PathEscape $commitID)}}{{/* gitea-theme-github: on a PR's Commits tab github.com opens the commit inside the PR (Prev / Next, custom/footer.tmpl) from the title too, not only from the SHA; github-* themes only. */}}{{if and $.PageIsPullCommits (StringUtils.HasPrefix ctx.CurrentWebTheme.InternalName "github-")}}{{$commitLink = printf "%s/%s" $commitBaseLink (PathEscape $commitID)}}{{end}}
 							<span class="commit-summary {{if gt $gitCommit.ParentCount 1}} grey text{{end}}" title="{{$gitCommit.MessageTitle}}">
 								{{ctx.RenderUtils.RenderCommitMessageLinkSubject $gitCommit.MessageUTF8 $commitLink $.Repository}}
 							</span>