MirrorHub/forgejo
0
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-24 21:52:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move note bubble inside the commit bubble

Browse source
This commit is contained in:
Vladimir Panteleev 2019-05-21 16:10:27 +00:00
parent cb71e3f1ac
commit c0951fe0e3
No known key found for this signature in database
GPG key ID: 5004F0FAD051576D
1 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
templates/repo/diff/page.tmpl
View file

@ -13,6 +13,30 @@
{{if IsMultilineCommitMessage .Commit.Message}}
<pre class="commit-body">{{RenderCommitBody .Commit.Message $.RepoLink $.Repository.ComposeMetas}}</pre>
{{end}}
{{if .Note}}
<div class="ui top attached info clearing segment">
<h3>{{.i18n.Tr "repo.diff.git-notes"}}</h3>
<pre class="commit-body">{{RenderNote .Note $.RepoLink $.Repository.ComposeMetas}}</pre>
</div>
<div class="ui bottom attached info segment">
<div class="ui stackable grid">
<div class="nine wide column">
{{if .NoteAuthor}}
<img class="ui avatar image" src="{{.NoteAuthor.RelAvatarLink}}" />
{{if .NoteAuthor.FullName}}
<a href="{{.NoteAuthor.HomeLink}}"><strong>{{.NoteAuthor.FullName}}</strong></a>
{{else}}
<a href="{{.NoteAuthor.HomeLink}}"><strong>{{.NoteCommit.Author.Name}}</strong></a>
{{end}}
{{else}}
<img class="ui avatar image" src="{{AvatarLink .NoteCommit.Author.Email}}" />
<strong>{{.NoteCommit.Author.Name}}</strong>
{{end}}
<span class="text grey" id="note-authored-time">{{TimeSince .NoteCommit.Author.When $.Lang}}</span>
</div>
</div><!-- end grid -->
</div>
{{end}}
<span class="text grey"><i class="octicon octicon-git-branch"></i>{{.BranchName}}</span>
</div>
<div class="ui attached info segment {{if .Commit.Signature}} isSigned {{if .Verification.Verified }} isVerified {{end}}{{end}}">
@ -65,30 +89,6 @@
</div>
{{end}}
{{end}}
{{if .Note}}
<div class="ui top attached info clearing segment">
<h3>{{.i18n.Tr "repo.diff.git-notes"}}</h3>
<pre class="commit-body">{{RenderNote .Note $.RepoLink $.Repository.ComposeMetas}}</pre>
</div>
<div class="ui bottom attached info segment">
<div class="ui stackable grid">
<div class="nine wide column">
{{if .NoteAuthor}}
<img class="ui avatar image" src="{{.NoteAuthor.RelAvatarLink}}" />
{{if .NoteAuthor.FullName}}
<a href="{{.NoteAuthor.HomeLink}}"><strong>{{.NoteAuthor.FullName}}</strong></a>
{{else}}
<a href="{{.NoteAuthor.HomeLink}}"><strong>{{.NoteCommit.Author.Name}}</strong></a>
{{end}}
{{else}}
<img class="ui avatar image" src="{{AvatarLink .NoteCommit.Author.Email}}" />
<strong>{{.NoteCommit.Author.Name}}</strong>
{{end}}
<span class="text grey" id="note-authored-time">{{TimeSince .NoteCommit.Author.When $.Lang}}</span>
</div>
</div><!-- end grid -->
</div>
{{end}}
{{end}}
{{template "repo/diff/box" .}}