James Moger
2012-03-27 f5432e015d173f2665f7ca34735057e7b2b25d16
src/com/gitblit/wicket/panels/ActivityPanel.java
@@ -28,13 +28,11 @@
import com.gitblit.models.Activity;
import com.gitblit.models.Activity.RepositoryCommit;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.GravatarImage;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.pages.CommitDiffPage;
import com.gitblit.wicket.pages.CommitPage;
import com.gitblit.wicket.pages.LogPage;
import com.gitblit.wicket.pages.SearchPage;
import com.gitblit.wicket.pages.GitSearchPage;
import com.gitblit.wicket.pages.SummaryPage;
import com.gitblit.wicket.pages.TreePage;
@@ -52,28 +50,27 @@
      super(wicketId);
      Collections.sort(recentActivity);
      DataView<Activity> activityView = new DataView<Activity>("activity",
            new ListDataProvider<Activity>(recentActivity)) {
         private static final long serialVersionUID = 1L;
         public void populateItem(final Item<Activity> item) {
            final Activity entry = item.getModelObject();
            item.add(WicketUtils.createDatestampLabel("title", entry.startDate, GitBlitWebSession
                  .get().getTimezone()));
            item.add(WicketUtils.createDatestampLabel("title", entry.startDate, getTimeZone()));
            // display the commits in chronological order
            DataView<RepositoryCommit> commits = new DataView<RepositoryCommit>("commits",
                  new ListDataProvider<RepositoryCommit>(entry.commits)) {
                  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);
                  // time of day
                  fragment.add(WicketUtils.createTimeLabel("time", commit.getAuthorIdent()
                        .getWhen(), GitBlitWebSession.get().getTimezone()));
                  // commit time of day
                  fragment.add(WicketUtils.createTimeLabel("time", commit.getCommitterIdent()
                        .getWhen(), getTimeZone()));
                  // avatar
                  fragment.add(new GravatarImage("avatar", commit.getAuthorIdent(), 36));
@@ -89,36 +86,42 @@
                  // 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);
                  // repository
                  String repoName = StringUtils.stripDotGit(commit.repository);
                  LinkPanel repositoryLink = new LinkPanel("repository", null,
                        commit.repository, SummaryPage.class,
                        WicketUtils.newRepositoryParameter(commit.repository));
                  WicketUtils.setCssBackground(repositoryLink, commit.repository);
                        repoName, SummaryPage.class,
                        WicketUtils.newRepositoryParameter(commit.repository), true);
                  WicketUtils.setCssBackground(repositoryLink, repoName);
                  fragment.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);
                  LinkPanel commitid = new LinkPanel("commitid", "list subject",
                        commit.getShortName(), CommitPage.class,
                        WicketUtils.newObjectParameter(commit.repository, commit.getName()));
                        WicketUtils.newObjectParameter(commit.repository, commit.getName()), true);
                  fragment.add(commitid);
                  // message/commit link
                  String shortMessage = commit.getShortMessage();
                  String trimmedMessage = StringUtils.trimShortLog(shortMessage);
                  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()));
                              commit.repository, commit.getName()), true);
                  if (!shortMessage.equals(trimmedMessage)) {
                     WicketUtils.setHtmlTooltip(shortlog, shortMessage);
                  }