From 212f3725ed1444c8a62189a4c5633c401d434f4b Mon Sep 17 00:00:00 2001
From: Tomofumi Tanaka <tanacasino@gmail.com>
Date: Wed, 30 Jul 2014 22:41:04 +0900
Subject: [PATCH] (refs #437)Show author at blob, commits and wiki history view

---
 src/main/twirl/repo/blob.scala.html    | 2 +-
 src/main/twirl/repo/commits.scala.html | 9 +++++++--
 src/main/twirl/wiki/history.scala.html | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/twirl/repo/blob.scala.html b/src/main/twirl/repo/blob.scala.html
index 9df602c59..52e2bb098 100644
--- a/src/main/twirl/repo/blob.scala.html
+++ b/src/main/twirl/repo/blob.scala.html
@@ -33,7 +33,7 @@
         <th style="font-weight: normal;">
           <div class="pull-left">
             @avatar(latestCommit, 20)
-            @user(latestCommit.committerName, latestCommit.committerEmailAddress, "username strong")
+            @user(latestCommit.authorName, latestCommit.authorEmailAddress, "username strong")
             <span class="muted">@datetime(latestCommit.commitTime)</span>
             <a href="@url(repository)/commit/@latestCommit.id" class="commit-message">@link(latestCommit.summary, repository)</a>
           </div>
diff --git a/src/main/twirl/repo/commits.scala.html b/src/main/twirl/repo/commits.scala.html
index ae93996cc..be2b02f20 100644
--- a/src/main/twirl/repo/commits.scala.html
+++ b/src/main/twirl/repo/commits.scala.html
@@ -57,8 +57,13 @@
                   <pre id="description-@commit.id" style="display: none;" class="commit-description">@link(commit.description.get, repository)</pre>
                 }
                 <div class="small">
-                  @user(commit.committerName, commit.committerEmailAddress, "username")
-                  <span class="muted">@datetime(commit.commitTime)</span>
+                  @user(commit.authorName, commit.authorEmailAddress, "username")
+                  <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>
diff --git a/src/main/twirl/wiki/history.scala.html b/src/main/twirl/wiki/history.scala.html
index 6c5c2ac7f..bd2ba49d5 100644
--- a/src/main/twirl/wiki/history.scala.html
+++ b/src/main/twirl/wiki/history.scala.html
@@ -34,9 +34,9 @@
       @commits.map { commit =>
         <tr>
           <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%">
-            <span class="muted">@datetime(commit.commitTime):</span>&nbsp;@commit.shortMessage
+            <span class="muted">@datetime(commit.authorTime):</span>&nbsp;@commit.shortMessage
           </td>
         </tr>
       }