mirror of
https://github.com/go-gitea/gitea
synced 2024-12-15 16:54:02 +01:00
a3d9f0d915
Fixes https://github.com/go-gitea/gitea/issues/30673, all 23 issues. Notes: - Tab bar menus had to change to pills because of unsolvable issue with the border-radius as tab bar renders a overlapping border onto the box below. And I think pills look better. - Added padding to code editor empty preview message - Hide monaco's built-in blue focus border, we don't need it and it never showed before either. - Label add menu is simplified, removing the nested segment. <img width="1322" alt="Screenshot 2024-04-25 at 22 26 19" src="https://github.com/go-gitea/gitea/assets/115237/7e394e0c-b7ad-417d-8e9f-12f1dea93ed1"> <img width="1326" alt="Screenshot 2024-04-25 at 22 28 00" src="https://github.com/go-gitea/gitea/assets/115237/66c8499f-aa9f-4d95-8cca-ef13dfa82c65"> <img width="997" alt="Screenshot 2024-04-25 at 22 36 53" src="https://github.com/go-gitea/gitea/assets/115237/07896102-c71d-4246-8173-c2bc2e1d3cae"> <img width="832" alt="Screenshot 2024-04-25 at 22 56 09" src="https://github.com/go-gitea/gitea/assets/115237/d83afc96-08ca-4adc-baf4-3d02804be57c"> <img width="361" alt="Screenshot 2024-04-25 at 22 57 12" src="https://github.com/go-gitea/gitea/assets/115237/c7371a68-00b5-47d8-84d0-ddc5268b2b2c"> --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: Giteabot <teabot@gitea.io>
285 lines
14 KiB
Handlebars
285 lines
14 KiB
Handlebars
{{template "base/head" .}}
|
|
<div role="main" aria-label="{{.Title}}" class="page-content repository diff">
|
|
{{template "repo/header" .}}
|
|
<div class="ui container fluid padded">
|
|
{{$class := ""}}
|
|
{{if .Commit.Signature}}
|
|
{{$class = (print $class " isSigned")}}
|
|
{{if .Verification.Verified}}
|
|
{{if eq .Verification.TrustStatus "trusted"}}
|
|
{{$class = (print $class " isVerified")}}
|
|
{{else if eq .Verification.TrustStatus "untrusted"}}
|
|
{{$class = (print $class " isVerifiedUntrusted")}}
|
|
{{else}}
|
|
{{$class = (print $class " isVerifiedUnmatched")}}
|
|
{{end}}
|
|
{{else if .Verification.Warning}}
|
|
{{$class = (print $class " isWarning")}}
|
|
{{end}}
|
|
{{end}}
|
|
<div class="ui top attached header clearing segment tw-relative commit-header {{$class}}">
|
|
<div class="tw-flex tw-mb-4 tw-gap-1">
|
|
<h3 class="tw-mb-0 tw-flex-1"><span class="commit-summary" title="{{.Commit.Summary}}">{{RenderCommitMessage $.Context .Commit.Message ($.Repository.ComposeMetas ctx)}}</span>{{template "repo/commit_statuses" dict "Status" .CommitStatus "Statuses" .CommitStatuses}}</h3>
|
|
{{if not $.PageIsWiki}}
|
|
<div class="commit-header-buttons">
|
|
<a class="ui primary tiny button" href="{{.SourcePath}}">
|
|
{{ctx.Locale.Tr "repo.diff.browse_source"}}
|
|
</a>
|
|
{{if and ($.Permission.CanWrite ctx.Consts.RepoUnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}}{{- /* */ -}}
|
|
<div class="ui dropdown primary tiny button">
|
|
{{ctx.Locale.Tr "repo.commit.operations"}}
|
|
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
|
<div class="menu">
|
|
<div class="ui header">{{ctx.Locale.Tr "repo.commit.operations"}}</div>
|
|
<div class="divider"></div>
|
|
<div class="item show-create-branch-modal"
|
|
data-content="{{ctx.Locale.Tr "repo.branch.new_branch_from" (.CommitID)}}" {{/* used by the form */}}
|
|
data-branch-from="{{ShortSha .CommitID}}"
|
|
data-branch-from-urlcomponent="{{.CommitID}}"
|
|
data-modal="#create-branch-modal">
|
|
{{ctx.Locale.Tr "repo.branch.create_branch_operation"}}
|
|
</div>
|
|
<div class="item show-create-branch-modal"
|
|
data-content="{{ctx.Locale.Tr "repo.branch.new_branch_from" (.CommitID)}}" {{/* used by the form */}}
|
|
data-branch-from="{{ShortSha .CommitID}}"
|
|
data-branch-from-urlcomponent="{{.CommitID}}"
|
|
data-modal="#create-tag-modal"
|
|
data-modal-from-span="#modal-create-tag-from-span"
|
|
data-modal-form="#create-tag-form">
|
|
{{ctx.Locale.Tr "repo.tag.create_tag_operation"}}
|
|
</div>
|
|
<div class="item show-modal revert-button"
|
|
data-modal="#cherry-pick-modal"
|
|
data-modal-cherry-pick-type="revert"
|
|
data-modal-cherry-pick-header="{{ctx.Locale.Tr "repo.commit.revert-header" (ShortSha .CommitID)}}"
|
|
data-modal-cherry-pick-content="{{ctx.Locale.Tr "repo.commit.revert-content"}}"
|
|
data-modal-cherry-pick-submit="{{ctx.Locale.Tr "repo.commit.revert"}}">{{ctx.Locale.Tr "repo.commit.revert"}}</div>
|
|
<div class="item cherry-pick-button show-modal"
|
|
data-modal="#cherry-pick-modal"
|
|
data-modal-cherry-pick-type="cherry-pick"
|
|
data-modal-cherry-pick-header="{{ctx.Locale.Tr "repo.commit.cherry-pick-header" (ShortSha .CommitID)}}"
|
|
data-modal-cherry-pick-content="{{ctx.Locale.Tr "repo.commit.cherry-pick-content"}}"
|
|
data-modal-cherry-pick-submit="{{ctx.Locale.Tr "repo.commit.cherry-pick"}}">{{ctx.Locale.Tr "repo.commit.cherry-pick"}}</div>
|
|
<div class="ui g-modal-confirm modal" id="cherry-pick-modal">
|
|
<div class="header">
|
|
<span id="cherry-pick-header"></span>
|
|
</div>
|
|
<div class="content">
|
|
<p id="cherry-pick-content" class="branch-dropdown"></p>
|
|
{{template "repo/branch_dropdown" dict "root" .
|
|
"noTag" true "disableCreateBranch" true
|
|
"branchForm" "branch-dropdown-form"
|
|
"branchURLPrefix" (printf "%s/_cherrypick/%s/" $.RepoLink .CommitID) "branchURLSuffix" ""
|
|
"setAction" true "submitForm" true}}
|
|
<form method="get" action="{{$.RepoLink}}/_cherrypick/{{.CommitID}}/{{if $.BranchName}}{{PathEscapeSegments $.BranchName}}{{else}}{{PathEscapeSegments $.Repository.DefaultBranch}}{{end}}" id="branch-dropdown-form">
|
|
<input type="hidden" name="ref" value="{{if $.BranchName}}{{$.BranchName}}{{else}}{{$.Repository.DefaultBranch}}{{end}}">
|
|
<input type="hidden" name="refType" value="branch">
|
|
<input type="hidden" id="cherry-pick-type" name="cherry-pick-type"><br>
|
|
<button type="submit" id="cherry-pick-submit" class="ui primary button"></button>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
<div class="ui small modal" id="create-branch-modal">
|
|
<div class="header">
|
|
{{ctx.Locale.Tr "repo.branch.new_branch"}}
|
|
</div>
|
|
<div class="content">
|
|
<form class="ui form" id="create-branch-form" action="" data-base-action="{{.RepoLink}}/branches/_new/commit/" method="post">
|
|
{{.CsrfTokenHtml}}
|
|
<div class="field">
|
|
<label>
|
|
{{ctx.Locale.Tr "repo.branch.new_branch_from" (`<span class="text" id="modal-create-branch-from-span"></span>`|SafeHTML)}}
|
|
</label>
|
|
</div>
|
|
<div class="required field">
|
|
<label for="new_branch_name">{{ctx.Locale.Tr "repo.branch.name"}}</label>
|
|
<input id="new_branch_name" name="new_branch_name" required>
|
|
</div>
|
|
|
|
<div class="text right actions">
|
|
<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
|
|
<button class="ui primary button">{{ctx.Locale.Tr "repo.branch.confirm_create_branch"}}</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
<div class="ui small modal" id="create-tag-modal">
|
|
<div class="header">
|
|
{{ctx.Locale.Tr "repo.tag.create_tag_operation"}}
|
|
</div>
|
|
<div class="content">
|
|
<form class="ui form" id="create-tag-form" action="" data-base-action="{{.RepoLink}}/branches/_new/commit/" method="post">
|
|
{{.CsrfTokenHtml}}
|
|
<input type="hidden" name="create_tag" value="true">
|
|
<div class="field">
|
|
<label>
|
|
{{ctx.Locale.Tr "repo.tag.create_tag_from" (`<span class="text" id="modal-create-tag-from-span"></span>`|SafeHTML)}}
|
|
</label>
|
|
</div>
|
|
<div class="required field">
|
|
<label for="new_branch_name">{{ctx.Locale.Tr "repo.release.tag_name"}}</label>
|
|
<input id="new_branch_name" name="new_branch_name" required>
|
|
</div>
|
|
|
|
<div class="text right actions">
|
|
<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
|
|
<button class="ui primary button">{{ctx.Locale.Tr "repo.tag.confirm_create_tag"}}</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{if IsMultilineCommitMessage .Commit.Message}}
|
|
<pre class="commit-body">{{RenderCommitBody $.Context .Commit.Message ($.Repository.ComposeMetas ctx)}}</pre>
|
|
{{end}}
|
|
{{template "repo/commit_load_branches_and_tags" .}}
|
|
</div>
|
|
<div class="ui{{if not .Commit.Signature}} bottom{{end}} attached segment tw-flex tw-items-center tw-justify-between tw-py-1 commit-header-row tw-flex-wrap {{$class}}">
|
|
<div class="tw-flex tw-items-center author">
|
|
{{if .Author}}
|
|
{{ctx.AvatarUtils.Avatar .Author 28 "tw-mr-2"}}
|
|
{{if .Author.FullName}}
|
|
<a href="{{.Author.HomeLink}}"><strong>{{.Author.FullName}}</strong></a>
|
|
{{else}}
|
|
<a href="{{.Author.HomeLink}}"><strong>{{.Commit.Author.Name}}</strong></a>
|
|
{{end}}
|
|
{{else}}
|
|
{{ctx.AvatarUtils.AvatarByEmail .Commit.Author.Email .Commit.Author.Email 28 "tw-mr-2"}}
|
|
<strong>{{.Commit.Author.Name}}</strong>
|
|
{{end}}
|
|
<span class="text grey tw-ml-2" id="authored-time">{{TimeSince .Commit.Author.When ctx.Locale}}</span>
|
|
{{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}}
|
|
<span class="text grey tw-mx-2">{{ctx.Locale.Tr "repo.diff.committed_by"}}</span>
|
|
{{if ne .Verification.CommittingUser.ID 0}}
|
|
{{ctx.AvatarUtils.Avatar .Verification.CommittingUser 28 "tw-mx-2"}}
|
|
<a href="{{.Verification.CommittingUser.HomeLink}}"><strong>{{.Commit.Committer.Name}}</strong></a>
|
|
{{else}}
|
|
{{ctx.AvatarUtils.AvatarByEmail .Commit.Committer.Email .Commit.Committer.Name 28 "tw-mr-2"}}
|
|
<strong>{{.Commit.Committer.Name}}</strong>
|
|
{{end}}
|
|
{{end}}
|
|
</div>
|
|
<div class="tw-flex tw-items-center">
|
|
{{if .Parents}}
|
|
<div>
|
|
<span>{{ctx.Locale.Tr "repo.diff.parent"}}</span>
|
|
{{range .Parents}}
|
|
{{if $.PageIsWiki}}
|
|
<a class="ui primary sha label" href="{{$.RepoLink}}/wiki/commit/{{PathEscape .}}">{{ShortSha .}}</a>
|
|
{{else}}
|
|
<a class="ui primary sha label" href="{{$.RepoLink}}/commit/{{PathEscape .}}">{{ShortSha .}}</a>
|
|
{{end}}
|
|
{{end}}
|
|
</div>
|
|
{{end}}
|
|
<div class="item">
|
|
<span>{{ctx.Locale.Tr "repo.diff.commit"}}</span>
|
|
<span class="ui primary sha label">{{ShortSha .CommitID}}</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{{if .Commit.Signature}}
|
|
<div class="ui bottom attached message tw-text-left tw-flex tw-items-center tw-justify-between commit-header-row tw-flex-wrap tw-mb-0 {{$class}}">
|
|
<div class="tw-flex tw-items-center">
|
|
{{if .Verification.Verified}}
|
|
{{if ne .Verification.SigningUser.ID 0}}
|
|
{{svg "gitea-lock" 16 "tw-mr-2"}}
|
|
{{if eq .Verification.TrustStatus "trusted"}}
|
|
<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.signed_by"}}:</span>
|
|
{{else if eq .Verification.TrustStatus "untrusted"}}
|
|
<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.signed_by_untrusted_user"}}:</span>
|
|
{{else}}
|
|
<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}:</span>
|
|
{{end}}
|
|
{{ctx.AvatarUtils.Avatar .Verification.SigningUser 28 "tw-mr-2"}}
|
|
<a href="{{.Verification.SigningUser.HomeLink}}"><strong>{{.Verification.SigningUser.GetDisplayName}}</strong></a>
|
|
{{else}}
|
|
<span title="{{ctx.Locale.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog" 16 "tw-mr-2"}}</span>
|
|
<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.signed_by"}}:</span>
|
|
{{ctx.AvatarUtils.AvatarByEmail .Verification.SigningEmail "" 28 "tw-mr-2"}}
|
|
<strong>{{.Verification.SigningUser.GetDisplayName}}</strong>
|
|
{{end}}
|
|
{{else}}
|
|
{{svg "gitea-unlock" 16 "tw-mr-2"}}
|
|
<span class="ui text">{{ctx.Locale.Tr .Verification.Reason}}</span>
|
|
{{end}}
|
|
</div>
|
|
<div class="tw-flex tw-items-center">
|
|
{{if .Verification.Verified}}
|
|
{{if ne .Verification.SigningUser.ID 0}}
|
|
{{svg "octicon-verified" 16 "tw-mr-2"}}
|
|
{{if .Verification.SigningSSHKey}}
|
|
<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
|
|
{{.Verification.SigningSSHKey.Fingerprint}}
|
|
{{else}}
|
|
<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.gpg_key_id"}}:</span>
|
|
{{.Verification.SigningKey.PaddedKeyID}}
|
|
{{end}}
|
|
{{else}}
|
|
{{svg "octicon-unverified" 16 "tw-mr-2"}}
|
|
{{if .Verification.SigningSSHKey}}
|
|
<span class="ui text tw-mr-2" data-tooltip-content="{{ctx.Locale.Tr "gpg.default_key"}}">{{ctx.Locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
|
|
{{.Verification.SigningSSHKey.Fingerprint}}
|
|
{{else}}
|
|
<span class="ui text tw-mr-2" data-tooltip-content="{{ctx.Locale.Tr "gpg.default_key"}}">{{ctx.Locale.Tr "repo.commits.gpg_key_id"}}:</span>
|
|
{{.Verification.SigningKey.PaddedKeyID}}
|
|
{{end}}
|
|
{{end}}
|
|
{{else if .Verification.Warning}}
|
|
{{svg "octicon-unverified" 16 "tw-mr-2"}}
|
|
{{if .Verification.SigningSSHKey}}
|
|
<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
|
|
{{.Verification.SigningSSHKey.Fingerprint}}
|
|
{{else}}
|
|
<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.gpg_key_id"}}:</span>
|
|
{{.Verification.SigningKey.PaddedKeyID}}
|
|
{{end}}
|
|
{{else}}
|
|
{{if .Verification.SigningKey}}
|
|
{{if ne .Verification.SigningKey.KeyID ""}}
|
|
{{svg "octicon-verified" 16 "tw-mr-2"}}
|
|
<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.gpg_key_id"}}:</span>
|
|
{{.Verification.SigningKey.PaddedKeyID}}
|
|
{{end}}
|
|
{{end}}
|
|
{{if .Verification.SigningSSHKey}}
|
|
{{if ne .Verification.SigningSSHKey.Fingerprint ""}}
|
|
{{svg "octicon-verified" 16 "tw-mr-2"}}
|
|
<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
|
|
{{.Verification.SigningSSHKey.Fingerprint}}
|
|
{{end}}
|
|
{{end}}
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
{{if .NoteRendered}}
|
|
<div class="ui top attached header segment git-notes">
|
|
{{svg "octicon-note" 16 "tw-mr-2"}}
|
|
{{ctx.Locale.Tr "repo.diff.git-notes"}}:
|
|
{{if .NoteAuthor}}
|
|
<a href="{{.NoteAuthor.HomeLink}}">
|
|
{{if .NoteAuthor.FullName}}
|
|
<strong>{{.NoteAuthor.FullName}}</strong>
|
|
{{else}}
|
|
<strong>{{.NoteCommit.Author.Name}}</strong>
|
|
{{end}}
|
|
</a>
|
|
{{else}}
|
|
<strong>{{.NoteCommit.Author.Name}}</strong>
|
|
{{end}}
|
|
<span class="text grey" id="note-authored-time">{{TimeSince .NoteCommit.Author.When ctx.Locale}}</span>
|
|
</div>
|
|
<div class="ui bottom attached info segment git-notes">
|
|
<pre class="commit-body">{{.NoteRendered | SanitizeHTML}}</pre>
|
|
</div>
|
|
{{end}}
|
|
{{template "repo/diff/box" .}}
|
|
</div>
|
|
</div>
|
|
{{template "base/footer" .}}
|