Update to Bootstrap 2.0

James Moger

2012-02-16 3cc6e2de29a0fa33dd585e938e1614a6dd5f9755

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

@@ -27,9 +27,9 @@
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.Constants;

import org.eclipse.jgit.lib.Repository;



import com.gitblit.Constants;

import com.gitblit.SyndicationServlet;

import com.gitblit.models.RefModel;

import com.gitblit.models.RepositoryModel;

@@ -37,8 +37,10 @@
import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.pages.BranchesPage;

import com.gitblit.wicket.pages.CommitPage;

import com.gitblit.wicket.pages.LogPage;

import com.gitblit.wicket.pages.MetricsPage;

import com.gitblit.wicket.pages.SearchPage;

import com.gitblit.wicket.pages.SummaryPage;

import com.gitblit.wicket.pages.TreePage;



@@ -90,10 +92,23 @@
                  entry.displayName, 28), LogPage.class, WicketUtils.newObjectParameter(

                  model.name, entry.getName())));



            // only show branch type on the branches page

            boolean remote = entry.getName().startsWith(Constants.R_REMOTES);

            item.add(new Label("branchType", remote ? getString("gb.remote")

                  : getString("gb.local")).setVisible(maxCount <= 0));

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

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

                  SearchPage.class, WicketUtils.newSearchParameter(model.name,

                        entry.getName(), author, Constants.SearchType.AUTHOR));

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

            item.add(authorLink);



            // short message

            String shortMessage = entry.getShortMessage();

            String trimmedMessage = StringUtils.trimShortLog(shortMessage);

            LinkPanel shortlog = new LinkPanel("branchLog", "list subject", trimmedMessage,

                  CommitPage.class, WicketUtils.newObjectParameter(model.name,

                        entry.getName()));

            if (!shortMessage.equals(trimmedMessage)) {

               WicketUtils.setHtmlTooltip(shortlog, shortMessage);

            }

            item.add(shortlog);



            if (maxCount <= 0) {

               Fragment fragment = new Fragment("branchLinks", "branchPageLinks", this);

@@ -103,8 +118,9 @@
                     .newObjectParameter(model.name, entry.getName())));

               fragment.add(new BookmarkablePageLink<Void>("metrics", MetricsPage.class,

                     WicketUtils.newObjectParameter(model.name, entry.getName())));

               fragment.add(new ExternalLink("syndication", SyndicationServlet.asLink(getRequest()

                     .getRelativePathPrefixToContextRoot(), model.name, entry.getName(), 0)));

               fragment.add(new ExternalLink("syndication", SyndicationServlet.asLink(

                     getRequest().getRelativePathPrefixToContextRoot(), model.name,

                     entry.getName(), 0)));

               item.add(fragment);

            } else {

               Fragment fragment = new Fragment("branchLinks", "branchPanelLinks", this);

@@ -126,7 +142,9 @@
               this, null), BranchesPage.class, WicketUtils.newRepositoryParameter(model.name)));

      }

      // We always have 1 branch

      hasBranches = branches.size() > 1;

      hasBranches = (branches.size() > 1)

            || ((branches.size() == 1) && !branches.get(0).displayName

                  .equalsIgnoreCase("master"));

   }



   public BranchesPanel hideIfEmpty() {