Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-17 10:50:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #437)Show author at blob, commits and wiki history view

Browse Source
This commit is contained in:
Tomofumi Tanaka
2014-07-30 22:41:04 +09:00
parent d2317d0a97
commit 212f3725ed
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/twirl/repo/blob.scala.html
View File

@@ -33,7 +33,7 @@
<th style="font-weight: normal;"> <th style="font-weight: normal;">
<div class="pull-left"> <div class="pull-left">
@avatar(latestCommit, 20) @avatar(latestCommit, 20)
@user(latestCommit.committerName, latestCommit.committerEmailAddress, "username strong") @user(latestCommit.authorName, latestCommit.authorEmailAddress, "username strong")
<span class="muted">@datetime(latestCommit.commitTime)</span> <span class="muted">@datetime(latestCommit.commitTime)</span>
<a href="@url(repository)/commit/@latestCommit.id" class="commit-message">@link(latestCommit.summary, repository)</a> <a href="@url(repository)/commit/@latestCommit.id" class="commit-message">@link(latestCommit.summary, repository)</a>
</div> </div>

9
src/main/twirl/repo/commits.scala.html
View File

@@ -57,8 +57,13 @@
<pre id="description-@commit.id" style="display: none;" class="commit-description">@link(commit.description.get, repository)</pre> <pre id="description-@commit.id" style="display: none;" class="commit-description">@link(commit.description.get, repository)</pre>
} }
<div class="small"> <div class="small">
@user(commit.committerName, commit.committerEmailAddress, "username") @user(commit.authorName, commit.authorEmailAddress, "username")
<span class="muted">@datetime(commit.commitTime)</span> <span class="muted">authored @datetime(commit.authorTime)</span>
@if(commit.isDifferentFromAuthor) {
<span class="icon-arrow-right" style="margin-top : -2px ;"></span>
@user(commit.committerName, commit.committerEmailAddress, "username")
<span class="muted">committed @datetime(commit.authorTime)</span>
}
</div> </div>
</div> </div>
</div> </div>

4
src/main/twirl/wiki/history.scala.html
View File

@@ -34,9 +34,9 @@
@commits.map { commit => @commits.map { commit =>
<tr> <tr>
<td width="0%"><input type="checkbox" name="commitId" value="@commit.id"></td> <td width="0%"><input type="checkbox" name="commitId" value="@commit.id"></td>
<td>@avatar(commit, 20)&nbsp;@user(commit.committerName, commit.committerEmailAddress)</td> <td>@avatar(commit, 20)&nbsp;@user(commit.authorName, commit.authorEmailAddress)</td>
<td width="80%"> <td width="80%">
<span class="muted">@datetime(commit.commitTime):</span>&nbsp;@commit.shortMessage <span class="muted">@datetime(commit.authorTime):</span>&nbsp;@commit.shortMessage
</td> </td>
</tr> </tr>
} }