From 5902495153c08d1da8baa369e0f51a83003350c5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 03 Mar 2014 22:48:43 -0500
Subject: [PATCH] Lower opacity for merge commit short messages in the log panel
---
src/main/java/com/gitblit/wicket/panels/LogPanel.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/LogPanel.java b/src/main/java/com/gitblit/wicket/panels/LogPanel.java
index dad25a0..16fc746 100644
--- a/src/main/java/com/gitblit/wicket/panels/LogPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/LogPanel.java
@@ -110,6 +110,7 @@
public void populateItem(final Item<RevCommit> item) {
final RevCommit entry = item.getModelObject();
final Date date = JGitUtils.getCommitDate(entry);
+ final boolean isMerge = entry.getParentCount() > 1;
item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone(), getTimeUtils()));
@@ -122,7 +123,7 @@
item.add(authorLink);
// merge icon
- if (entry.getParentCount() > 1) {
+ if (isMerge) {
item.add(WicketUtils.newImage("commitIcon", "commit_merge_16x16.png"));
} else {
item.add(WicketUtils.newBlankImage("commitIcon"));
@@ -136,7 +137,7 @@
} else {
trimmedMessage = StringUtils.trimString(shortMessage, Constants.LEN_SHORTLOG);
}
- LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject",
+ LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject" + (isMerge ? " merge" : ""),
trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(
repositoryName, entry.getName()));
if (!shortMessage.equals(trimmedMessage)) {
--
Gitblit v1.9.1