Use markdown for welcome message. Simplify login page appearance.

James Moger

2011-04-21 c3f4f124f1b9e45d7696f3c16f958d1c81ff280a

 src/com/gitblit/wicket/panels/LogPanel.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.repeater.Item;

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

@@ -17,20 +18,24 @@
import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.JGitUtils.SearchType;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.LinkPanel;

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.SummaryPage;

import com.gitblit.wicket.pages.TreePage;



public class LogPanel extends BasePanel {



   private static final long serialVersionUID = 1L;

	
   private boolean hasMore = false;



   public LogPanel(String wicketId, final String repositoryName, String objectId, Repository r, int limit, int pageOffset) {

   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);

@@ -47,6 +52,10 @@
         // Fixed size result set

         commits = JGitUtils.getRevLog(r, objectId, 0, limit);

      }



      // inaccurate way to determine if there are more commits.

      // works unless commits.size() represents the exact end. 
      hasMore = commits.size() >= itemsPerPage;



      // header

      if (pageResults) {

@@ -70,9 +79,20 @@


            item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone()));



            // author search link

            String author = entry.getAuthorIdent().getName();

            item.add(WicketUtils.createAuthorLabel("commitAuthor", author));

            LinkPanel authorLink = new LinkPanel("commitAuthor", "list", author, SearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId, author, SearchType.AUTHOR));

            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"));

            }

				
            // short message

            String shortMessage = entry.getShortMessage();

            String trimmedMessage = StringUtils.trimShortLog(shortMessage);

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

@@ -113,4 +133,8 @@
         }

      }

   }

	
   public boolean hasMore() {

      return hasMore;

   }

}