Tweak permissions panel layout a bit

James Moger

2012-10-22 eba89539a29deba954035056437279088c3e047b

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

@@ -19,6 +19,7 @@
import java.util.List;

import java.util.Map;



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;

@@ -27,16 +28,16 @@
import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.Constants;

import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.models.RefModel;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.JGitUtils.SearchType;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.pages.CommitDiffPage;

import com.gitblit.wicket.pages.CommitPage;

import com.gitblit.wicket.pages.SearchPage;

import com.gitblit.wicket.pages.GitSearchPage;

import com.gitblit.wicket.pages.TreePage;



public class SearchPanel extends BasePanel {

@@ -46,7 +47,8 @@
   private boolean hasMore;



   public SearchPanel(String wicketId, final String repositoryName, final String objectId,

         final String value, SearchType searchType, Repository r, int limit, int pageOffset) {

         final String value, Constants.SearchType searchType, Repository r, int limit, int pageOffset,

         boolean showRemoteRefs) {

      super(wicketId);

      boolean pageResults = limit <= 0;

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

@@ -56,7 +58,7 @@


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



      final Map<ObjectId, List<RefModel>> allRefs = JGitUtils.getAllRefs(r);

      final Map<ObjectId, List<RefModel>> allRefs = JGitUtils.getAllRefs(r, showRemoteRefs);

      List<RevCommit> commits;

      if (pageResults) {

         // Paging result set

@@ -72,9 +74,10 @@
      hasMore = commits.size() >= itemsPerPage;



      // header

      add(new LinkPanel("header", "title", commit == null ? "" : commit.getShortMessage(),

            CommitPage.class, WicketUtils.newObjectParameter(repositoryName,

                  commit == null ? "" : commit.getName())));

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



      add(new Label("searchString", value));

      add(new Label("searchType", searchType.toString()));



      ListDataProvider<RevCommit> dp = new ListDataProvider<RevCommit>(commits);

      DataView<RevCommit> searchView = new DataView<RevCommit>("commit", dp) {

@@ -85,14 +88,14 @@
            final RevCommit entry = item.getModelObject();

            final Date date = JGitUtils.getCommitDate(entry);



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

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



            // author search link

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

            LinkPanel authorLink = new LinkPanel("commitAuthor", "list", author,

                  SearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId,

                        author, SearchType.AUTHOR));

            setPersonSearchTooltip(authorLink, author, SearchType.AUTHOR);

                  GitSearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId,

                        author, Constants.SearchType.AUTHOR));

            setPersonSearchTooltip(authorLink, author, Constants.SearchType.AUTHOR);

            item.add(authorLink);



            // merge icon

@@ -103,7 +106,12 @@
            }



            String shortMessage = entry.getShortMessage();

            String trimmedMessage = StringUtils.trimShortLog(shortMessage);

            String trimmedMessage = shortMessage;

            if (allRefs.containsKey(entry.getId())) {

               trimmedMessage = StringUtils.trimString(shortMessage, Constants.LEN_SHORTLOG_REFS);

            } else {

               trimmedMessage = StringUtils.trimString(shortMessage, Constants.LEN_SHORTLOG);

            }

            LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject",

                  trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(

                        repositoryName, entry.getName()));