From d00a0ca46fcde3e3e580afea6a548b9c12aeac25 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 Jul 2012 17:18:02 -0400
Subject: [PATCH] Update to slf4j 1.6.6 and log4j 1.2.17
---
src/com/gitblit/wicket/panels/ActivityPanel.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.java b/src/com/gitblit/wicket/panels/ActivityPanel.java
index f75cf7d..2e70a9a 100644
--- a/src/com/gitblit/wicket/panels/ActivityPanel.java
+++ b/src/com/gitblit/wicket/panels/ActivityPanel.java
@@ -56,7 +56,7 @@
public void populateItem(final Item<Activity> activityItem) {
final Activity entry = activityItem.getModelObject();
- activityItem.add(WicketUtils.createDatestampLabel("title", entry.startDate, getTimeZone()));
+ activityItem.add(WicketUtils.createDatestampLabel("title", entry.startDate, getTimeZone(), getTimeUtils()));
// display the commits in chronological order
DataView<RepositoryCommit> commits = new DataView<RepositoryCommit>("commit",
@@ -68,17 +68,17 @@
// commit time of day
commitItem.add(WicketUtils.createTimeLabel("time", commit.getCommitterIdent()
- .getWhen(), getTimeZone()));
+ .getWhen(), getTimeZone(), getTimeUtils()));
// avatar
- commitItem.add(new GravatarImage("avatar", commit.getAuthorIdent(), 36));
+ commitItem.add(new GravatarImage("avatar", commit.getAuthorIdent(), 40));
// merge icon
if (commit.getParentCount() > 1) {
commitItem.add(WicketUtils.newImage("commitIcon",
"commit_merge_16x16.png"));
} else {
- commitItem.add(WicketUtils.newBlankImage("commitIcon"));
+ commitItem.add(WicketUtils.newBlankImage("commitIcon").setVisible(false));
}
// author search link
--
Gitblit v1.9.1