Sprinkled some icons throughout ui. Centralized icon retrieval.

James Moger

2011-04-25 1e83907b001a2df3f14a35fc36c47ea8f49155c4

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

@@ -5,7 +5,6 @@
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.repeater.Item;

import org.apache.wicket.markup.repeater.data.DataView;

@@ -38,7 +37,7 @@
   public LogPanel(String wicketId, final String repositoryName, final String objectId, Repository r, int limit, int pageOffset) {

      super(wicketId);

      boolean pageResults = limit <= 0;

      int itemsPerPage = GitBlit.self().settings().getInteger(Keys.web.logPageCommitCount, 50);

      int itemsPerPage = GitBlit.self().settings().getInteger(Keys.web.itemsPerPage, 50);

      if (itemsPerPage <= 1) {

         itemsPerPage = 50;

      }

@@ -87,9 +86,9 @@


            // merge icon

            if (entry.getParentCount() > 1) {

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

               item.add(WicketUtils.newImage("commitIcon", "commit_merge_16x16.png"));

            } else {

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

               item.add(WicketUtils.newBlankImage("commitIcon"));

            }

            

            // short message

@@ -97,7 +96,7 @@
            String trimmedMessage = StringUtils.trimShortLog(shortMessage);

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

            if (!shortMessage.equals(trimmedMessage)) {

               WicketUtils.setHtmlTitle(shortlog, shortMessage);

               WicketUtils.setHtmlTooltip(shortlog, shortMessage);

            }

            item.add(shortlog);