Added merge icon. Added commit legend with counts. Improved header.

James Moger

2011-04-21 a645ba09d693495c50ab0ee0d1fc2734407b73a4

 src/com/gitblit/wicket/panels/HistoryPanel.java

@@ -5,6 +5,7 @@
import java.util.Map;



import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.image.ContextImage;

import org.apache.wicket.markup.html.link.BookmarkablePageLink;

import org.apache.wicket.markup.html.panel.Fragment;

import org.apache.wicket.markup.repeater.Item;

@@ -104,6 +105,13 @@
            setPersonSearchTooltip(authorLink, author, SearchType.AUTHOR);

            item.add(authorLink);

            

            // merge icon

            if (entry.getParentCount() > 1) {

               item.add(new ContextImage("commitIcon", "/com/gitblit/wicket/resources/commit_merge_16x16.png"));

            } else {

               item.add(new ContextImage("commitIcon", "/com/gitblit/wicket/resources/blank.png"));

            }



            String shortMessage = entry.getShortMessage();

            String trimmedMessage = StringUtils.trimShortLog(shortMessage);

            LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject", trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName()));