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/ActivityPanel.java | 108 ++++++++++++++++++++++++++++-------------------------
1 files changed, 57 insertions(+), 51 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.java b/src/com/gitblit/wicket/panels/ActivityPanel.java
index 128ef2b..669c36b 100644
--- a/src/com/gitblit/wicket/panels/ActivityPanel.java
+++ b/src/com/gitblit/wicket/panels/ActivityPanel.java
@@ -19,21 +19,21 @@
import java.util.List;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
import com.gitblit.Constants;
-import com.gitblit.models.DailyActivity;
+import com.gitblit.GitBlit;
+import com.gitblit.Keys;
+import com.gitblit.models.Activity;
import com.gitblit.models.RepositoryCommit;
-import com.gitblit.wicket.GitBlitWebSession;
-import com.gitblit.wicket.GravatarImage;
+import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.pages.CommitDiffPage;
import com.gitblit.wicket.pages.CommitPage;
+import com.gitblit.wicket.pages.GitSearchPage;
import com.gitblit.wicket.pages.LogPage;
-import com.gitblit.wicket.pages.SearchPage;
import com.gitblit.wicket.pages.SummaryPage;
import com.gitblit.wicket.pages.TreePage;
@@ -47,94 +47,100 @@
private static final long serialVersionUID = 1L;
- public ActivityPanel(String wicketId, List<DailyActivity> recentActivity) {
+ public ActivityPanel(String wicketId, List<Activity> recentActivity) {
super(wicketId);
Collections.sort(recentActivity);
-
- DataView<DailyActivity> activityView = new DataView<DailyActivity>("activity",
- new ListDataProvider<DailyActivity>(recentActivity)) {
+
+ final int shortHashLen = GitBlit.getInteger(Keys.web.shortCommitIdLength, 6);
+ DataView<Activity> activityView = new DataView<Activity>("activity",
+ new ListDataProvider<Activity>(recentActivity)) {
private static final long serialVersionUID = 1L;
- public void populateItem(final Item<DailyActivity> item) {
- final DailyActivity entry = item.getModelObject();
- item.add(WicketUtils.createDatestampLabel("title", entry.date, GitBlitWebSession
- .get().getTimezone()));
+ public void populateItem(final Item<Activity> activityItem) {
+ final Activity entry = activityItem.getModelObject();
+ activityItem.add(WicketUtils.createDatestampLabel("title", entry.startDate, getTimeZone(), getTimeUtils()));
// display the commits in chronological order
- DataView<RepositoryCommit> commits = new DataView<RepositoryCommit>("commits",
- new ListDataProvider<RepositoryCommit>(entry.commits)) {
+ DataView<RepositoryCommit> commits = new DataView<RepositoryCommit>("commit",
+ new ListDataProvider<RepositoryCommit>(entry.getCommits())) {
private static final long serialVersionUID = 1L;
- public void populateItem(final Item<RepositoryCommit> item) {
- final RepositoryCommit commit = item.getModelObject();
- Fragment fragment = new Fragment("commit", "commitFragment", this);
+ public void populateItem(final Item<RepositoryCommit> commitItem) {
+ final RepositoryCommit commit = commitItem.getModelObject();
- // time of day
- fragment.add(WicketUtils.createTimeLabel("time", commit.getAuthorIdent()
- .getWhen(), GitBlitWebSession.get().getTimezone()));
+ // commit time of day
+ commitItem.add(WicketUtils.createTimeLabel("time", commit.getCommitterIdent()
+ .getWhen(), getTimeZone(), getTimeUtils()));
// avatar
- fragment.add(new GravatarImage("avatar", commit.getAuthorIdent(), 36));
+ commitItem.add(new GravatarImage("avatar", commit.getAuthorIdent(), 40));
// merge icon
if (commit.getParentCount() > 1) {
- fragment.add(WicketUtils.newImage("commitIcon",
+ commitItem.add(WicketUtils.newImage("commitIcon",
"commit_merge_16x16.png"));
} else {
- fragment.add(WicketUtils.newBlankImage("commitIcon"));
+ commitItem.add(WicketUtils.newBlankImage("commitIcon").setVisible(false));
}
// author search link
String author = commit.getAuthorIdent().getName();
LinkPanel authorLink = new LinkPanel("author", "list", author,
- SearchPage.class, WicketUtils.newSearchParameter(commit.repository,
- commit.getName(), author, Constants.SearchType.AUTHOR));
+ GitSearchPage.class, WicketUtils.newSearchParameter(commit.repository,
+ commit.getName(), author, Constants.SearchType.AUTHOR), true);
setPersonSearchTooltip(authorLink, author, Constants.SearchType.AUTHOR);
- fragment.add(authorLink);
+ commitItem.add(authorLink);
- // repository summary page link
- LinkPanel repositoryLink = new LinkPanel("repository", "list",
- commit.repository, SummaryPage.class,
- WicketUtils.newRepositoryParameter(commit.repository));
- fragment.add(repositoryLink);
+ // repository
+ String repoName = StringUtils.stripDotGit(commit.repository);
+ LinkPanel repositoryLink = new LinkPanel("repository", null,
+ repoName, SummaryPage.class,
+ WicketUtils.newRepositoryParameter(commit.repository), true);
+ WicketUtils.setCssBackground(repositoryLink, repoName);
+ commitItem.add(repositoryLink);
// repository branch
LinkPanel branchLink = new LinkPanel("branch", "list", commit.branch,
LogPage.class, WicketUtils.newObjectParameter(commit.repository,
- commit.branch));
+ commit.branch), true);
WicketUtils.setCssStyle(branchLink, "color: #008000;");
- fragment.add(branchLink);
+ commitItem.add(branchLink);
LinkPanel commitid = new LinkPanel("commitid", "list subject",
- commit.getShortName(), CommitPage.class,
- WicketUtils.newObjectParameter(commit.repository, commit.getName()));
- fragment.add(commitid);
+ commit.getName().substring(0, shortHashLen), CommitPage.class,
+ WicketUtils.newObjectParameter(commit.repository, commit.getName()), true);
+ commitItem.add(commitid);
// message/commit link
String shortMessage = commit.getShortMessage();
- LinkPanel shortlog = new LinkPanel("message", "list subject", shortMessage,
- CommitPage.class, WicketUtils.newObjectParameter(commit.repository,
- commit.getName()));
- fragment.add(shortlog);
+ String trimmedMessage = shortMessage;
+ if (commit.getRefs() != null && commit.getRefs().size() > 0) {
+ trimmedMessage = StringUtils.trimString(shortMessage, Constants.LEN_SHORTLOG_REFS);
+ } else {
+ trimmedMessage = StringUtils.trimString(shortMessage, Constants.LEN_SHORTLOG);
+ }
+ LinkPanel shortlog = new LinkPanel("message", "list subject",
+ trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(
+ commit.repository, commit.getName()), true);
+ if (!shortMessage.equals(trimmedMessage)) {
+ WicketUtils.setHtmlTooltip(shortlog, shortMessage);
+ }
+ commitItem.add(shortlog);
// refs
- fragment.add(new RefsPanel("commitRefs", commit.repository, commit
+ commitItem.add(new RefsPanel("commitRefs", commit.repository, commit
.getRefs()));
- // view, diff, tree links
- fragment.add(new BookmarkablePageLink<Void>("view", CommitPage.class,
- WicketUtils.newObjectParameter(commit.repository, commit.getName())));
- fragment.add(new BookmarkablePageLink<Void>("diff", CommitDiffPage.class,
+ // diff, tree links
+ commitItem.add(new BookmarkablePageLink<Void>("diff", CommitDiffPage.class,
WicketUtils.newObjectParameter(commit.repository, commit.getName()))
.setEnabled(commit.getParentCount() > 0));
- fragment.add(new BookmarkablePageLink<Void>("tree", TreePage.class,
- WicketUtils.newObjectParameter(commit.repository, commit.getName())));
-
- item.add(fragment);
+ commitItem.add(new BookmarkablePageLink<Void>("tree", TreePage.class,
+ WicketUtils.newObjectParameter(commit.repository, commit.getName())));
}
};
- item.add(commits);
+ activityItem.add(commits);
}
};
add(activityView);
--
Gitblit v1.9.1