summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2011-04-15 17:32:28 -0400
committerJames Moger <james.moger@gitblit.com>2011-04-15 17:32:28 -0400
commit072643f0b4b808d7fdf4cb73c65045e3b034dad8 (patch)
treecab88fe9c40ae2f861491b61d0b630340ab87713
parent87cc1ed60735a419a3ea23f20614fc0a3f9bab60 (diff)
downloadgitblit-072643f0b4b808d7fdf4cb73c65045e3b034dad8.tar.gz
gitblit-072643f0b4b808d7fdf4cb73c65045e3b034dad8.zip
Show commit parents on separate lines. "tagger" instead of "author".
-rw-r--r--src/com/gitblit/wicket/GitBlitWebApp.properties3
-rw-r--r--src/com/gitblit/wicket/pages/CommitPage.html4
-rw-r--r--src/com/gitblit/wicket/pages/TagPage.html4
3 files changed, 6 insertions, 5 deletions
diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties
index 10888912..a5583c7a 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/com/gitblit/wicket/GitBlitWebApp.properties
@@ -44,4 +44,5 @@ gb.blame = blame
gb.login = Login
gb.logout = Logout
gb.username = Username
-gb.password = Password \ No newline at end of file
+gb.password = Password
+gb.tagger = tagger \ No newline at end of file
diff --git a/src/com/gitblit/wicket/pages/CommitPage.html b/src/com/gitblit/wicket/pages/CommitPage.html
index a639f4a3..8d06fc19 100644
--- a/src/com/gitblit/wicket/pages/CommitPage.html
+++ b/src/com/gitblit/wicket/pages/CommitPage.html
@@ -27,13 +27,13 @@
<tr><th></th><td><span wicket:id="commitCommitterDate">[commit date]</span></td></tr>
<tr><th><wicket:message key="gb.commit">commit</wicket:message></th><td><span class="sha1" wicket:id="commitId">[commit id]</span></td></tr>
<tr><th><wicket:message key="gb.tree">tree</wicket:message></th><td><span class="sha1" wicket:id="commitTree">[commit tree]</span></td></tr>
- <tr><th><wicket:message key="gb.parent">parent</wicket:message></th>
+ <tr><th valign="top"><wicket:message key="gb.parent">parent</wicket:message></th>
<td>
<span wicket:id="commitParents">
<span class="sha1" wicket:id="commitParent">[commit parents]</span>
<span class="link">
<a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="diff"><wicket:message key="gb.diff"></wicket:message></a>
- </span>
+ </span><br/>
</span>
</td>
</tr>
diff --git a/src/com/gitblit/wicket/pages/TagPage.html b/src/com/gitblit/wicket/pages/TagPage.html
index 42a75854..cd2e19b7 100644
--- a/src/com/gitblit/wicket/pages/TagPage.html
+++ b/src/com/gitblit/wicket/pages/TagPage.html
@@ -15,8 +15,8 @@
<!-- commit info -->
<table class="plain">
- <tr><th><wicket:message key="gb.object">object</wicket:message></th><td><span class="sha1" wicket:id="tagId">[tag id]</span></td></tr>
- <tr><th><wicket:message key="gb.author">author</wicket:message></th><td><span wicket:id="tagAuthor">[tag author]</span></td></tr>
+ <tr><th><wicket:message key="gb.object">[object]</wicket:message></th><td><span class="sha1" wicket:id="tagId">[tag id]</span></td></tr>
+ <tr><th><wicket:message key="gb.tagger">[tagger]</wicket:message></th><td><span wicket:id="tagAuthor">[tag author]</span></td></tr>
<tr><th></th><td><span wicket:id="tagDate">[tag date]</span></td></tr>
</table>