From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 08:40:30 -0500
Subject: [PATCH] Merge pull request #75 from thefake/master
---
src/com/gitblit/wicket/panels/CommitHeaderPanel.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/CommitHeaderPanel.java b/src/com/gitblit/wicket/panels/CommitHeaderPanel.java
index bf653ec..bb960cc 100644
--- a/src/com/gitblit/wicket/panels/CommitHeaderPanel.java
+++ b/src/com/gitblit/wicket/panels/CommitHeaderPanel.java
@@ -1,9 +1,25 @@
+/*
+ * Copyright 2011 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.gitblit.wicket.panels;
import org.apache.wicket.markup.html.basic.Label;
import org.eclipse.jgit.revwalk.RevCommit;
-import com.gitblit.wicket.LinkPanel;
+import com.gitblit.Constants;
+import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.pages.CommitPage;
@@ -11,11 +27,22 @@
private static final long serialVersionUID = 1L;
+ public CommitHeaderPanel(String id, String title) {
+ super(id);
+ add(new Label("shortmessage", title));
+ add(new Label("commitid"));
+ add(new Label("author"));
+ add(new Label("date"));
+ }
+
public CommitHeaderPanel(String id, String repositoryName, RevCommit c) {
super(id);
- add(new LinkPanel("shortmessage", "title", c.getShortMessage(), CommitPage.class, WicketUtils.newObjectParameter(repositoryName, c.getName())));
- add(new Label("commitid", "(" + c.getName().substring(0, 8) + ")"));
+ add(new LinkPanel("shortmessage", "title", StringUtils.trimString(c.getShortMessage(),
+ Constants.LEN_SHORTLOG), CommitPage.class,
+ WicketUtils.newObjectParameter(repositoryName, c.getName())));
+ add(new Label("commitid", c.getName()));
add(new Label("author", c.getAuthorIdent().getName()));
- add(WicketUtils.createDateLabel("date", c.getAuthorIdent().getWhen(), getTimeZone()));
+ add(WicketUtils.createDateLabel("date", c.getAuthorIdent().getWhen(), getTimeZone(), getTimeUtils()));
+ add(new GravatarImage("authorAvatar", c.getAuthorIdent()));
}
}
\ No newline at end of file
--
Gitblit v1.9.1