diff options
| author | James Moger <james.moger@gitblit.com> | 2013-06-20 17:42:24 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-06-20 17:42:24 -0400 |
| commit | 684cfd65840762029472b826bde317be951c2c08 (patch) | |
| tree | 2caf2dbe45074b0148e938b47972f2d774c1b403 /src/main/java | |
| parent | 52b26fd0c7a0e3bc561cdcd11ffa776535f80ff5 (diff) | |
| download | gitblit-684cfd65840762029472b826bde317be951c2c08.tar.gz gitblit-684cfd65840762029472b826bde317be951c2c08.zip | |
Display full message on commitdiff page (issue-258)
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html | 13 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java | 7 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html index de39f4ca..11a0ce3e 100644 --- a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html +++ b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html @@ -15,13 +15,14 @@ <!-- commit header -->
<div wicket:id="commitHeader">[commit header]</div>
- <!-- changed paths -->
- <div style="padding-top:15px;">
- <!-- commit legend -->
- <div class="hidden-phone" style="text-align:right;" wicket:id="commitLegend"></div>
+ <!-- full message -->
+ <pre style="border-style:none" "class="commit_message" wicket:id="fullMessage">[commit message]</pre>
+
+ <!-- commit legend -->
+ <div class="hidden-phone" style="text-align:right;" wicket:id="commitLegend"></div>
- <div class="header"><i class="icon-file"></i> <wicket:message key="gb.changedFiles">[changed files]</wicket:message></div>
- </div>
+ <!-- changed paths -->
+ <div class="header"><i class="icon-file"></i> <wicket:message key="gb.changedFiles">[changed files]</wicket:message></div>
<table class="pretty">
<tr wicket:id="changedPath">
diff --git a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java index ee2aaa2b..6954808d 100644 --- a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java +++ b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java @@ -16,6 +16,7 @@ package com.gitblit.wicket.pages; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.wicket.PageParameters; @@ -29,9 +30,11 @@ import org.eclipse.jgit.diff.DiffEntry.ChangeType; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; +import com.gitblit.Constants; import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.models.PathModel.PathChangeModel; +import com.gitblit.models.GitNote; import com.gitblit.models.SubmoduleModel; import com.gitblit.utils.DiffUtils; import com.gitblit.utils.DiffUtils.DiffOutputType; @@ -39,7 +42,9 @@ import com.gitblit.utils.JGitUtils; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.CommitHeaderPanel; import com.gitblit.wicket.panels.CommitLegendPanel; +import com.gitblit.wicket.panels.GravatarImage; import com.gitblit.wicket.panels.LinkPanel; +import com.gitblit.wicket.panels.RefsPanel; public class CommitDiffPage extends RepositoryPage { @@ -76,6 +81,8 @@ public class CommitDiffPage extends RepositoryPage { add(new CommitHeaderPanel("commitHeader", repositoryName, commit)); + addFullText("fullMessage", commit.getFullMessage(), true); + // changed paths list List<PathChangeModel> paths = JGitUtils.getFilesInCommit(r, commit); |