Moved paging count to setting. Fixed css layouts. Removed log pager.

James Moger

2011-04-11 50984c55466228ccff0630e49acb4c5e271d446b

 src/com/gitblit/wicket/pages/CommitPage.java

@@ -5,9 +5,11 @@


import org.apache.wicket.PageParameters;

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

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

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

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

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

import org.apache.wicket.model.StringResourceModel;

import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;



@@ -17,7 +19,6 @@
import com.gitblit.wicket.RepositoryPage;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.models.PathModel;

import com.gitblit.wicket.panels.PathLinksPanel;





public class CommitPage extends RepositoryPage {

@@ -25,10 +26,8 @@
   public CommitPage(PageParameters params) {

      super(params);



      final String commitId = params.getString("h", "");



      Repository r = getRepository();

      RevCommit c = JGitUtils.getCommit(r, commitId);

      RevCommit c = JGitUtils.getCommit(r, objectId);

      

      List<String> parents = new ArrayList<String>();

      if (c.getParentCount() > 0) {

@@ -40,12 +39,14 @@
      // commit page links

      if (parents.size() == 0) {

         add(new Label("parentLink", "none"));

         add(new Label("commitdiffLink", getString("gb.commitdiff")));

      } else {

         add(new LinkPanel("parentLink", null, parents.get(0).substring(0, 8), CommitPage.class, newCommitParameter(parents.get(0))));

         add(new LinkPanel("commitdiffLink", null, new StringResourceModel("gb.commitdiff", this, null), DiffPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));

      }

      add(new Label("patchLink", getString("gb.patch")));

      

      add(new LinkPanel("shortlog", "title", c.getShortMessage(), ShortLogPage.class, newRepositoryParameter()));

      add(new LinkPanel("shortlog", "title", c.getShortMessage(), LogPage.class, newRepositoryParameter()));

      

      addRefs(r, c);



@@ -89,9 +90,12 @@
            } else {

               item.add(new LinkPanel("pathName", "list", entry.path, BlobPage.class, newPathParameter(entry.path)));

            }

            item.add(new PathLinksPanel("pathLinks", repositoryName, entry));

            String clazz = counter % 2 == 0 ? "dark" : "light";

            WicketUtils.setCssClass(item, clazz);

				
            item.add(new BookmarkablePageLink<Void>("diff", DiffPage.class, newPathParameter(entry.path)));

            item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, newPathParameter(entry.path)));

            item.add(new BookmarkablePageLink<Void>("history", BlobPage.class).setEnabled(false));



            WicketUtils.setAlternatingBackground(item, counter);

            counter++;

         }

      };