User list. Revised home page. Updated Jetty. Secure cookies. Docs.

James Moger

2011-05-23 a4d2498b7f94012cfdf481fcf151f8cfd7537a42

 src/com/gitblit/wicket/panels/HistoryPanel.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.html.panel.Fragment;

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

@@ -30,7 +29,6 @@
import com.gitblit.wicket.pages.CommitDiffPage;

import com.gitblit.wicket.pages.CommitPage;

import com.gitblit.wicket.pages.HistoryPage;

import com.gitblit.wicket.pages.LogPage;

import com.gitblit.wicket.pages.SearchPage;

import com.gitblit.wicket.pages.TreePage;



@@ -43,7 +41,7 @@
   public HistoryPanel(String wicketId, final String repositoryName, final String objectId, final String path, 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;

      }

@@ -74,16 +72,7 @@
      // works unless commits.size() represents the exact end.

      hasMore = commits.size() >= itemsPerPage;



      // header

      if (pageResults) {

         // history page

         // show commit page link

         add(new LinkPanel("header", "title", commit == null ? "" : commit.getShortMessage(), CommitPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));

      } else {

         // summary page

         // show history page link

         add(new LinkPanel("header", "title", new StringResourceModel("gb.history", this, null), LogPage.class, WicketUtils.newRepositoryParameter(repositoryName)));

      }

      add(new CommitHeaderPanel("commitHeader", repositoryName, commit));



      // breadcrumbs

      add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, path, objectId));

@@ -107,16 +96,16 @@


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

            }



            String shortMessage = entry.getShortMessage();

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