Merge pull request #1073 from gitblit/1062-DocEditorUpdates

Paul Martin

2016-04-30 a502d96a860456ec5e8c96761db70f7cabb74751

 src/main/java/com/gitblit/wicket/panels/ActivityPanel.java

@@ -25,7 +25,6 @@
import org.eclipse.jgit.lib.Repository;



import com.gitblit.Constants;

import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.models.Activity;

import com.gitblit.models.RepositoryCommit;

@@ -40,9 +39,9 @@


/**

 * Renders activity in day-blocks in reverse-chronological order.

 * 
 *

 * @author James Moger

 * 
 *

 */

public class ActivityPanel extends BasePanel {



@@ -52,12 +51,13 @@
      super(wicketId);



      Collections.sort(recentActivity);

		
      final int shortHashLen = GitBlit.getInteger(Keys.web.shortCommitIdLength, 6);



      final int shortHashLen = app().settings().getInteger(Keys.web.shortCommitIdLength, 6);

      DataView<Activity> activityView = new DataView<Activity>("activity",

            new ListDataProvider<Activity>(recentActivity)) {

         private static final long serialVersionUID = 1L;



         @Override

         public void populateItem(final Item<Activity> activityItem) {

            final Activity entry = activityItem.getModelObject();

            activityItem.add(WicketUtils.createDatestampLabel("title", entry.startDate, getTimeZone(), getTimeUtils()));

@@ -67,6 +67,7 @@
                  new ListDataProvider<RepositoryCommit>(entry.getCommits())) {

               private static final long serialVersionUID = 1L;



               @Override

               public void populateItem(final Item<RepositoryCommit> commitItem) {

                  final RepositoryCommit commit = commitItem.getModelObject();



@@ -75,7 +76,7 @@
                        .getWhen(), getTimeZone(), getTimeUtils()));



                  // avatar

                  commitItem.add(new GravatarImage("avatar", commit.getAuthorIdent(), 40));

                  commitItem.add(new AvatarImage("avatar", commit.getAuthorIdent(), 40));



                  // merge icon

                  if (commit.getParentCount() > 1) {

@@ -89,7 +90,7 @@
                  String author = commit.getAuthorIdent().getName();

                  LinkPanel authorLink = new LinkPanel("author", "list", author,

                        GitSearchPage.class, WicketUtils.newSearchParameter(commit.repository,

                              commit.getName(), author, Constants.SearchType.AUTHOR), true);

                              null, author, Constants.SearchType.AUTHOR), true);

                  setPersonSearchTooltip(authorLink, author, Constants.SearchType.AUTHOR);

                  commitItem.add(authorLink);



@@ -138,7 +139,7 @@
                        WicketUtils.newObjectParameter(commit.repository, commit.getName()))

                        .setEnabled(commit.getParentCount() > 0));

                  commitItem.add(new BookmarkablePageLink<Void>("tree", TreePage.class,

                        WicketUtils.newObjectParameter(commit.repository, commit.getName())));						
                        WicketUtils.newObjectParameter(commit.repository, commit.getName())));

               }

            };

            activityItem.add(commits);